diff --git a/.annotation_safe_list.yml b/.annotation_safe_list.yml
index a5e997bf2f4a..e91fe39cd613 100644
--- a/.annotation_safe_list.yml
+++ b/.annotation_safe_list.yml
@@ -9,13 +9,13 @@
 
 # Via Django
 auth.Group:
-  ".. no_pii:" : "No PII"
+  ".. no_pii:": "No PII"
 auth.Permission:
-  ".. no_pii:" : "No PII"
+  ".. no_pii:": "No PII"
 auth.User:
   ".. pii:": "Contains username, password, and email address, retired in AccountRetirementView"
-  ".. pii_types:" : username, email_address, password
-  ".. pii_retirement:" : local_api
+  ".. pii_types:": username, email_address, password
+  ".. pii_retirement:": local_api
 contenttypes.ContentType:
   ".. no_pii:": "No PII"
 admin.LogEntry:
@@ -27,6 +27,66 @@ sessions.Session:
 sites.Site:
   ".. no_pii:": "No PII"
 
+# Automatically generated edx-platform models that can't be annotated
+calendar_sync.HistoricalUserCalendarSyncConfig:
+  ".. no_pii:": "No PII"
+certificates.HistoricalCertificateAllowlist:
+  ".. no_pii:": "No PII"
+certificates.HistoricalCertificateDateOverride:
+  ".. no_pii:": "No PII"
+certificates.HistoricalCertificateInvalidation:
+  ".. no_pii:": "No PII"
+certificates.HistoricalGeneratedCertificate:
+  ".. pii:": "PII can exist in the generated certificate linked to in this model. Certificate data is currently retained."
+  ".. pii_types:": "name, username"
+  ".. pii_retirement:": "retained"
+course_apps.HistoricalCourseAppStatus:
+  ".. no_pii:": "No PII"
+course_goals.HistoricalCourseGoal:
+  ".. no_pii:": "No PII"
+course_live.HistoricalCourseLiveConfiguration:
+  ".. no_pii:": "No PII"
+course_modes.HistoricalCourseMode:
+  ".. no_pii:": "No PII"
+course_overviews.HistoricalCourseOverview:
+  ".. no_pii:": "No PII"
+discussions.HistoricalDiscussionsConfiguration:
+  ".. no_pii:": "No PII"
+entitlements.HistoricalCourseEntitlement:
+  ".. no_pii:": "No PII"
+entitlements.HistoricalCourseEntitlementSupportDetail:
+  ".. no_pii:": "No PII"
+experiments.HistoricalExperimentKeyValue:
+  ".. no_pii:": "No PII"
+external_user_ids.HistoricalExternalId:
+  ".. no_pii:": "We store external_user_id here, but do not consider that PII under OEP-30."
+external_user_ids.HistoricalExternalIdType:
+  ".. no_pii:": "No PII"
+grades.HistoricalPersistentSubsectionGradeOverride:
+  ".. no_pii:": "No PII"
+instructor_task.HistoricalInstructorTaskSchedule:
+  ".. no_pii:": "No PII"
+program_enrollments.HistoricalProgramCourseEnrollment:
+  ".. no_pii:": "No PII"
+program_enrollments.HistoricalProgramEnrollment:
+  ".. pii:": "PII is found in the external key for a program enrollment"
+  ".. pii_types:": "other"
+  ".. pii_retirement:": "local_api"
+programs.HistoricalProgramDiscussionsConfiguration:
+  ".. no_pii:": "No PII"
+programs.HistoricalProgramLiveConfiguration:
+  ".. no_pii:": "No PII"
+schedules.HistoricalSchedule:
+  ".. no_pii:": "No PII"
+split_modulestore_django.HistoricalSplitModulestoreCourseIndex:
+  ".. no_pii:": "No PII"
+student.HistoricalCourseEnrollment:
+  ".. no_pii:": "No PII"
+student.HistoricalManualEnrollmentAudit:
+  ".. pii:": "Contains enrolled_email, retired in LMSAccountRetirementView"
+  ".. pii_types:": "email_address"
+  ".. pii_retirement:": "local_api"
+
 # Automatically generated models in edx-enterprise that can't be annotated there
 consent.HistoricalDataSharingConsent:
   ".. pii:": "The username field inherited from Consent contains PII."
@@ -45,7 +105,7 @@ enterprise.HistoricalEnterpriseCustomerCatalog:
 enterprise.HistoricalEnterpriseCustomerEntitlement:
   ".. no_pii:": "No PII"
 
-# Via ORA2
+# Via edx-ora2, these can be removed once the models are annotated for real
 assessment.Assessment:
   ".. no_pii:": "No PII"
 assessment.AssessmentFeedback:
@@ -82,8 +142,6 @@ workflow.AssessmentWorkflowStep:
 # Via edx-celeryutils
 celery_utils.ChordData:
   ".. no_pii:": "No PII"
-celery_utils.FailedTask:
-  ".. no_pii:": "No PII"
 
 # Via completion XBlock
 completion.BlockCompletion:
@@ -127,10 +185,24 @@ djcelery.TaskState:
 djcelery.WorkerState:
   ".. no_pii:": "No PII"
 
+# Via django-celery-results
+django_celery_results.ChordCounter:
+  ".. no_pii:": "No PII"
+django_celery_results.GroupResult:
+  ".. no_pii:": "No PII"
+django_celery_results.TaskResult:
+  ".. no_pii:": "No PII"
+
 # Via edx-oauth2-provider https://github.com/edx/edx-oauth2-provider
 edx_oauth2_provider.TrustedClient:
   ".. no_pii:": "No PII"
 
+# Via edx-name-affirmation, not part of the openedx org
+edx_name_affirmation.HistoricalVerifiedName:
+  ".. pii:": "Contains name fields."
+  ".. pii_types:": "name"
+  ".. pii_retirement:": "local_api"
+
 # Via VAL
 edxval.CourseVideo:
   ".. no_pii:": "No PII"
@@ -149,6 +221,12 @@ edxval.VideoImage:
 edxval.VideoTranscript:
   ".. no_pii:": "No PII"
 
+# Via PyLTI1p3
+lti1p3_tool_config.LtiTool:
+  ".. no_pii:": "No PII"
+lti1p3_tool_config.LtiToolKey:
+  ".. no_pii:": "No PII"
+
 # Via Milestones
 milestones.CourseContentMilestone:
   ".. no_pii:": "No PII"
@@ -190,6 +268,10 @@ oauth2_provider.Grant:
   ".. pii:": "Contains 3rd party authentication secrets. Retired in DeactivateLogoutView."
   ".. pii_types:": password, other
   ".. pii_retirement:": local_api
+oauth2_provider.IDToken:
+  ".. pii:": "Contains 3rd party authentication secrets, currently this is retained until the token times out, but should be retired explicitly with the other models from this package."
+  ".. pii_types:": password, other
+  ".. pii_retirement:": retained
 oauth2_provider.RefreshToken:
   ".. pii:": "Contains 3rd party authentication secrets. Retired in DeactivateLogoutView."
   ".. pii_types:": password, other
@@ -250,6 +332,8 @@ submissions.StudentItem:
   ".. no_pii:": "No PII"
 submissions.Submission:
   ".. no_pii:": "No PII"
+submissions.TeamSubmission:
+  ".. no_pii:": "No PII"
 
 # Via sorl-thumbnail https://github.com/jazzband/sorl-thumbnail
 thumbnail.KVStore:
diff --git a/.eslintignore b/.eslintignore
index 9044a0cc711f..b7754944dca5 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -20,9 +20,21 @@ test_root/staticfiles
 common/static/xmodule
 
 
-# Symlinks into xmodule/js
+# Various intra-repo symlinks that we've added over the years to duct-tape the JS build together.
+# Ignore them so that we're not double-counting these violations.
+cms/static/edx-ui-toolkit
 cms/static/xmodule_js
+lms/static/common
+lms/static/course_bookmarks
+lms/static/course_experience
+lms/static/course_search
+lms/static/discussion
+lms/static/edx-ui-toolkit
+lms/static/learner_profile
+lms/static/support
+lms/static/teams
 lms/static/xmodule_js
+xmodule/js/common_static
 
 
 # Mako templates that generate .js files
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3f9abcc671fb..c41fe40b4d27 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,12 +15,15 @@ lms/djangoapps/grades/
 lms/djangoapps/instructor/
 lms/djangoapps/instructor_task/
 lms/djangoapps/mobile_api/
+openedx/core/djangoapps/commerce/                                   @openedx/2u-infinity
 openedx/core/djangoapps/credentials                                 @openedx/2U-aperture
 openedx/core/djangoapps/credit                                      @openedx/2U-aperture
+openedx/core/djangoapps/enrollments/                                @openedx/2U-aperture
 openedx/core/djangoapps/heartbeat/
 openedx/core/djangoapps/oauth_dispatch
 openedx/core/djangoapps/user_api/                                   @openedx/2U-aperture
-openedx/core/djangoapps/user_authn/                                 @openedx/2U-vanguards                                 
+openedx/core/djangoapps/user_authn/                                 @openedx/2U-infinity
+openedx/core/djangoapps/verified_track_content/                     @openedx/2u-infinity
 openedx/features/course_experience/
 xmodule/
 
@@ -35,15 +38,18 @@ common/djangoapps/track/
 lms/djangoapps/certificates/                                        @openedx/2U-aperture
 
 # Discovery
-common/djangoapps/course_modes/
+common/djangoapps/course_modes/                                     @openedx/2U-aperture
 common/djangoapps/enrollment/
-lms/djangoapps/commerce/
-lms/djangoapps/experiments/
-lms/djangoapps/learner_dashboard/                                    @openedx/2U-aperture
-lms/djangoapps/learner_home/                                         @openedx/2U-aperture
-openedx/features/content_type_gating/
+common/djangoapps/entitlements/                                     @openedx/2U-aperture
+lms/djangoapps/branding/                                            @openedx/2U-aperture
+lms/djangoapps/commerce/                                            @openedx/2u-infinity
+lms/djangoapps/experiments/                                         @openedx/2u-infinity
+lms/djangoapps/gating/                                              @openedx/2u-infinity
+lms/djangoapps/learner_dashboard/                                   @openedx/2U-aperture
+lms/djangoapps/learner_home/                                        @openedx/2U-aperture
+openedx/features/content_type_gating/                               @openedx/2u-infinity
 openedx/features/course_duration_limits/
-openedx/features/discounts/
+openedx/features/discounts/                                         @openedx/2u-infinity
 
 # Ping Axim On-call if someone uses the QuickStart
 # https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 3f771c2c727f..ca314891b21d 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -32,7 +32,11 @@
   // When adding an ignoreDep, please include a reason and a public link that we can use to follow up and ensure
   // that the ignoreDep is removed.
   // This can be done as a comment within the ignoreDeps list.
-  "ignoreDeps": [],
+  "ignoreDeps": [
+    // karma-spec-reporter>0.20.0 does not seem compatible with our super-old 2016 Karma version (0.13.22).
+    // Ticket link: None, as upgrading Karma does not strike as worth the benefit.
+    "karma-spec-reporter"
+  ],
   "timezone": "America/New_York",
   "prConcurrentLimit": 3,
   "enabledManagers": ["npm"]
diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml
index 048cbe6b006b..82298af70a54 100644
--- a/.github/workflows/check-consistent-dependencies.yml
+++ b/.github/workflows/check-consistent-dependencies.yml
@@ -15,7 +15,7 @@ defaults:
 jobs:
   check-requirements:
     name: Compile requirements
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       # Only run remaining steps if there are changes to requirements/**
diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml
index 7e768a456463..d989ff9db288 100644
--- a/.github/workflows/ci-static-analysis.yml
+++ b/.github/workflows/ci-static-analysis.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         python-version:
           - "3.11"
-        os: ["ubuntu-20.04"]
+        os: ["ubuntu-24.04"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml
index 0ff99b9c685a..21cb80083f1d 100644
--- a/.github/workflows/compile-python-requirements.yml
+++ b/.github/workflows/compile-python-requirements.yml
@@ -15,7 +15,7 @@ defaults:
 
 jobs:
   recompile-python-dependencies:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Check out target branch
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
deleted file mode 100644
index 6831e3563d81..000000000000
--- a/.github/workflows/docker-publish.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Push Docker Images
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
-  push:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    strategy:
-      matrix:
-        variant:
-          - "lms_dev"
-          - "cms_dev"
-          - "cms"
-          - "lms"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Build and push lms/cms base docker images
-        env:
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        run: make docker_tag_build_push_${{matrix.variant}}
diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml
index 4d025e540163..463352e1c552 100644
--- a/.github/workflows/js-tests.yml
+++ b/.github/workflows/js-tests.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        node-version: [18, 20]
+        os: [ubuntu-latest]
+        node-version: [20]
         python-version:
           - "3.11"
 
@@ -28,7 +28,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Setup npm
-        run: npm i -g npm@10.5.x
+        run: npm i -g npm@10.7.x
 
       - name: Install Firefox 123.0
         run: |
@@ -64,13 +64,13 @@ jobs:
           make base-requirements
 
       - uses: c-hive/gha-npm-cache@v1
+
+      - name: Install npm
+        run: npm ci  
+
       - name: Run JS Tests
-        env:
-          TEST_SUITE: js-unit
-          SCRIPT_TO_RUN: ./scripts/generic-ci-tests.sh
         run: |
-          npm install -g jest
-          xvfb-run --auto-servernum ./scripts/all-tests.sh
+          npm run test
 
       - name: Save Job Artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml
index 8ead8396bf39..e3c59ec09304 100644
--- a/.github/workflows/lint-imports.yml
+++ b/.github/workflows/lint-imports.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   lint-imports:
     name: Lint Python Imports
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Check out branch
diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml
index 183b90effa29..84e334d68872 100644
--- a/.github/workflows/migrations-check.yml
+++ b/.github/workflows/migrations-check.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04]
         python-version:
           - "3.11"
         # 'pinned' is used to install the latest patch version of Django
@@ -52,7 +52,7 @@ jobs:
     steps:
       - name: Setup mongodb user
         run: |
-          mongosh edxapp --eval '
+          docker exec ${{ job.services.mongo.id }} mongosh edxapp --eval '
             db.createUser(
               {
                 user: "edxapp",
@@ -67,7 +67,7 @@ jobs:
       - name: Verify mongo and mysql db credentials
         run: |
           mysql -h 127.0.0.1 -uedxapp001 -ppassword -e "select 1;" edxapp
-          mongosh --host 127.0.0.1 --username edxapp --password password --eval 'use edxapp; db.adminCommand("ping");' edxapp
+          docker exec ${{ job.services.mongo.id }} mongosh --host 127.0.0.1 --username edxapp --password password --eval 'use edxapp; db.adminCommand("ping");' edxapp
 
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -126,7 +126,7 @@ jobs:
     if: always()
     needs:
       - check_migrations
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Decide whether the needed jobs succeeded or failed
         # uses: re-actors/alls-green@v1.2.1
diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml
deleted file mode 100644
index 0a9f50f6daf9..000000000000
--- a/.github/workflows/publish-ci-docker-image.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Push CI Runner Docker Image
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 1 * * 3"
-
-jobs:
-  push:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # 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@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 }}
-          aws-region: us-east-1
-
-      - name: Log in to ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
-
-      - name: Build, tag, and push image to Amazon ECR
-        env:
-          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          ECR_REPOSITORY: actions-runner
-          IMAGE_TAG: latest
-        run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f scripts/ci-runner.Dockerfile .
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml
index eeb53c24ed98..1afa032b6ad1 100644
--- a/.github/workflows/pylint-checks.yml
+++ b/.github/workflows/pylint-checks.yml
@@ -8,25 +8,25 @@ on:
 
 jobs:
   run-pylint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         include:
           - module-name: lms-1
-            path: "--django-settings-module=lms.envs.test lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/"
+            path: "lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/"
           - module-name: lms-2
-            path: "--django-settings-module=lms.envs.test lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/email_marketing/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
+            path: "lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/email_marketing/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
           - module-name: openedx-1
-            path: "--django-settings-module=lms.envs.test openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/tests/ openedx/core/djangoapps/course_live/"
+            path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/tests/ openedx/core/djangoapps/course_live/"
           - module-name: openedx-2
-            path: "--django-settings-module=lms.envs.test openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/learner_pathway/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
+            path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
           - module-name: common
-            path: "--django-settings-module=lms.envs.test common pavelib"
+            path: "common"
           - module-name: cms
-            path: "--django-settings-module=cms.envs.test cms"
+            path: "cms"
           - module-name: xmodule
-            path: "--django-settings-module=lms.envs.test xmodule"
+            path: "xmodule"
 
     name: pylint ${{ matrix.module-name }}
     steps:
@@ -75,7 +75,7 @@ jobs:
     if: always()
     needs:
       - run-pylint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Decide whether the needed jobs succeeded or failed
         # uses: re-actors/alls-green@v1.2.1
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
index cf8ffd5d2910..2452f54da14b 100644
--- a/.github/workflows/quality-checks.yml
+++ b/.github/workflows/quality-checks.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04]
         python-version:
           - "3.11"
         node-version: [20]
@@ -60,16 +60,29 @@ jobs:
           PIP_SRC: ${{ runner.temp }}
         run: |
           make test-requirements
-
+      
+      - name: Install npm
+        env:
+          PIP_SRC: ${{ runner.temp }}
+        run: npm ci  
+      
+      - name: Install python packages
+        env:
+          PIP_SRC: ${{ runner.temp }}
+        run: |
+            pip install -e .
+      
       - name: Run Quality Tests
         env:
-          TEST_SUITE: quality
-          SCRIPT_TO_RUN: ./scripts/generic-ci-tests.sh
           PIP_SRC: ${{ runner.temp }}
           TARGET_BRANCH: ${{ github.base_ref }}
         run: |
-          ./scripts/all-tests.sh
-
+            make pycodestyle
+            npm run lint
+            make xsslint
+            make pii_check
+            make check_keywords
+          
       - name: Save Job Artifacts
         if: always()
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
index 7f2b4925af8e..d880d7351766 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/semgrep.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        os: ["ubuntu-20.04"]
+        os: ["ubuntu-latest"]
         python-version:
           - "3.11"
 
diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml
index 7bbfd3369b6b..502dddce08ad 100644
--- a/.github/workflows/static-assets-check.yml
+++ b/.github/workflows/static-assets-check.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04]
         python-version:
           - "3.11"
-        node-version: [18, 20]
-        npm-version: [10.5.x]
+        node-version: [20]
+        npm-version: [10.7.x]
         mongo-version:
           - "7.0"
 
@@ -72,9 +72,6 @@ jobs:
         run: |
           pip install -r requirements/edx/assets.txt
 
-      - name: Initiate Mongo DB Service
-        run: sudo systemctl start mongod
-
       - name: Add node_modules bin to $Path
         run: echo $GITHUB_WORKSPACE/node_modules/.bin >> $GITHUB_PATH
 
diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json
index 4ab126cb4715..4709930493ce 100644
--- a/.github/workflows/unit-test-shards.json
+++ b/.github/workflows/unit-test-shards.json
@@ -239,7 +239,6 @@
       "cms/djangoapps/cms_user_tasks/",
       "cms/djangoapps/course_creators/",
       "cms/djangoapps/export_course_metadata/",
-      "cms/djangoapps/maintenance/",
       "cms/djangoapps/models/",
       "cms/djangoapps/pipeline_js/",
       "cms/djangoapps/xblock_config/",
@@ -256,15 +255,13 @@
   "common-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
-      "common/djangoapps/",
-      "pavelib/"
+      "common/djangoapps/"
     ]
   },
   "common-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
-      "common/djangoapps/",
-      "pavelib/"
+      "common/djangoapps/"
     ]
   },
   "xmodule-with-lms": {
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 3e442b75d4e7..d399d38770b9 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   run-tests:
     name: ${{ matrix.shard_name }}(py=${{ matrix.python-version }},dj=${{ matrix.django-version }},mongo=${{ matrix.mongo-version }})
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os-version }}
     strategy:
       matrix:
         python-version:
@@ -43,22 +43,27 @@ jobs:
           - "xmodule-with-cms"
         mongo-version:
           - "7.0"
+        os-version:
+          - ubuntu-24.04
 
-        # We only need to test older versions of Mongo with modules that directly interface with Mongo (that is: xmodule.modulestore)
-        # This code is left here as an example for future refernce in case we need to reduce the number of shards we're
-        # testing but still have good confidence with older versions of mongo.  We use Mongo 4.4 in the example.
+        # It's useful to run some subset of the tests on the older version of Ubuntu
+        # so that we don't spend too many resources on this but can find major issues quickly
+        # while we're in a situation where we support two versions.  This section may be commented
+        # out when not in use to easily add/drop future support for any given major dependency.
         #
-        # exclude:
-        #   - mongo-version: "4.4"
-        # include:
-        #   - shard_name: "xmodule-with-cms"
-        #     python-version: "3.11"
-        #     django-version: "pinned"
-        #     mongo-version: "4.4"
-        #   - shard_name: "xmodule-with-lms"
-        #     python-version: "3.11"
-        #     django-version: "pinned"
-        #     mongo-version: "4.4"
+        # We're testing the older version of Ubuntu and running the xmodule tests since those rely on many
+        # dependent complex libraries and will hopefully catch most issues quickly.
+        include:
+          - shard_name: "xmodule-with-cms"
+            python-version: "3.11"
+            django-version: "pinned"
+            mongo-version: "7.0"
+            os-version: "ubuntu-22.04"
+          - shard_name: "xmodule-with-lms"
+            python-version: "3.11"
+            django-version: "pinned"
+            mongo-version: "7.0"
+            os-version: "ubuntu-22.04"
 
     steps:
       - name: checkout repo
@@ -68,19 +73,20 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install libmysqlclient-dev libxmlsec1-dev lynx
 
-      - name: install mongo version
-        run: |
-          if [[ "${{ matrix.mongo-version }}" != "4.4" ]]; then
-            wget -qO - https://www.mongodb.org/static/pgp/server-${{ matrix.mongo-version }}.asc | sudo apt-key add -
-            echo "deb https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/${{ matrix.mongo-version }} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${{ matrix.mongo-version }}.list
-            sudo apt-get update && sudo apt-get install -y mongodb-org="${{ matrix.mongo-version }}.*"
-          fi
+      # Try to log into DockerHub so that we're less likely to be rate-limited when pulling certain images.
+      # This will fail on any edx-platform fork which doesn't explicitly define its own DockerHub creds.
+      # That's OK--if we fail to log in, we'll proceed anonymously, and hope we don't get rate-limited.
+      - name: Try to log into Docker Hub
+        uses: docker/login-action@v3.3.0
+        continue-on-error: true
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: start mongod server for tests
-        run: |
-          sudo mkdir -p /data/db
-          sudo chmod -R a+rw /data/db
-          mongod &
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.11.0
+        with:
+          mongodb-version: ${{ matrix.mongo-version }}
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -142,7 +148,7 @@ jobs:
           overwrite: true
 
   collect-and-verify:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
@@ -162,7 +168,7 @@ jobs:
         shell: bash
         run: |
           echo "root_cms_unit_tests_count=$(pytest --disable-warnings --collect-only --ds=cms.envs.test cms/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
-          echo "root_lms_unit_tests_count=$(pytest --disable-warnings --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ xmodule/ pavelib/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
+          echo "root_lms_unit_tests_count=$(pytest --disable-warnings --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ xmodule/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
 
       - name: get GHA unit test paths
         shell: bash
@@ -201,13 +207,12 @@ jobs:
           to add any missing apps and match the count. for more details please take a look at scripts/gha-shards-readme.md"
           exit 1
 
-
   # This job aggregates test results. It's the required check for branch protection.
   # https://github.com/marketplace/actions/alls-green#why
   # https://github.com/orgs/community/discussions/33579
   success:
     name: Unit tests successful
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: always()
     needs: [run-tests]
     steps:
@@ -218,7 +223,7 @@ jobs:
           jobs: ${{ toJSON(needs) }}
 
   compile-warnings-report:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [run-tests]
     steps:
       - uses: actions/checkout@v4
@@ -246,7 +251,7 @@ jobs:
           overwrite: true
 
   merge-artifacts:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [compile-warnings-report]
     steps:
       - name: Merge Pytest Warnings JSON Artifacts
@@ -266,7 +271,7 @@ jobs:
   # Combine and upload coverage reports.
   coverage:
     if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [run-tests]
     strategy:
       matrix:
diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml
index 6ca5dfcb355e..84a00266e99f 100644
--- a/.github/workflows/upgrade-one-python-dependency.yml
+++ b/.github/workflows/upgrade-one-python-dependency.yml
@@ -28,7 +28,7 @@ defaults:
 
 jobs:
   upgrade-one-python-dependency:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Check out target branch
diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml
index 611fc0afc6e3..c398c506730b 100644
--- a/.github/workflows/verify-dunder-init.yml
+++ b/.github/workflows/verify-dunder-init.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Verify Dunder __init__.py Files
 
 on:
   pull_request:
@@ -8,7 +8,7 @@ on:
 jobs:
   verify_dunder_init:
     name: Verify __init__.py Files
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Check out branch
diff --git a/.nvmrc b/.nvmrc
index 3c032078a4a2..209e3ef4b624 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/.pii_annotations.yml b/.pii_annotations.yml
index 328520738f10..9000115a253e 100644
--- a/.pii_annotations.yml
+++ b/.pii_annotations.yml
@@ -1,7 +1,7 @@
 source_path: ./
 report_path: pii_report
 safelist_path: .annotation_safe_list.yml
-coverage_target: 94.5
+coverage_target: 85.3
 # See OEP-30 for more information on these values and what they mean:
 # https://open-edx-proposals.readthedocs.io/en/latest/oep-0030-arch-pii-markup-and-auditing.html#docstring-annotations
 annotations:
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 56d794e3567c..c0db64e5e188 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -3,7 +3,7 @@ version: 2
 build:
   os: "ubuntu-22.04"
   tools:
-    python: "3.8"
+    python: "3.11"
 
 sphinx:
   configuration: docs/conf.py
diff --git a/.stylelintignore b/.stylelintignore
deleted file mode 100644
index cd53bacf3cf9..000000000000
--- a/.stylelintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-xmodule/css
-common/static/sass/bourbon
-common/static/xmodule/modules/css
-common/test/test-theme
-lms/static/sass/vendor
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 75a716177fdc..000000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,200 +0,0 @@
-FROM ubuntu:focal as minimal-system
-
-# Warning: This file is experimental.
-#
-# Short-term goals:
-# * Be a suitable replacement for the `edxops/edxapp` image in devstack (in progress).
-# * Take advantage of Docker caching layers: aim to put commands in order of
-#   increasing cache-busting frequency.
-# * Related to ^, use no Ansible or Paver.
-# Long-term goal:
-# * Be a suitable base for production LMS and CMS images (THIS IS NOT YET THE CASE!).
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG SERVICE_VARIANT
-ARG SERVICE_PORT
-
-# Env vars: paver
-# We intentionally don't use paver in this Dockerfile, but Devstack may invoke paver commands
-# during provisioning. Enabling NO_PREREQ_INSTALL tells paver not to re-install Python
-# requirements for every paver command, potentially saving a lot of developer time.
-ARG NO_PREREQ_INSTALL='1'
-
-# Env vars: locale
-ENV LANG='en_US.UTF-8'
-ENV LANGUAGE='en_US:en'
-ENV LC_ALL='en_US.UTF-8'
-
-# Env vars: configuration
-ENV CONFIG_ROOT='/edx/etc'
-ENV LMS_CFG="$CONFIG_ROOT/lms.yml"
-ENV CMS_CFG="$CONFIG_ROOT/cms.yml"
-
-# Env vars: path
-ENV VIRTUAL_ENV="/edx/app/edxapp/venvs/edxapp"
-ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
-ENV PATH="/edx/app/edxapp/edx-platform/node_modules/.bin:${PATH}"
-ENV PATH="/edx/app/edxapp/edx-platform/bin:${PATH}"
-ENV PATH="/edx/app/edxapp/nodeenv/bin:${PATH}"
-
-WORKDIR /edx/app/edxapp/edx-platform
-
-# Create user before assigning any directory ownership to it.
-RUN useradd -m --shell /bin/false app
-
-# Use debconf to set locales to be generated when the locales apt package is installed later.
-RUN echo "locales locales/default_environment_locale select en_US.UTF-8" | debconf-set-selections
-RUN echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8" | debconf-set-selections
-
-# Setting up ppa deadsnakes to get python 3.11
-RUN apt-get update && \
-  apt-get install -y software-properties-common && \
-  apt-add-repository -y ppa:deadsnakes/ppa
-
-# Install requirements that are absolutely necessary
-RUN apt-get update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y install --no-install-recommends \
-        python3-pip \
-        python3.11 \
-        # python3-dev: required for building mysqlclient python package
-        python3.11-dev \
-        python3.11-venv \
-        libpython3.11 \
-        libpython3.11-stdlib \
-        libmysqlclient21 \
-        # libmysqlclient-dev: required for building mysqlclient python package
-        libmysqlclient-dev \
-        pkg-config \
-        libssl1.1 \
-        libxmlsec1-openssl \
-        # lynx: Required by https://github.com/openedx/edx-platform/blob/b489a4ecb122/openedx/core/lib/html_to_text.py#L16
-        lynx \
-        ntp \
-        git \
-        build-essential \
-        gettext \
-        gfortran \
-        graphviz \
-        locales \
-        swig \
-    && \
-    apt-get clean all && \
-    rm -rf /var/lib/apt/*
-
-RUN mkdir -p /edx/var/edxapp
-RUN mkdir -p /edx/etc
-RUN chown app:app /edx/var/edxapp
-
-# The builder-production stage is a temporary stage that installs required packages and builds the python virtualenv,
-# installs nodejs and node_modules.
-# The built artifacts from this stage are then copied to the base stage.
-FROM minimal-system as builder-production
-
-RUN apt-get update && \
-    apt-get -y install --no-install-recommends \
-        curl \
-        libssl-dev \
-        libffi-dev \
-        libfreetype6-dev \
-        libgeos-dev \
-        libgraphviz-dev \
-        libjpeg8-dev \
-        liblapack-dev \
-        libpng-dev \
-        libsqlite3-dev \
-        libxml2-dev \
-        libxmlsec1-dev \
-        libxslt1-dev
-
-# Setup python virtual environment
-# It is already 'activated' because $VIRTUAL_ENV/bin was put on $PATH
-RUN python3.11 -m venv "${VIRTUAL_ENV}"
-
-# Install python requirements
-# Requires copying over requirements files, but not entire repository
-COPY requirements requirements
-RUN pip install -r requirements/pip.txt
-RUN pip install -r requirements/edx/base.txt
-
-# Install node and npm
-RUN nodeenv /edx/app/edxapp/nodeenv --node=18.19.0 --prebuilt
-RUN npm install -g npm@10.5.x
-
-# This script is used by an npm post-install hook.
-# We copy it into the image now so that it will be available when we run `npm install` in the next step.
-# The script itself will copy certain modules into some uber-legacy parts of edx-platform which still use RequireJS.
-COPY scripts/copy-node-modules.sh scripts/copy-node-modules.sh
-
-# Install node modules
-COPY package.json package.json
-COPY package-lock.json package-lock.json
-RUN npm set progress=false && npm ci
-
-# The builder-development stage is a temporary stage that installs python modules required for development purposes
-# The built artifacts from this stage are then copied to the development stage.
-FROM builder-production as builder-development
-
-RUN pip install -r requirements/edx/development.txt
-
-# base stage
-FROM minimal-system as base
-
-# Copy python virtual environment, nodejs and node_modules
-COPY --from=builder-production /edx/app/edxapp/venvs/edxapp /edx/app/edxapp/venvs/edxapp
-COPY --from=builder-production /edx/app/edxapp/nodeenv /edx/app/edxapp/nodeenv
-COPY --from=builder-production /edx/app/edxapp/edx-platform/node_modules /edx/app/edxapp/edx-platform/node_modules
-
-# Copy over remaining parts of repository (including all code)
-COPY . .
-
-# Install Python requirements again in order to capture local projects
-RUN pip install -e .
-
-# Setting edx-platform directory as safe for git commands
-RUN git config --global --add safe.directory /edx/app/edxapp/edx-platform
-
-# Production target
-FROM base as production
-
-USER app
-
-ENV EDX_PLATFORM_SETTINGS='docker-production'
-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} \
-    --bind=0.0.0.0:${SERVICE_PORT} \
-    --max-requests=1000 \
-    --access-logfile \
-    - ${SERVICE_VARIANT}.wsgi:application
-
-# Development target
-FROM base as development
-
-RUN apt-get update && \
-    apt-get -y install --no-install-recommends \
-        # wget is used in Makefile for common_constraints.txt
-        wget \
-    && \
-    apt-get clean all && \
-    rm -rf /var/lib/apt/*
-
-COPY --from=builder-development /edx/app/edxapp/venvs/edxapp /edx/app/edxapp/venvs/edxapp
-
-RUN ln -s "$(pwd)/lms/envs/devstack-experimental.yml" "$LMS_CFG"
-RUN ln -s "$(pwd)/cms/envs/devstack-experimental.yml" "$CMS_CFG"
-# Temporary compatibility hack while devstack is supporting both the old `edxops/edxapp` image and this image.
-# * Add in a dummy ../edxapp_env file
-# * devstack sets /edx/etc/studio.yml as CMS_CFG.
-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}"
-EXPOSE ${SERVICE_PORT}
-CMD ./manage.py ${SERVICE_VARIANT} runserver 0.0.0.0:${SERVICE_PORT}
diff --git a/Makefile b/Makefile
index 15bab5df67a9..08b6f14893cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
 # Do things in edx-platform
 .PHONY: base-requirements check-types clean \
   compile-requirements detect_changed_source_translations dev-requirements \
-  docker_auth docker_build docker_tag_build_push_lms docker_tag_build_push_lms_dev \
-  docker_tag_build_push_cms docker_tag_build_push_cms_dev docs extract_translations \
+  docs extract_translations \
   guides help lint-imports local-requirements migrate migrate-lms migrate-cms \
   pre-requirements pull pull_xblock_translations pull_translations push_translations \
   requirements shell swagger \
@@ -67,9 +66,6 @@ pull_translations: clean_translations  ## pull translations via atlas
 detect_changed_source_translations: ## check if translation files are up-to-date
 	i18n_tool changed
 
-pull: ## update the Docker image used by "make shell"
-	docker pull edxops/edxapp:latest
-
 pre-requirements: ## install Python requirements for running pip-tools
 	pip install -r requirements/pip.txt
 	pip install -r requirements/pip-tools.txt
@@ -94,17 +90,9 @@ test-requirements: pre-requirements
 
 requirements: dev-requirements ## install development environment requirements
 
-shell: ## launch a bash shell in a Docker container with all edx-platform dependencies installed
-	docker run -it -e "NO_PYTHON_UNINSTALL=1" -e "PIP_INDEX_URL=https://pypi.python.org/simple" -e TERM \
-	-v `pwd`:/edx/app/edxapp/edx-platform:cached \
-	-v edxapp_lms_assets:/edx/var/edxapp/staticfiles/ \
-	-v edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules \
-	edxops/edxapp:latest /edx/app/edxapp/devstack.sh open
-
 # Order is very important in this list: files must appear after everything they include!
 REQ_FILES = \
 	requirements/edx/coverage \
-	requirements/edx/paver \
 	requirements/edx-sandbox/base \
 	requirements/edx/base \
 	requirements/edx/doc \
@@ -164,27 +152,6 @@ upgrade-package: ## update just one package to the latest usable release
 check-types: ## run static type-checking tests
 	mypy
 
-docker_auth:
-	echo "$$DOCKERHUB_PASSWORD" | docker login -u "$$DOCKERHUB_USERNAME" --password-stdin
-
-docker_build: docker_auth
-	DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=lms --build-arg SERVICE_PORT=8000 --target development -t openedx/lms-dev
-	DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=lms --build-arg SERVICE_PORT=8000 --target production -t openedx/lms
-	DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=cms --build-arg SERVICE_PORT=8010 --target development -t openedx/cms-dev
-	DOCKER_BUILDKIT=1 docker build . --build-arg SERVICE_VARIANT=cms --build-arg SERVICE_PORT=8010 --target production -t openedx/cms
-
-docker_tag_build_push_lms: docker_auth
-	docker buildx build -t openedx/lms:latest -t openedx/lms:${GITHUB_SHA} --platform linux/amd64,linux/arm64 --build-arg SERVICE_VARIANT=lms --build-arg SERVICE_PORT=8000 --target production --push .
-
-docker_tag_build_push_lms_dev: docker_auth
-	docker buildx build -t openedx/lms-dev:latest -t openedx/lms-dev:${GITHUB_SHA} --platform linux/amd64,linux/arm64 --build-arg SERVICE_VARIANT=lms --build-arg SERVICE_PORT=8000 --target development --push .
-
-docker_tag_build_push_cms: docker_auth
-	docker buildx build -t openedx/cms:latest -t openedx/cms:${GITHUB_SHA} --platform linux/amd64,linux/arm64 --build-arg SERVICE_VARIANT=cms --build-arg SERVICE_PORT=8010 --target production --push .
-
-docker_tag_build_push_cms_dev: docker_auth
-	docker buildx build -t openedx/cms-dev:latest -t openedx/cms-dev:${GITHUB_SHA} --platform linux/amd64,linux/arm64 --build-arg SERVICE_VARIANT=cms --build-arg SERVICE_PORT=8010 --target development --push .
-
 lint-imports:
 	lint-imports
 
@@ -204,3 +171,37 @@ migrate: migrate-lms migrate-cms
 # Part of https://github.com/openedx/wg-developer-experience/issues/136
 ubuntu-requirements: ## Install ubuntu 22.04 system packages needed for `pip install` to work on ubuntu.
 	sudo apt install libmysqlclient-dev libxmlsec1-dev
+
+xsslint: ## check xss for quality issuest
+	python scripts/xsslint/xss_linter.py \
+	--rule-totals \
+	--config=scripts.xsslint_config \
+	--thresholds=scripts/xsslint_thresholds.json
+
+pycodestyle: ## check python files for quality issues
+	pycodestyle .
+
+## Re-enable --lint flag when this issue https://github.com/openedx/edx-platform/issues/35775 is resolved
+pii_check: ## check django models for pii annotations
+	DJANGO_SETTINGS_MODULE=cms.envs.test \
+	code_annotations django_find_annotations \
+		--config_file .pii_annotations.yml \
+		--app_name cms \
+		--coverage \
+		--lint
+
+	DJANGO_SETTINGS_MODULE=lms.envs.test \
+	code_annotations django_find_annotations \
+		--config_file .pii_annotations.yml \
+		--app_name lms \
+		--coverage \
+		--lint
+
+check_keywords: ## check django models for reserve keywords
+	DJANGO_SETTINGS_MODULE=cms.envs.test \
+	python manage.py cms check_reserved_keywords \
+	--override_file db_keyword_overrides.yml
+
+	DJANGO_SETTINGS_MODULE=lms.envs.test \
+	python manage.py lms check_reserved_keywords \
+	--override_file db_keyword_overrides.yml
diff --git a/README.rst b/README.rst
index e74176faf91e..54b91363a85f 100644
--- a/README.rst
+++ b/README.rst
@@ -70,6 +70,11 @@ complexity of Open edX configuration and deployment into their own hands.
 System Dependencies
 -------------------
 
+OS:
+* Ubuntu 22.04
+
+* Ubuntu 24.04
+
 Interperters/Tools:
 
 * Python 3.11
@@ -100,6 +105,17 @@ Language Packages:
   - ``pip install -r requirements/edx/base.txt`` (production)
   - ``pip install -r requirements/edx/dev.txt`` (development)
 
+  Some Python packages have system dependencies. For example, installing these packages on Debian or Ubuntu will require first running ``sudo apt install python3-dev default-libmysqlclient-dev build-essential pkg-config`` to satisfy the requirements of the ``mysqlclient`` Python package.
+
+Codejail Setup
+--------------
+
+As a part of the baremetal setup, you will need to configure your system to
+work properly with codejail.  See the `codejail installation steps`_ for more
+details.
+
+.. _codejail installation steps: https://github.com/openedx/codejail?tab=readme-ov-file#installation
+
 Build Steps
 -----------
 
@@ -124,6 +140,35 @@ sites)::
   ./manage.py lms collectstatic
   ./manage.py cms collectstatic
 
+Set up CMS SSO (for Development)::
+
+  ./manage.py lms manage_user studio_worker example@example.com --unusable-password
+  # DO NOT DO THIS IN PRODUCTION. It will make your auth insecure.
+  ./manage.py lms create_dot_application studio-sso-id studio_worker \
+      --grant-type authorization-code \
+      --skip-authorization \
+      --redirect-uris 'http://localhost:18010/complete/edx-oauth2/' \
+      --scopes user_id  \
+      --client-id 'studio-sso-id' \
+      --client-secret 'studio-sso-secret'
+
+Set up CMS SSO (for Production):
+
+* Create the CMS user and the OAuth application::
+
+    ./manage.py lms manage_user studio_worker <email@yourcompany.com> --unusable-password
+    ./manage.py lms create_dot_application studio-sso-id studio_worker \
+        --grant-type authorization-code \
+        --skip-authorization \
+        --redirect-uris 'http://localhost:18010/complete/edx-oauth2/' \
+        --scopes user_id
+
+* Log into Django admin (eg. http://localhost:18000/admin/oauth2_provider/application/),
+  click into the application you created above (``studio-sso-id``), and copy its "Client secret".
+* In your private LMS_CFG yaml file or your private Django settings module:
+
+ * Set ``SOCIAL_AUTH_EDX_OAUTH2_KEY`` to the client ID (``studio-sso-id``).
+ * Set ``SOCIAL_AUTH_EDX_OAUTH2_SECRET`` to the client secret (which you copied).
 Run the Platform
 ----------------
 
@@ -131,11 +176,11 @@ First, ensure MySQL, Mongo, and Memcached are running.
 
 Start the LMS::
 
-  ./manage.py lms runserver
+  ./manage.py lms runserver 18000
 
 Start the CMS::
 
-  ./manage.py cms runserver
+  ./manage.py cms runserver 18010
 
 This will give you a mostly-headless Open edX platform. Most frontends have
 been migrated to "Micro-Frontends (MFEs)" which need to be installed and run
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 885b879833d4..c6b87b08db82 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -10,6 +10,8 @@ metadata:
     - url: "https://docs.openedx.org"
       title: "Documentation"
       icon: "Web"
+  annotations:
+    openedx.org/release: "master"
 spec:
   owner: group:wg-maintenance-edx-platform
   type: 'service'
diff --git a/cms/djangoapps/contentstore/asset_storage_handlers.py b/cms/djangoapps/contentstore/asset_storage_handlers.py
index 281258e03a8d..97fcb3125745 100644
--- a/cms/djangoapps/contentstore/asset_storage_handlers.py
+++ b/cms/djangoapps/contentstore/asset_storage_handlers.py
@@ -25,6 +25,7 @@
 from common.djangoapps.util.json_request import JsonResponse
 from openedx.core.djangoapps.contentserver.caching import del_cached_content
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx_filters.course_authoring.filters import LMSPageURLRequested
 from xmodule.contentstore.content import StaticContent  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.contentstore.django import contentstore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.exceptions import NotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
@@ -714,7 +715,15 @@ def get_asset_json(display_name, content_type, date, location, thumbnail_locatio
     Helper method for formatting the asset information to send to client.
     '''
     asset_url = StaticContent.serialize_asset_key_with_slash(location)
-    external_url = urljoin(configuration_helpers.get_value('LMS_ROOT_URL', settings.LMS_ROOT_URL), asset_url)
+
+    ## .. filter_implemented_name: LMSPageURLRequested
+    ## .. filter_type: org.openedx.course_authoring.lms.page.url.requested.v1
+    lms_root, _ = LMSPageURLRequested.run_filter(
+        url=configuration_helpers.get_value('LMS_ROOT_URL', settings.LMS_ROOT_URL),
+        org=location.org,
+    )
+
+    external_url = urljoin(lms_root, asset_url)
     portable_url = StaticContent.get_static_path_from_location(location)
     usage_locations = [] if usage is None else usage
     return {
diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index f84290ba83ae..ae0e6ea467b5 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -4,7 +4,7 @@
 """
 
 
-from edx_toggles.toggles import WaffleFlag, WaffleSwitch
+from edx_toggles.toggles import WaffleSwitch
 
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
 
@@ -26,20 +26,6 @@
     f'{WAFFLE_NAMESPACE}.show_review_rules', __name__, LOG_PREFIX
 )
 
-# Waffle flag to redirect to the library authoring MFE.
-# .. toggle_name: contentstore.library_authoring_mfe
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Toggles the new micro-frontend-based implementation of the library authoring experience.
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2020-08-03
-# .. toggle_target_removal_date: 2020-12-31
-# .. toggle_warning: Also set settings.LIBRARY_AUTHORING_MICROFRONTEND_URL and ENABLE_LIBRARY_AUTHORING_MICROFRONTEND.
-# .. toggle_tickets: https://openedx.atlassian.net/wiki/spaces/OEPM/pages/4106944527/Libraries+Relaunch+Proposal+For+Product+Review
-REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND = WaffleFlag(
-    f'{WAFFLE_NAMESPACE}.library_authoring_mfe', __name__, LOG_PREFIX
-)
-
 
 # .. toggle_name: studio.custom_relative_dates
 # .. toggle_implementation: CourseWaffleFlag
diff --git a/cms/djangoapps/contentstore/courseware_index.py b/cms/djangoapps/contentstore/courseware_index.py
index 48647bf47bc6..d3b6f811d5f6 100644
--- a/cms/djangoapps/contentstore/courseware_index.py
+++ b/cms/djangoapps/contentstore/courseware_index.py
@@ -256,7 +256,8 @@ def prepare_item_index(item, skip_index=False, groups_usage_info=None):
                 # Now index the content
                 for item in structure.get_children():
                     prepare_item_index(item, groups_usage_info=groups_usage_info)
-                searcher.index(items_index, request_timeout=timeout)
+                if items_index:
+                    searcher.index(items_index, request_timeout=timeout)
                 cls.remove_deleted_items(searcher, structure_key, indexed_items)
         except Exception as err:  # pylint: disable=broad-except
             # broad exception so that index operation does not prevent the rest of the application from working
diff --git a/cms/djangoapps/contentstore/helpers.py b/cms/djangoapps/contentstore/helpers.py
index a4ece6c85d59..e40eddb6c99e 100644
--- a/cms/djangoapps/contentstore/helpers.py
+++ b/cms/djangoapps/contentstore/helpers.py
@@ -3,14 +3,17 @@
 """
 from __future__ import annotations
 import logging
+import pathlib
 import urllib
 from lxml import etree
 from mimetypes import guess_type
+import re
 
 from attrs import frozen, Factory
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.utils.translation import gettext as _
-from opaque_keys.edx.keys import AssetKey, CourseKey, UsageKey
+from opaque_keys.edx.keys import CourseKey, UsageKey
 from opaque_keys.edx.locator import DefinitionLocator, LocalId
 from xblock.core import XBlock
 from xblock.fields import ScopeIds
@@ -22,6 +25,7 @@
 from xmodule.xml_block import XmlMixin
 
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
+from cms.lib.xblock.upstream_sync import UpstreamLink, UpstreamLinkException, fetch_customizable_fields
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 import openedx.core.djangoapps.content_staging.api as content_staging_api
 import openedx.core.djangoapps.content_tagging.api as content_tagging_api
@@ -30,6 +34,10 @@
 
 log = logging.getLogger(__name__)
 
+
+User = get_user_model()
+
+
 # Note: Grader types are used throughout the platform but most usages are simply in-line
 # strings.  In addition, new grader types can be defined on the fly anytime one is needed
 # (because they're just strings). This dict is an attempt to constrain the sprawl in Studio.
@@ -184,6 +192,10 @@ def xblock_type_display_name(xblock, default_display_name=None):
         # description like "Multiple Choice Problem", but that won't work if our 'block' argument is just the block_type
         # string ("problem").
         return _('Problem')
+    elif category == 'library_v2':
+        return _('Library Content')
+    elif category == 'itembank':
+        return _('Problem Bank')
     component_class = XBlock.load_class(category)
     if hasattr(component_class, 'display_name') and component_class.display_name.default:
         return _(component_class.display_name.default)  # lint-amnesty, pylint: disable=translation-of-non-string
@@ -261,7 +273,6 @@ def import_staged_content_from_user_clipboard(parent_key: UsageKey, request) ->
     empty, and (2) a summary of changes made to static files in the destination
     course.
     """
-
     from cms.djangoapps.contentstore.views.preview import _load_preview_block
 
     if not content_staging_api:
@@ -271,7 +282,6 @@ def import_staged_content_from_user_clipboard(parent_key: UsageKey, request) ->
         # Clipboard is empty or expired/error/loading
         return None, StaticFileNotices()
     olx_str = content_staging_api.get_staged_content_olx(user_clipboard.content.id)
-    static_files = content_staging_api.get_staged_content_static_files(user_clipboard.content.id)
     node = etree.fromstring(olx_str)
     store = modulestore()
     with store.bulk_operations(parent_key.course_key):
@@ -282,32 +292,102 @@ def import_staged_content_from_user_clipboard(parent_key: UsageKey, request) ->
             node,
             parent_xblock,
             store,
-            user_id=request.user.id,
+            user=request.user,
             slug_hint=user_clipboard.source_usage_key.block_id,
             copied_from_block=str(user_clipboard.source_usage_key),
+            copied_from_version_num=user_clipboard.content.version_num,
             tags=user_clipboard.content.tags,
         )
-    # Now handle static files that need to go into Files & Uploads:
-    notices = _import_files_into_course(
-        course_key=parent_key.context_key,
-        staged_content_id=user_clipboard.content.id,
-        static_files=static_files,
-    )
+
+        # Now handle static files that need to go into Files & Uploads.
+        static_files = content_staging_api.get_staged_content_static_files(user_clipboard.content.id)
+        notices, substitutions = _import_files_into_course(
+            course_key=parent_key.context_key,
+            staged_content_id=user_clipboard.content.id,
+            static_files=static_files,
+            usage_key=new_xblock.scope_ids.usage_id,
+        )
+
+        # Rewrite the OLX's static asset references to point to the new
+        # locations for those assets. See _import_files_into_course for more
+        # info on why this is necessary.
+        if hasattr(new_xblock, 'data') and substitutions:
+            data_with_substitutions = new_xblock.data
+            for old_static_ref, new_static_ref in substitutions.items():
+                data_with_substitutions = data_with_substitutions.replace(
+                    old_static_ref,
+                    new_static_ref,
+                )
+            new_xblock.data = data_with_substitutions
+            store.update_item(new_xblock, request.user.id)
 
     return new_xblock, notices
 
 
+def _fetch_and_set_upstream_link(
+    copied_from_block: str,
+    copied_from_version_num: int,
+    temp_xblock: XBlock,
+    user: User
+):
+    """
+    Fetch and set upstream link for the given xblock. This function handles following cases:
+    * the xblock is copied from a v2 library; the library block is set as upstream.
+    * the xblock is copied from a course; no upstream is set, only copied_from_block is set.
+    * the xblock is copied from a course where the source block was imported from a library; the original libary block
+      is set as upstream.
+    """
+    # Try to link the pasted block (downstream) to the copied block (upstream).
+    temp_xblock.upstream = copied_from_block
+    try:
+        UpstreamLink.get_for_block(temp_xblock)
+    except UpstreamLinkException:
+        # Usually this will fail. For example, if the copied block is a modulestore course block, it can't be an
+        # upstream. That's fine! Instead, we store a reference to where this block was copied from, in the
+        # 'copied_from_block' field (from AuthoringMixin).
+
+        # In case if the source block was imported from a library, we need to check its upstream
+        # and set the same upstream link for the new block.
+        source_descriptor = modulestore().get_item(UsageKey.from_string(copied_from_block))
+        if source_descriptor.upstream:
+            _fetch_and_set_upstream_link(
+                source_descriptor.upstream,
+                source_descriptor.upstream_version,
+                temp_xblock,
+                user,
+            )
+        else:
+            # else we store a reference to where this block was copied from, in the 'copied_from_block'
+            # field (from AuthoringMixin).
+            temp_xblock.upstream = None
+            temp_xblock.copied_from_block = copied_from_block
+    else:
+        # But if it doesn't fail, then populate the `upstream_version` field based on what was copied. Note that
+        # this could be the latest published version, or it could be an an even newer draft version.
+        temp_xblock.upstream_version = copied_from_version_num
+        # Also, fetch upstream values (`upstream_display_name`, etc.).
+        # Recall that the copied block could be a draft. So, rather than fetching from the published upstream (which
+        # could be older), fetch from the copied block itself. That way, if an author customizes a field, but then
+        # later wants to restore it, it will restore to the value that the field had when the block was pasted. Of
+        # course, if the author later syncs updates from a *future* published upstream version, then that will fetch
+        # new values from the published upstream content.
+        fetch_customizable_fields(upstream=temp_xblock, downstream=temp_xblock, user=user)
+
+
 def _import_xml_node_to_parent(
     node,
     parent_xblock: XBlock,
     # The modulestore we're using
     store,
-    # The ID of the user who is performing this operation
-    user_id: int,
+    # The user who is performing this operation
+    user: User,
     # Hint to use as usage ID (block_id) for the new XBlock
     slug_hint: str | None = None,
     # UsageKey of the XBlock that this one is a copy of
     copied_from_block: str | None = None,
+    # Positive int version of source block, if applicable (e.g., library block).
+    # Zero if not applicable (e.g., course block).
+    copied_from_version_num: int = 0,
     # Content tags applied to the source XBlock(s)
     tags: dict[str, str] | None = None,
 ) -> XBlock:
@@ -315,6 +395,8 @@ def _import_xml_node_to_parent(
     Given an XML node representing a serialized XBlock (OLX), import it into modulestore 'store' as a child of the
     specified parent block. Recursively copy children as needed.
     """
+    # pylint: disable=too-many-statements
+
     runtime = parent_xblock.runtime
     parent_key = parent_xblock.scope_ids.usage_id
     block_type = node.tag
@@ -366,6 +448,10 @@ def _import_xml_node_to_parent(
         temp_xblock = xblock_class.parse_xml(node_without_children, runtime, keys)
         child_nodes = list(node)
 
+    if issubclass(xblock_class, XmlMixin) and "x-is-pointer-node" in getattr(temp_xblock, "data", ""):
+        # Undo the "pointer node" hack if needed (e.g. for capa problems)
+        temp_xblock.data = re.sub(r'([^>]+) x-is-pointer-node="no"', r'\1', temp_xblock.data, count=1)
+
     # Restore the original id_generator
     runtime.id_generator = original_id_generator
 
@@ -373,19 +459,18 @@ def _import_xml_node_to_parent(
         raise NotImplementedError("We don't yet support pasting XBlocks with children")
     temp_xblock.parent = parent_key
     if copied_from_block:
-        # Store a reference to where this block was copied from, in the 'copied_from_block' field (AuthoringMixin)
-        temp_xblock.copied_from_block = copied_from_block
+        _fetch_and_set_upstream_link(copied_from_block, copied_from_version_num, temp_xblock, user)
     # Save the XBlock into modulestore. We need to save the block and its parent for this to work:
-    new_xblock = store.update_item(temp_xblock, user_id, allow_not_found=True)
+    new_xblock = store.update_item(temp_xblock, user.id, allow_not_found=True)
     parent_xblock.children.append(new_xblock.location)
-    store.update_item(parent_xblock, user_id)
+    store.update_item(parent_xblock, user.id)
 
     children_handled = False
     if hasattr(new_xblock, 'studio_post_paste'):
         # Allow an XBlock to do anything fancy it may need to when pasted from the clipboard.
         # These blocks may handle their own children or parenting if needed. Let them return booleans to
         # let us know if we need to handle these or not.
-        children_handed = new_xblock.studio_post_paste(store, node)
+        children_handled = new_xblock.studio_post_paste(store, node)
 
     if not children_handled:
         for child_node in child_nodes:
@@ -394,13 +479,20 @@ def _import_xml_node_to_parent(
                 child_node,
                 new_xblock,
                 store,
-                user_id=user_id,
+                user=user,
                 copied_from_block=str(child_copied_from),
                 tags=tags,
             )
 
     # Copy content tags to the new xblock
-    if copied_from_block and tags:
+    if new_xblock.upstream:
+        # If this block is synced from an upstream (e.g. library content),
+        # copy the tags from the upstream as ready-only
+        content_tagging_api.copy_tags_as_read_only(
+            new_xblock.upstream,
+            new_xblock.location,
+        )
+    elif copied_from_block and tags:
         object_tags = tags.get(str(copied_from_block))
         if object_tags:
             content_tagging_api.set_all_object_tags(
@@ -415,11 +507,21 @@ def _import_files_into_course(
     course_key: CourseKey,
     staged_content_id: int,
     static_files: list[content_staging_api.StagedContentFileData],
-) -> StaticFileNotices:
+    usage_key: UsageKey,
+) -> tuple[StaticFileNotices, dict[str, str]]:
     """
-    For the given staged static asset files (which are in "Staged Content" such as the user's clipbaord, but which
-    need to end up in the course's Files & Uploads page), import them into the destination course, unless they already
+    For the given staged static asset files (which are in "Staged Content" such
+    as the user's clipbaord, but which need to end up in the course's Files &
+    Uploads page), import them into the destination course, unless they already
     exist.
+
+    This function returns a tuple of StaticFileNotices (assets added, errors,
+    conflicts), and static asset path substitutions that should be made in the
+    OLX in order to paste this content into this course. The latter is for the
+    case in which we're brining content in from a v2 library, which stores
+    static assets locally to a Component and needs to go into a subdirectory
+    when pasting into a course to avoid overwriting commonly named things, e.g.
+    "figure1.png".
     """
     # List of files that were newly added to the destination course
     new_files = []
@@ -427,17 +529,25 @@ def _import_files_into_course(
     conflicting_files = []
     # List of files that had an error (shouldn't happen unless we have some kind of bug)
     error_files = []
+
+    # Store a mapping of asset URLs that need to be modified for the destination
+    # assets. This is necessary when you take something from a library and paste
+    # it into a course, because we need to translate Component-local static
+    # assets and shove them into the Course's global Files & Uploads space in a
+    # nested directory structure.
+    substitutions = {}
     for file_data_obj in static_files:
-        if not isinstance(file_data_obj.source_key, AssetKey):
-            # This static asset was managed by the XBlock and instead of being added to "Files & Uploads", it is stored
-            # using some other system. We could make it available via runtime.resources_fs during XML parsing, but it's
-            # not needed here.
-            continue
         # At this point, we know this is a "Files & Uploads" asset that we may need to copy into the course:
         try:
-            result = _import_file_into_course(course_key, staged_content_id, file_data_obj)
+            result, substitution_for_file = _import_file_into_course(
+                course_key,
+                staged_content_id,
+                file_data_obj,
+                usage_key,
+            )
             if result is True:
                 new_files.append(file_data_obj.filename)
+                substitutions.update(substitution_for_file)
             elif result is None:
                 pass  # This file already exists; no action needed.
             else:
@@ -445,25 +555,45 @@ def _import_files_into_course(
         except Exception:  # lint-amnesty, pylint: disable=broad-except
             error_files.append(file_data_obj.filename)
             log.exception(f"Failed to import Files & Uploads file {file_data_obj.filename}")
-    return StaticFileNotices(
+
+    notices = StaticFileNotices(
         new_files=new_files,
         conflicting_files=conflicting_files,
         error_files=error_files,
     )
 
+    return notices, substitutions
+
 
 def _import_file_into_course(
     course_key: CourseKey,
     staged_content_id: int,
     file_data_obj: content_staging_api.StagedContentFileData,
-) -> bool | None:
+    usage_key: UsageKey,
+) -> tuple[bool | None, dict]:
     """
     Import a single staged static asset file into the course, unless it already exists.
     Returns True if it was imported, False if there's a conflict, or None if
     the file already existed (no action needed).
     """
-    filename = file_data_obj.filename
-    new_key = course_key.make_asset_key("asset", filename)
+    clipboard_file_path = file_data_obj.filename
+
+    # We need to generate an AssetKey to add an asset to a course. The mapping
+    # of directories '/' -> '_' is a long-existing contentstore convention that
+    # we're not going to attempt to change.
+    if clipboard_file_path.startswith('static/'):
+        # If it's in this form, it came from a library and assumes component-local assets
+        file_path = clipboard_file_path.lstrip('static/')
+        import_path = f"components/{usage_key.block_type}/{usage_key.block_id}/{file_path}"
+        filename = pathlib.Path(file_path).name
+        new_key = course_key.make_asset_key("asset", import_path.replace("/", "_"))
+    else:
+        # Otherwise it came from a course...
+        file_path = clipboard_file_path
+        import_path = None
+        filename = pathlib.Path(file_path).name
+        new_key = course_key.make_asset_key("asset", file_path.replace("/", "_"))
+
     try:
         current_file = contentstore().find(new_key)
     except NotFoundError:
@@ -471,22 +601,28 @@ def _import_file_into_course(
     if not current_file:
         # This static asset should be imported into the new course:
         content_type = guess_type(filename)[0]
-        data = content_staging_api.get_staged_content_static_file_data(staged_content_id, filename)
+        data = content_staging_api.get_staged_content_static_file_data(staged_content_id, clipboard_file_path)
         if data is None:
             raise NotFoundError(file_data_obj.source_key)
-        content = StaticContent(new_key, name=filename, content_type=content_type, data=data)
+        content = StaticContent(
+            new_key,
+            name=filename,
+            content_type=content_type,
+            data=data,
+            import_path=import_path
+        )
         # If it's an image file, also generate the thumbnail:
         thumbnail_content, thumbnail_location = contentstore().generate_thumbnail(content)
         if thumbnail_content is not None:
             content.thumbnail_location = thumbnail_location
         contentstore().save(content)
-        return True
+        return True, {clipboard_file_path: f"static/{import_path}"}
     elif current_file.content_digest == file_data_obj.md5_hash:
         # The file already exists and matches exactly, so no action is needed
-        return None
+        return None, {}
     else:
         # There is a conflict with some other file that has the same name.
-        return False
+        return False, {}
 
 
 def is_item_in_course_tree(item):
diff --git a/cms/djangoapps/contentstore/management/commands/import.py b/cms/djangoapps/contentstore/management/commands/import.py
index 4ff9e7ce8d43..346f10d933b1 100644
--- a/cms/djangoapps/contentstore/management/commands/import.py
+++ b/cms/djangoapps/contentstore/management/commands/import.py
@@ -8,7 +8,7 @@
 from openedx.core.djangoapps.django_comment_common.utils import are_permissions_roles_seeded, seed_permissions_roles
 from xmodule.contentstore.django import contentstore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.modulestore.django import SignalHandler, modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.xml_importer import import_course_from_xml  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.util.sandboxing import DEFAULT_PYTHON_LIB_FILENAME  # lint-amnesty, pylint: disable=wrong-import-order
 
@@ -73,6 +73,10 @@ def handle(self, *args, **options):
 
         for course in course_items:
             course_id = course.id
+            # Importing is an act of publishing so send the course published signal.
+            SignalHandler.course_published.send_robust(sender=self, course_key=course_id)
+
+            # Seed forum permission roles if we need to.
             if not are_permissions_roles_seeded(course_id):
                 self.stdout.write(f'Seeding forum roles for course {course_id}\n')
                 seed_permissions_roles(course_id)
diff --git a/cms/djangoapps/contentstore/management/commands/reindex_course.py b/cms/djangoapps/contentstore/management/commands/reindex_course.py
index accbc077c4fc..275eff50626d 100644
--- a/cms/djangoapps/contentstore/management/commands/reindex_course.py
+++ b/cms/djangoapps/contentstore/management/commands/reindex_course.py
@@ -4,9 +4,10 @@
 import logging
 from textwrap import dedent
 from time import time
-from datetime import date
+from datetime import date, datetime
 
 from django.core.management import BaseCommand, CommandError
+from django.conf import settings
 from elasticsearch import exceptions
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
@@ -42,6 +43,10 @@ def add_arguments(self, parser):
         parser.add_argument('--active',
                             action='store_true',
                             help='Reindex active courses only')
+        parser.add_argument('--from_inclusion_date',
+                            action='store_true',
+                            help='Reindex courses with a start date greater than COURSEWARE_SEARCH_INCLUSION_DATE'
+                            )
         parser.add_argument('--setup',
                             action='store_true',
                             help='Reindex all courses on developers stack setup')
@@ -70,15 +75,17 @@ def handle(self, *args, **options):  # pylint: disable=too-many-statements
         course_ids = options['course_ids']
         all_option = options['all']
         active_option = options['active']
+        inclusion_date_option = options['from_inclusion_date']
         setup_option = options['setup']
         readable_option = options['warning']
         index_all_courses_option = all_option or setup_option
 
-        if ((not course_ids and not (index_all_courses_option or active_option)) or
-                (course_ids and (index_all_courses_option or active_option))):
+        course_option_flag_option = index_all_courses_option or active_option or inclusion_date_option
+
+        if (not course_ids and not course_option_flag_option) or (course_ids and course_option_flag_option):
             raise CommandError((
                 "reindex_course requires one or more <course_id>s"
-                " OR the --all, --active or --setup flags."
+                " OR the --all, --active, --setup, or --from_inclusion_date flags."
             ))
 
         store = modulestore()
@@ -97,14 +104,16 @@ def handle(self, *args, **options):  # pylint: disable=too-many-statements
                         logging.exception('Search Engine error - %s', exc)
                         return
 
-                    index_exists = searcher._es.indices.exists(index=index_name)  # pylint: disable=protected-access
+                    # Legacy Elasticsearch engine
+                    if hasattr(searcher, '_es'):  # pylint: disable=protected-access
+                        index_exists = searcher._es.indices.exists(index=index_name)  # pylint: disable=protected-access
 
-                    index_mapping = searcher._es.indices.get_mapping(  # pylint: disable=protected-access
-                        index=index_name,
-                    ) if index_exists else {}
+                        index_mapping = searcher._es.indices.get_mapping(  # pylint: disable=protected-access
+                            index=index_name,
+                        ) if index_exists else {}
 
-                    if index_exists and index_mapping:
-                        return
+                        if index_exists and index_mapping:
+                            return
 
             # if reindexing is done during devstack setup step, don't prompt the user
             if setup_option or query_yes_no(self.CONFIRMATION_PROMPT, default="no"):
@@ -127,6 +136,20 @@ def handle(self, *args, **options):  # pylint: disable=too-many-statements
             course_keys = list(map(lambda course: course.id, active_courses))
 
             logging.warning(f'Selected {len(course_keys)} active courses over a total of {len(all_courses)}.')
+        elif inclusion_date_option:
+            # in case of --from_inclusion_date, we get the list of course keys from all courses
+            # that are stored in modulestore and filter out courses with a start date less than
+            # the settings defined COURSEWARE_SEARCH_INCLUSION_DATE
+            all_courses = modulestore().get_courses()
+
+            inclusion_date = datetime.strptime(
+                settings.FEATURES.get('COURSEWARE_SEARCH_INCLUSION_DATE', '2020-01-01'),
+                '%Y-%m-%d'
+            )
+
+            # We keep the courses that has a start date and the start date is greater than the inclusion date
+            active_courses = filter(lambda course: course.start and (course.start >= inclusion_date), all_courses)
+            course_keys = list(map(lambda course: course.id, active_courses))
 
         else:
             # in case course keys are provided as arguments
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_reindex_courses.py b/cms/djangoapps/contentstore/management/commands/tests/test_reindex_courses.py
index 13d33c48f92a..6d14b4a339f2 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_reindex_courses.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_reindex_courses.py
@@ -40,6 +40,9 @@ def setUp(self):
         self.third_course = CourseFactory.create(
             org="test", course="course3", display_name="run1", start=None, end=None
         )
+        self.fourth_course = CourseFactory.create(
+            org="test", course="course4", display_name="run1", start=datetime.min.today() - timedelta(weeks=60)
+        )
 
     REINDEX_PATH_LOCATION = (
         'cms.djangoapps.contentstore.management.commands.reindex_course.CoursewareSearchIndexer.do_course_reindex'
@@ -111,7 +114,9 @@ def test_given_all_key_prompts_and_reindexes_all_courses(self):
                 call_command('reindex_course', all=True)
 
                 patched_yes_no.assert_called_once_with(ReindexCommand.CONFIRMATION_PROMPT, default='no')
-                expected_calls = self._build_calls(self.first_course, self.second_course, self.third_course)
+                expected_calls = self._build_calls(
+                    self.first_course, self.second_course, self.third_course, self.fourth_course
+                )
                 self.assertCountEqual(patched_index.mock_calls, expected_calls)
 
     def test_given_all_key_prompts_and_reindexes_all_courses_cancelled(self):
@@ -134,5 +139,21 @@ def test_given_active_key_prompt(self):
                 mock.patch(self.MODULESTORE_PATCH_LOCATION, mock.Mock(return_value=self.store)):
             call_command('reindex_course', active=True)
 
-            expected_calls = self._build_calls(self.first_course)
+            expected_calls = self._build_calls(self.first_course, self.fourth_course)
+            self.assertCountEqual(patched_index.mock_calls, expected_calls)
+
+    @mock.patch.dict(
+        'django.conf.settings.FEATURES',
+        {'COURSEWARE_SEARCH_INCLUSION_DATE': (datetime.min.today() - timedelta(weeks=52)).strftime('%Y-%m-%d')}
+    )
+    def test_given_from_inclusion_date_key_prompt(self):
+        """
+            Test that reindexes all courses that have a start date after a defined inclusion date
+            when --from_inclusion_date key is given.
+        """
+        with mock.patch(self.REINDEX_PATH_LOCATION) as patched_index, \
+                mock.patch(self.MODULESTORE_PATCH_LOCATION, mock.Mock(return_value=self.store)):
+            call_command('reindex_course', from_inclusion_date=True)
+
+            expected_calls = self._build_calls(self.first_course, self.second_course)
             self.assertCountEqual(patched_index.mock_calls, expected_calls)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
index e8d3039b0b29..616204ef59c7 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
@@ -6,9 +6,10 @@
 from .course_index import CourseIndexSerializer
 from .course_rerun import CourseRerunSerializer
 from .course_team import CourseTeamSerializer
+from .course_waffle_flags import CourseWaffleFlagsSerializer
 from .grading import CourseGradingModelSerializer, CourseGradingSerializer
 from .group_configurations import CourseGroupConfigurationsSerializer
-from .home import CourseHomeSerializer, CourseHomeTabSerializer, LibraryTabSerializer
+from .home import StudioHomeSerializer, CourseHomeTabSerializer, LibraryTabSerializer
 from .proctoring import (
     LimitedProctoredExamSettingsSerializer,
     ProctoredExamConfigurationSerializer,
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py
new file mode 100644
index 000000000000..33dd99792882
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py
@@ -0,0 +1,154 @@
+"""
+API Serializers for course waffle flags
+"""
+
+from rest_framework import serializers
+
+from cms.djangoapps.contentstore import toggles
+
+
+class CourseWaffleFlagsSerializer(serializers.Serializer):
+    """
+    Serializer for course waffle flags
+    """
+    use_new_home_page = serializers.SerializerMethodField()
+    use_new_custom_pages = serializers.SerializerMethodField()
+    use_new_schedule_details_page = serializers.SerializerMethodField()
+    use_new_advanced_settings_page = serializers.SerializerMethodField()
+    use_new_grading_page = serializers.SerializerMethodField()
+    use_new_updates_page = serializers.SerializerMethodField()
+    use_new_import_page = serializers.SerializerMethodField()
+    use_new_export_page = serializers.SerializerMethodField()
+    use_new_files_uploads_page = serializers.SerializerMethodField()
+    use_new_video_uploads_page = serializers.SerializerMethodField()
+    use_new_course_outline_page = serializers.SerializerMethodField()
+    use_new_unit_page = serializers.SerializerMethodField()
+    use_new_course_team_page = serializers.SerializerMethodField()
+    use_new_certificates_page = serializers.SerializerMethodField()
+    use_new_textbooks_page = serializers.SerializerMethodField()
+    use_new_group_configurations_page = serializers.SerializerMethodField()
+    enable_course_optimizer = serializers.SerializerMethodField()
+
+    def get_course_key(self):
+        """
+        Retrieve the course_key from the context
+        """
+        return self.context.get("course_key")
+
+    def get_use_new_home_page(self, obj):
+        """
+        Method to get the use_new_home_page switch
+        """
+        return toggles.use_new_home_page()
+
+    def get_use_new_custom_pages(self, obj):
+        """
+        Method to get the use_new_custom_pages switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_custom_pages(course_key)
+
+    def get_use_new_schedule_details_page(self, obj):
+        """
+        Method to get the use_new_schedule_details_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_schedule_details_page(course_key)
+
+    def get_use_new_advanced_settings_page(self, obj):
+        """
+        Method to get the use_new_advanced_settings_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_advanced_settings_page(course_key)
+
+    def get_use_new_grading_page(self, obj):
+        """
+        Method to get the use_new_grading_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_grading_page(course_key)
+
+    def get_use_new_updates_page(self, obj):
+        """
+        Method to get the use_new_updates_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_updates_page(course_key)
+
+    def get_use_new_import_page(self, obj):
+        """
+        Method to get the use_new_import_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_import_page(course_key)
+
+    def get_use_new_export_page(self, obj):
+        """
+        Method to get the use_new_export_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_export_page(course_key)
+
+    def get_use_new_files_uploads_page(self, obj):
+        """
+        Method to get the use_new_files_uploads_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_files_uploads_page(course_key)
+
+    def get_use_new_video_uploads_page(self, obj):
+        """
+        Method to get the use_new_video_uploads_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_video_uploads_page(course_key)
+
+    def get_use_new_course_outline_page(self, obj):
+        """
+        Method to get the use_new_course_outline_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_course_outline_page(course_key)
+
+    def get_use_new_unit_page(self, obj):
+        """
+        Method to get the use_new_unit_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_unit_page(course_key)
+
+    def get_use_new_course_team_page(self, obj):
+        """
+        Method to get the use_new_course_team_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_course_team_page(course_key)
+
+    def get_use_new_certificates_page(self, obj):
+        """
+        Method to get the use_new_certificates_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_certificates_page(course_key)
+
+    def get_use_new_textbooks_page(self, obj):
+        """
+        Method to get the use_new_textbooks_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_textbooks_page(course_key)
+
+    def get_use_new_group_configurations_page(self, obj):
+        """
+        Method to get the use_new_group_configurations_page switch
+        """
+        course_key = self.get_course_key()
+        return toggles.use_new_group_configurations_page(course_key)
+
+    def get_enable_course_optimizer(self, obj):
+        """
+        Method to get the enable_course_optimizer waffle flag
+        """
+        course_key = self.get_course_key()
+        return toggles.enable_course_optimizer(course_key)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
index 1afc51ed77af..fa2a651f8a28 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
@@ -41,8 +41,8 @@ class LibraryTabSerializer(serializers.Serializer):
     libraries = LibraryViewSerializer(many=True, required=False, allow_null=True)
 
 
-class CourseHomeSerializer(serializers.Serializer):
-    """Serializer for course home"""
+class StudioHomeSerializer(serializers.Serializer):
+    """Serializer for Studio home"""
     allow_course_reruns = serializers.BooleanField()
     allow_to_create_new_org = serializers.BooleanField()
     allow_unicode_course_id = serializers.BooleanField()
@@ -51,20 +51,22 @@ class CourseHomeSerializer(serializers.Serializer):
         allow_empty=True
     )
     archived_courses = CourseCommonSerializer(required=False, many=True)
+    can_access_advanced_settings = serializers.BooleanField()
     can_create_organizations = serializers.BooleanField()
     course_creator_status = serializers.CharField()
     courses = CourseCommonSerializer(required=False, many=True)
     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()
+    libraries_v1_enabled = serializers.BooleanField()
+    libraries_v2_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()
     rerun_creator_status = serializers.BooleanField()
     show_new_library_button = serializers.BooleanField()
+    show_new_library_v2_button = serializers.BooleanField()
     split_studio_home = serializers.BooleanField()
     studio_name = serializers.CharField()
     studio_short_name = 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 1c9f9f608478..b1a02fff1f39 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
@@ -31,4 +31,3 @@ class CourseSettingsSerializer(serializers.Serializer):
     show_min_grade_warning = serializers.BooleanField()
     sidebar_html_enabled = serializers.BooleanField()
     upgrade_deadline = serializers.DateTimeField(allow_null=True)
-    use_v2_cert_display_settings = serializers.BooleanField()
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py
index d72707ed7836..dffa23349d92 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py
@@ -89,6 +89,7 @@ class ContainerHandlerSerializer(serializers.Serializer):
     unit_block_id = serializers.CharField(source="unit.location.block_id")
     subsection_location = serializers.CharField(source="subsection.location")
     course_sequence_ids = serializers.ListField(child=serializers.CharField())
+    library_content_picker_url = serializers.CharField()
 
     def get_assets_url(self, obj):
         """
@@ -103,6 +104,18 @@ def get_assets_url(self, obj):
         return None
 
 
+class UpstreamLinkSerializer(serializers.Serializer):
+    """
+    Serializer holding info for syncing a block with its upstream (eg, a library block).
+    """
+    upstream_ref = serializers.CharField()
+    version_synced = serializers.IntegerField()
+    version_available = serializers.IntegerField(allow_null=True)
+    version_declined = serializers.IntegerField(allow_null=True)
+    error_message = serializers.CharField(allow_null=True)
+    ready_to_sync = serializers.BooleanField()
+
+
 class ChildVerticalContainerSerializer(serializers.Serializer):
     """
     Serializer for representing a xblock child of vertical container.
@@ -113,6 +126,7 @@ class ChildVerticalContainerSerializer(serializers.Serializer):
     block_type = serializers.CharField()
     user_partition_info = serializers.DictField()
     user_partitions = serializers.ListField()
+    upstream_link = UpstreamLinkSerializer(allow_null=True)
     actions = serializers.SerializerMethodField()
     validation_messages = MessageValidation(many=True)
     render_error = serializers.CharField()
diff --git a/cms/djangoapps/contentstore/rest_api/v1/urls.py b/cms/djangoapps/contentstore/rest_api/v1/urls.py
index e2afe48c96a4..349218679709 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/urls.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/urls.py
@@ -17,6 +17,7 @@
     CourseRerunView,
     CourseSettingsView,
     CourseVideosView,
+    CourseWaffleFlagsView,
     HomePageView,
     HomePageCoursesView,
     HomePageLibrariesView,
@@ -131,6 +132,11 @@
         VerticalContainerView.as_view(),
         name="container_vertical"
     ),
+    re_path(
+        fr'^course_waffle_flags(?:/{COURSE_ID_PATTERN})?$',
+        CourseWaffleFlagsView.as_view(),
+        name="course_waffle_flags"
+    ),
 
     # 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 dfba1e63f72f..89d8d56eaa11 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/__init__.py
@@ -5,6 +5,7 @@
 from .course_details import CourseDetailsView
 from .course_index import CourseIndexView
 from .course_rerun import CourseRerunView
+from .course_waffle_flags import CourseWaffleFlagsView
 from .course_team import CourseTeamView
 from .grading import CourseGradingView
 from .group_configurations import CourseGroupConfigurationsView
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py b/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py
new file mode 100644
index 000000000000..ba96ff2b4a6c
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py
@@ -0,0 +1,73 @@
+""" API Views for course waffle flags """
+
+from opaque_keys.edx.keys import CourseKey
+from rest_framework.decorators import APIView
+from rest_framework.response import Response
+
+from openedx.core.lib.api.view_utils import view_auth_classes
+
+from ..serializers import CourseWaffleFlagsSerializer
+
+
+@view_auth_classes(is_authenticated=True)
+class CourseWaffleFlagsView(APIView):
+    """
+    API view to retrieve course waffle flag settings for a specific course.
+
+    This view provides a GET endpoint that returns the status of various waffle
+    flags for a given course. It requires the user to be authenticated.
+    """
+
+    def get(self, request, course_id=None):
+        """
+        Retrieve the waffle flag settings for the specified course.
+
+        Args:
+            request (HttpRequest): The HTTP request object.
+            course_id (str, optional): The ID of the course for which to retrieve
+                                       the waffle flag settings. If not provided,
+                                       defaults to None.
+
+        Returns:
+            Response: A JSON response containing the status of various waffle flags
+                      for the specified course.
+
+        **Example Request**
+
+            GET /api/contentstore/v1/course_waffle_flags
+            GET /api/contentstore/v1/course_waffle_flags/course-v1:test+test+test
+
+        **Response Values**
+
+            A JSON response containing the status of various waffle flags
+            for the specified course.
+
+        **Example Response**
+
+        ```json
+        {
+            "use_new_home_page": true,
+            "use_new_custom_pages": true,
+            "use_new_schedule_details_page": true,
+            "use_new_advanced_settings_page": true,
+            "use_new_grading_page": true,
+            "use_new_updates_page": true,
+            "use_new_import_page": true,
+            "use_new_export_page": true,
+            "use_new_files_uploads_page": true,
+            "use_new_video_uploads_page": false,
+            "use_new_course_outline_page": true,
+            "use_new_unit_page": false,
+            "use_new_course_team_page": true,
+            "use_new_certificates_page": true,
+            "use_new_textbooks_page": true,
+            "use_new_group_configurations_page": true
+        }
+        ```
+        """
+        course_key = CourseKey.from_string(course_id) if course_id else None
+        serializer = CourseWaffleFlagsSerializer(
+            context={"course_key": course_key}, data={}
+        )
+        serializer.is_valid(raise_exception=True)
+        return Response(serializer.data)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/home.py b/cms/djangoapps/contentstore/rest_api/v1/views/home.py
index d41ceb2647c5..3de536d78092 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/home.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/home.py
@@ -8,7 +8,7 @@
 from openedx.core.lib.api.view_utils import view_auth_classes
 
 from ....utils import get_home_context, get_course_context, get_library_context
-from ..serializers import CourseHomeSerializer, CourseHomeTabSerializer, LibraryTabSerializer
+from ..serializers import StudioHomeSerializer, CourseHomeTabSerializer, LibraryTabSerializer
 
 
 @view_auth_classes(is_authenticated=True)
@@ -24,7 +24,7 @@ class HomePageView(APIView):
                 description="Query param to filter by course org",
             )],
         responses={
-            200: CourseHomeSerializer,
+            200: StudioHomeSerializer,
             401: "The requester is not authenticated.",
         },
     )
@@ -52,18 +52,21 @@ def get(self, request: Request):
             "allow_unicode_course_id": false,
             "allowed_organizations": [],
             "archived_courses": [],
+            "can_access_advanced_settings": true,
             "can_create_organizations": true,
             "course_creator_status": "granted",
             "courses": [],
             "in_process_course_actions": [],
             "libraries": [],
             "libraries_enabled": true,
+            "libraries_v1_enabled": true,
+            "libraries_v2_enabled": true,
             "library_authoring_mfe_url": "//localhost:3001/course/course-v1:edX+P315+2T2023",
             "optimization_enabled": true,
-            "redirect_to_library_authoring_mfe": false,
             "request_course_creator_url": "/request_course_creator",
             "rerun_creator_status": true,
             "show_new_library_button": true,
+            "show_new_library_v2_button": true,
             "split_studio_home": false,
             "studio_name": "Studio",
             "studio_short_name": "Studio",
@@ -85,7 +88,7 @@ def get(self, request: Request):
             'platform_name': settings.PLATFORM_NAME,
             'user_is_active': request.user.is_active,
         })
-        serializer = CourseHomeSerializer(home_context)
+        serializer = StudioHomeSerializer(home_context)
         return Response(serializer.data)
 
 
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
index e921ac60398b..fbb05cba4de2 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
@@ -95,7 +95,6 @@ def get(self, request: Request, course_id: str):
             "show_min_grade_warning": false,
             "sidebar_html_enabled": true,
             "upgrade_deadline": null,
-            "use_v2_cert_display_settings": false
             }
         ```
         """
@@ -112,7 +111,6 @@ def get(self, request: Request, course_id: str):
                 'course_display_name_with_default': course_block.display_name_with_default,
                 'platform_name': settings.PLATFORM_NAME,
                 'licensing_enabled': settings.FEATURES.get("LICENSING", False),
-                'use_v2_cert_display_settings': settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False),
             })
 
             serializer = CourseSettingsSerializer(settings_context)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_index.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_index.py
index eafc2b37aa0c..189f2496a427 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_index.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_index.py
@@ -1,6 +1,7 @@
 """
 Unit tests for course index outline.
 """
+from django.conf import settings
 from django.test import RequestFactory
 from django.urls import reverse
 from rest_framework import status
@@ -62,7 +63,7 @@ def test_course_index_response(self):
                 "advance_settings_url": f"/settings/advanced/{self.course.id}"
             },
             "discussions_incontext_feedback_url": "",
-            "discussions_incontext_learnmore_url": "",
+            "discussions_incontext_learnmore_url": settings.DISCUSSIONS_INCONTEXT_LEARNMORE_URL,
             "is_custom_relative_dates_active": True,
             "initial_state": None,
             "initial_user_clipboard": {
@@ -103,7 +104,7 @@ def test_course_index_response_with_show_locators(self):
                 "advance_settings_url": f"/settings/advanced/{self.course.id}"
             },
             "discussions_incontext_feedback_url": "",
-            "discussions_incontext_learnmore_url": "",
+            "discussions_incontext_learnmore_url": settings.DISCUSSIONS_INCONTEXT_LEARNMORE_URL,
             "is_custom_relative_dates_active": False,
             "initial_state": {
                 "expanded_locators": [
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_waffle_flags.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_waffle_flags.py
new file mode 100644
index 000000000000..f0332d7f2870
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_waffle_flags.py
@@ -0,0 +1,129 @@
+"""
+Unit tests for the course waffle flags view
+"""
+
+from django.contrib.auth import get_user_model
+from django.urls import reverse
+from rest_framework import status
+
+from cms.djangoapps.contentstore.tests.utils import CourseTestCase
+from openedx.core.djangoapps.waffle_utils.models import WaffleFlagCourseOverrideModel
+
+User = get_user_model()
+
+
+class CourseWaffleFlagsViewTest(CourseTestCase):
+    """
+    Tests for the CourseWaffleFlagsView endpoint, which returns waffle flag states
+    for a specific course or globally if no course ID is provided.
+    """
+
+    course_waffle_flags = [
+        "use_new_custom_pages",
+        "use_new_schedule_details_page",
+        "use_new_advanced_settings_page",
+        "use_new_grading_page",
+        "use_new_updates_page",
+        "use_new_import_page",
+        "use_new_export_page",
+        "use_new_files_uploads_page",
+        "use_new_video_uploads_page",
+        "use_new_course_outline_page",
+        "use_new_unit_page",
+        "use_new_course_team_page",
+        "use_new_certificates_page",
+        "use_new_textbooks_page",
+        "use_new_group_configurations_page",
+    ]
+
+    other_expected_waffle_flags = ["enable_course_optimizer"]
+
+    def setUp(self):
+        """
+        Set up test data and state before each test method.
+
+        This method initializes the endpoint URL and creates a set of waffle flags
+        for the test course, setting each flag's value to `True`.
+        """
+        super().setUp()
+        self.url = reverse("cms.djangoapps.contentstore:v1:course_waffle_flags")
+        self.create_waffle_flags(self.course_waffle_flags)
+        self.create_custom_waffle_flags()
+
+    def create_custom_waffle_flags(self, enabled=True):
+        """
+        Helper method to create waffle flags that are not part of `course_waffle_flags` and have
+        a different format.
+        """
+        WaffleFlagCourseOverrideModel.objects.create(
+            waffle_flag="contentstore.enable_course_optimizer",
+            course_id=self.course.id,
+            enabled=enabled,
+        )
+
+    def create_waffle_flags(self, flags, enabled=True):
+        """
+        Helper method to create waffle flag entries in the database for the test course.
+
+        Args:
+            flags (list): A list of flag names to set up.
+            enabled (bool): The value to set for each flag's enabled state.
+        """
+        for flag in flags:
+            WaffleFlagCourseOverrideModel.objects.create(
+                waffle_flag=f"contentstore.new_studio_mfe.{flag}",
+                course_id=self.course.id,
+                enabled=enabled,
+            )
+
+    def expected_response(self, enabled=False):
+        """
+        Generate an expected response dictionary based on the enabled flag.
+
+        Args:
+            enabled (bool): State to assign to each waffle flag in the response.
+
+        Returns:
+            dict: A dictionary with each flag set to the value of `enabled`.
+        """
+        res = {flag: enabled for flag in self.course_waffle_flags}
+        for flag in self.other_expected_waffle_flags:
+            res[flag] = enabled
+        return res
+
+    def test_get_course_waffle_flags_with_course_id(self):
+        """
+        Test that waffle flags for a specific course are correctly returned when
+        a valid course ID is provided.
+
+        Expected Behavior:
+        - The response should return HTTP 200 status.
+        - Each flag returned should be `True` as set up in the `setUp` method.
+        """
+        course_url = reverse(
+            "cms.djangoapps.contentstore:v1:course_waffle_flags",
+            kwargs={"course_id": self.course.id},
+        )
+
+        expected_response = self.expected_response(enabled=True)
+        expected_response["use_new_home_page"] = False
+
+        response = self.client.get(course_url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertDictEqual(expected_response, response.data)
+
+    def test_get_course_waffle_flags_without_course_id(self):
+        """
+        Test that the default waffle flag states are returned when no course ID is provided.
+
+        Expected Behavior:
+        - The response should return HTTP 200 status.
+        - Each flag returned should default to `False`, representing the global
+          default state for each flag.
+        """
+        expected_response = self.expected_response(enabled=False)
+        expected_response["use_new_home_page"] = False
+
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertDictEqual(expected_response, response.data)
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 1b8bfaa84728..a4a6909c5dcb 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
@@ -2,7 +2,9 @@
 Unit tests for home page view.
 """
 import ddt
+import pytz
 from collections import OrderedDict
+from datetime import datetime, timedelta
 from django.conf import settings
 from django.test import override_settings
 from django.urls import reverse
@@ -33,31 +35,28 @@ class HomePageViewTest(CourseTestCase):
     def setUp(self):
         super().setUp()
         self.url = reverse("cms.djangoapps.contentstore:v1:home")
-
-    def test_home_page_courses_response(self):
-        """Check successful response content"""
-        response = self.client.get(self.url)
-
-        expected_response = {
+        self.expected_response = {
             "allow_course_reruns": True,
             "allow_to_create_new_org": False,
             "allow_unicode_course_id": False,
             "allowed_organizations": [],
             "archived_courses": [],
+            "can_access_advanced_settings": True,
             "can_create_organizations": True,
             "course_creator_status": "granted",
             "courses": [],
             "in_process_course_actions": [],
             "libraries": [],
             "libraries_enabled": True,
+            "libraries_v1_enabled": True,
+            "libraries_v2_enabled": False,
             "taxonomies_enabled": True,
-            "library_authoring_mfe_url": settings.LIBRARY_AUTHORING_MICROFRONTEND_URL,
             "taxonomy_list_mfe_url": 'http://course-authoring-mfe/taxonomies',
             "optimization_enabled": False,
-            "redirect_to_library_authoring_mfe": False,
             "request_course_creator_url": "/request_course_creator",
             "rerun_creator_status": True,
             "show_new_library_button": True,
+            "show_new_library_v2_button": True,
             "split_studio_home": False,
             "studio_name": settings.STUDIO_NAME,
             "studio_short_name": settings.STUDIO_SHORT_NAME,
@@ -67,6 +66,21 @@ def test_home_page_courses_response(self):
             "user_is_active": True,
         }
 
+    def test_home_page_studio_response(self):
+        """Check successful response content"""
+        response = self.client.get(self.url)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertDictEqual(self.expected_response, response.data)
+
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_home_page_studio_with_meilisearch_enabled(self):
+        """Check response content when Meilisearch is enabled"""
+        response = self.client.get(self.url)
+
+        expected_response = self.expected_response
+        expected_response["libraries_v2_enabled"] = True
+
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertDictEqual(expected_response, response.data)
 
@@ -89,12 +103,13 @@ class HomePageCoursesViewTest(CourseTestCase):
     def setUp(self):
         super().setUp()
         self.url = reverse("cms.djangoapps.contentstore:v1:courses")
-        CourseOverviewFactory.create(
+        self.course_overview = CourseOverviewFactory.create(
             id=self.course.id,
             org=self.course.org,
             display_name=self.course.display_name,
             display_number_with_default=self.course.number,
         )
+        self.non_staff_client, _ = self.create_non_staff_authed_user_client()
 
     def test_home_page_response(self):
         """Check successful response content"""
@@ -106,7 +121,7 @@ def test_home_page_response(self):
             "courses": [{
                 "course_key": course_id,
                 "display_name": self.course.display_name,
-                "lms_link": f'//{settings.LMS_BASE}/courses/{course_id}/jump_to/{self.course.location}',
+                "lms_link": f'{settings.LMS_ROOT_URL}/courses/{course_id}/jump_to/{self.course.location}',
                 "number": self.course.number,
                 "org": self.course.org,
                 "rerun_link": f'/course_rerun/{course_id}',
@@ -120,6 +135,7 @@ def test_home_page_response(self):
         print(response.data)
         self.assertDictEqual(expected_response, response.data)
 
+    @override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API)
     def test_home_page_response_with_api_v2(self):
         """Check successful response content with api v2 modifications.
 
@@ -133,7 +149,7 @@ def test_home_page_response_with_api_v2(self):
                 OrderedDict([
                     ("course_key", course_id),
                     ("display_name", self.course.display_name),
-                    ("lms_link", f'//{settings.LMS_BASE}/courses/{course_id}/jump_to/{self.course.location}'),
+                    ("lms_link", f'{settings.LMS_ROOT_URL}/courses/{course_id}/jump_to/{self.course.location}'),
                     ("number", self.course.number),
                     ("org", self.course.org),
                     ("rerun_link", f'/course_rerun/{course_id}'),
@@ -144,12 +160,88 @@ def test_home_page_response_with_api_v2(self):
             "in_process_course_actions": [],
         }
 
-        with override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API):
-            response = self.client.get(self.url)
+        response = self.client.get(self.url)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertDictEqual(expected_response, response.data)
 
+    @override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API)
+    @ddt.data(
+        ("active_only", "true", 2, 0),
+        ("archived_only", "true", 0, 1),
+        ("search", "sample", 1, 0),
+        ("search", "demo", 0, 1),
+        ("order", "org", 2, 1),
+        ("order", "display_name", 2, 1),
+        ("order", "number", 2, 1),
+        ("order", "run", 2, 1)
+    )
+    @ddt.unpack
+    def test_filter_and_ordering_courses(
+        self,
+        filter_key,
+        filter_value,
+        expected_active_length,
+        expected_archived_length
+    ):
+        """Test home page with org filter and ordering for a staff user.
+
+        The test creates an active/archived course, and then filters/orders them using the query parameters.
+        """
+        archived_course_key = self.store.make_course_key("demo-org", "demo-number", "demo-run")
+        CourseOverviewFactory.create(
+            display_name="Course (Demo)",
+            id=archived_course_key,
+            org=archived_course_key.org,
+            end=(datetime.now() - timedelta(days=365)).replace(tzinfo=pytz.UTC),
+        )
+        active_course_key = self.store.make_course_key("sample-org", "sample-number", "sample-run")
+        CourseOverviewFactory.create(
+            display_name="Course (Sample)",
+            id=active_course_key,
+            org=active_course_key.org,
+        )
+
+        response = self.client.get(self.url, {filter_key: filter_value})
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data["archived_courses"]), expected_archived_length)
+        self.assertEqual(len(response.data["courses"]), expected_active_length)
+
+    @override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API)
+    @ddt.data(
+        ("active_only", "true"),
+        ("archived_only", "true"),
+        ("search", "sample"),
+        ("order", "org"),
+    )
+    @ddt.unpack
+    def test_filter_and_ordering_no_courses_staff(self, filter_key, filter_value):
+        """Test home page with org filter and ordering when there are no courses for a staff user."""
+        self.course_overview.delete()
+
+        response = self.client.get(self.url, {filter_key: filter_value})
+
+        self.assertEqual(len(response.data["courses"]), 0)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    @override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API)
+    @ddt.data(
+        ("active_only", "true"),
+        ("archived_only", "true"),
+        ("search", "sample"),
+        ("order", "org"),
+    )
+    @ddt.unpack
+    def test_home_page_response_no_courses_non_staff(self, filter_key, filter_value):
+        """Test home page with org filter and ordering when there are no courses for a non-staff user."""
+        self.course_overview.delete()
+
+        response = self.non_staff_client.get(self.url)
+
+        self.assertEqual(len(response.data["courses"]), 0)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
     @override_waffle_switch(ENABLE_GLOBAL_STAFF_OPTIMIZATION, True)
     def test_org_query_if_passed(self):
         """Test home page when org filter passed as a query param"""
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_proctoring.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_proctoring.py
index 66b5f46128c8..8e220a334c06 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_proctoring.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_proctoring.py
@@ -277,18 +277,14 @@ def test_update_exam_settings_invalid_value(self):
 
         # response is correct
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        self.assertDictEqual(
-            response.data,
+        self.assertIn(
             {
-                "detail": [
-                    {
-                        "proctoring_provider": (
-                            "The selected proctoring provider, notvalidprovider, is not a valid provider. "
-                            "Please select from one of ['test_proctoring_provider']."
-                        )
-                    }
-                ]
+                "proctoring_provider": (
+                    "The selected proctoring provider, notvalidprovider, is not a valid provider. "
+                    "Please select from one of ['test_proctoring_provider']."
+                )
             },
+            response.data['detail'],
         )
 
         # course settings have been updated
@@ -408,18 +404,14 @@ def test_400_for_disabled_lti(self):
 
         # response is correct
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        self.assertDictEqual(
-            response.data,
+        self.assertIn(
             {
-                "detail": [
-                    {
-                        "proctoring_provider": (
-                            "The selected proctoring provider, lti_external, is not a valid provider. "
-                            "Please select from one of ['null']."
-                        )
-                    }
-                ]
+                "proctoring_provider": (
+                    "The selected proctoring provider, lti_external, is not a valid provider. "
+                    "Please select from one of ['null']."
+                )
             },
+            response.data['detail'],
         )
 
         # course settings have been updated
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py
index 5365443c47d9..15b0992fdf1a 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py
@@ -55,7 +55,6 @@ def test_course_settings_response(self):
             "show_min_grade_warning": False,
             "upgrade_deadline": None,
             "licensing_enabled": False,
-            "use_v2_cert_display_settings": False,
         }
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py
index d3fc37198213..7cac074a433f 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py
@@ -70,6 +70,8 @@ def setup_xblock(self):
             parent=self.vertical.location,
             category="html",
             display_name="Html Content 2",
+            upstream="lb:FakeOrg:FakeLib:html:FakeBlock",
+            upstream_version=5,
         )
 
     def create_block(self, parent, category, display_name, **kwargs):
@@ -193,6 +195,7 @@ def test_children_content(self):
                 "name": self.html_unit_first.display_name_with_default,
                 "block_id": str(self.html_unit_first.location),
                 "block_type": self.html_unit_first.location.block_type,
+                "upstream_link": None,
                 "user_partition_info": expected_user_partition_info,
                 "user_partitions": expected_user_partitions,
                 "actions": {
@@ -218,12 +221,21 @@ def test_children_content(self):
                     "can_delete": True,
                     "can_manage_tags": True,
                 },
+                "upstream_link": {
+                    "upstream_ref": "lb:FakeOrg:FakeLib:html:FakeBlock",
+                    "version_synced": 5,
+                    "version_available": None,
+                    "version_declined": None,
+                    "error_message": "Linked library item was not found in the system",
+                    "ready_to_sync": False,
+                },
                 "user_partition_info": expected_user_partition_info,
                 "user_partitions": expected_user_partitions,
                 "validation_messages": [],
                 "render_error": "",
             },
         ]
+        self.maxDiff = None
         self.assertEqual(response.data["children"], expected_response)
 
     def test_not_valid_usage_key_string(self):
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/vertical_block.py b/cms/djangoapps/contentstore/rest_api/v1/views/vertical_block.py
index 670b94afbbe0..0798c341cc1c 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/vertical_block.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/vertical_block.py
@@ -20,6 +20,7 @@
     ContainerHandlerSerializer,
     VerticalContainerSerializer,
 )
+from cms.lib.xblock.upstream_sync import UpstreamLink
 from openedx.core.lib.api.view_utils import view_auth_classes
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.exceptions import ItemNotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
@@ -198,6 +199,7 @@ def get(self, request: Request, usage_key_string: str):
                     "block_type": "drag-and-drop-v2",
                     "user_partition_info": {},
                     "user_partitions": {}
+                    "upstream_link": null,
                     "actions": {
                         "can_copy": true,
                         "can_duplicate": true,
@@ -215,6 +217,13 @@ def get(self, request: Request, usage_key_string: str):
                     "block_type": "video",
                     "user_partition_info": {},
                     "user_partitions": {}
+                    "upstream_link": {
+                        "upstream_ref": "lb:org:mylib:video:404",
+                        "version_synced": 16
+                        "version_available": null,
+                        "error_message": "Linked library item not found: lb:org:mylib:video:404",
+                        "ready_to_sync": false,
+                    },
                     "actions": {
                         "can_copy": true,
                         "can_duplicate": true,
@@ -232,6 +241,13 @@ def get(self, request: Request, usage_key_string: str):
                     "block_type": "html",
                     "user_partition_info": {},
                     "user_partitions": {},
+                    "upstream_link": {
+                        "upstream_ref": "lb:org:mylib:html:abcd",
+                        "version_synced": 43,
+                        "version_available": 49,
+                        "error_message": null,
+                        "ready_to_sync": true,
+                    },
                     "actions": {
                         "can_copy": true,
                         "can_duplicate": true,
@@ -267,6 +283,7 @@ def get(self, request: Request, usage_key_string: str):
                     child_info = modulestore().get_item(child)
                     user_partition_info = get_visibility_partition_info(child_info, course=course)
                     user_partitions = get_user_partition_info(child_info, course=course)
+                    upstream_link = UpstreamLink.try_get_for_block(child_info)
                     validation_messages = get_xblock_validation_messages(child_info)
                     render_error = get_xblock_render_error(request, child_info)
 
@@ -277,6 +294,12 @@ def get(self, request: Request, usage_key_string: str):
                         "block_type": child_info.location.block_type,
                         "user_partition_info": user_partition_info,
                         "user_partitions": user_partitions,
+                        "upstream_link": (
+                            # If the block isn't linked to an upstream (which is by far the most common case) then just
+                            # make this field null, which communicates the same info, but with less noise.
+                            upstream_link.to_json() if upstream_link.upstream_ref
+                            else None
+                        ),
                         "validation_messages": validation_messages,
                         "render_error": render_error,
                     })
diff --git a/cms/djangoapps/contentstore/rest_api/v2/urls.py b/cms/djangoapps/contentstore/rest_api/v2/urls.py
index ad61cc937015..3e653d07fbcf 100644
--- a/cms/djangoapps/contentstore/rest_api/v2/urls.py
+++ b/cms/djangoapps/contentstore/rest_api/v2/urls.py
@@ -1,15 +1,31 @@
 """Contenstore API v2 URLs."""
 
-from django.urls import path
-
-from cms.djangoapps.contentstore.rest_api.v2.views import HomePageCoursesViewV2
+from django.conf import settings
+from django.urls import path, re_path
 
+from cms.djangoapps.contentstore.rest_api.v2.views import home, downstreams
 app_name = "v2"
 
 urlpatterns = [
     path(
         "home/courses",
-        HomePageCoursesViewV2.as_view(),
+        home.HomePageCoursesViewV2.as_view(),
         name="courses",
     ),
+    # TODO: Potential future path.
+    # re_path(
+    #     fr'^downstreams/$',
+    #     downstreams.DownstreamsListView.as_view(),
+    #     name="downstreams_list",
+    # ),
+    re_path(
+        fr'^downstreams/{settings.USAGE_KEY_PATTERN}$',
+        downstreams.DownstreamView.as_view(),
+        name="downstream"
+    ),
+    re_path(
+        fr'^downstreams/{settings.USAGE_KEY_PATTERN}/sync$',
+        downstreams.SyncFromUpstreamView.as_view(),
+        name="sync_from_upstream"
+    ),
 ]
diff --git a/cms/djangoapps/contentstore/rest_api/v2/views/__init__.py b/cms/djangoapps/contentstore/rest_api/v2/views/__init__.py
index 73ddde98440c..e69de29bb2d1 100644
--- a/cms/djangoapps/contentstore/rest_api/v2/views/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v2/views/__init__.py
@@ -1,3 +0,0 @@
-"""Module for v2 views."""
-
-from cms.djangoapps.contentstore.rest_api.v2.views.home import HomePageCoursesViewV2
diff --git a/cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py b/cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py
new file mode 100644
index 000000000000..8c0d651910a6
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py
@@ -0,0 +1,253 @@
+"""
+API Views for managing & syncing links between upstream & downstream content
+
+API paths (We will move these into proper api_doc_tools annotations soon
+https://github.com/openedx/edx-platform/issues/35653):
+
+  /api/contentstore/v2/downstreams/{usage_key_string}
+
+    GET: Inspect a single downstream block's link to upstream content.
+      200: Upstream link details successfully fetched. Returns UpstreamLink (may contain an error_message).
+      404: Downstream block not found or user lacks permission to edit it.
+
+    DELETE: Sever a single downstream block's link to upstream content.
+      204: Block successfully unlinked (or it wasn't linked in the first place). No response body.
+      404: Downstream block not found or user lacks permission to edit it.
+
+    PUT: Establish or modify a single downstream block's link to upstream content. An authoring client could use this
+         endpoint to add library content in a two-step process, specifically: (1) add a blank block to a course, then
+         (2) link it to a content library with ?sync=True.
+      REQUEST BODY: {
+        "upstream_ref": str,  // reference to upstream block (eg, library block usage key)
+        "sync": bool,  // whether to sync in upstream content (False by default)
+      }
+      200: Downstream block's upstream link successfully edited (and synced, if requested). Returns UpstreamLink.
+      400: upstream_ref is malformed, missing, or inaccessible.
+      400: Content at upstream_ref does not support syncing.
+      404: Downstream block not found or user lacks permission to edit it.
+
+  /api/contentstore/v2/downstreams/{usage_key_string}/sync
+
+    POST: Sync a downstream block with upstream content.
+      200: Downstream block successfully synced with upstream content.
+      400: Downstream block is not linked to upstream content.
+      400: Upstream is malformed, missing, or inaccessible.
+      400: Upstream block does not support syncing.
+      404: Downstream block not found or user lacks permission to edit it.
+
+    DELETE: Decline an available sync for a downstream block.
+      204: Sync successfuly dismissed. No response body.
+      400: Downstream block is not linked to upstream content.
+      404: Downstream block not found or user lacks permission to edit it.
+
+  # NOT YET IMPLEMENTED -- Will be needed for full Libraries Relaunch in ~Teak.
+  /api/contentstore/v2/downstreams
+  /api/contentstore/v2/downstreams?course_id=course-v1:A+B+C&ready_to_sync=true
+      GET: List downstream blocks that can be synced, filterable by course or sync-readiness.
+        200: A paginated list of applicable & accessible downstream blocks. Entries are UpstreamLinks.
+
+UpstreamLink response schema:
+  {
+    "upstream_ref": string?
+    "version_synced": string?,
+    "version_available": string?,
+    "version_declined": string?,
+    "error_message": string?,
+    "ready_to_sync": Boolean
+  }
+"""
+import logging
+
+from django.contrib.auth.models import User  # pylint: disable=imported-auth-user
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import UsageKey
+from rest_framework.exceptions import NotFound, ValidationError
+from rest_framework.request import Request
+from rest_framework.response import Response
+from rest_framework.views import APIView
+from xblock.core import XBlock
+
+from cms.lib.xblock.upstream_sync import (
+    UpstreamLink, UpstreamLinkException, NoUpstream, BadUpstream, BadDownstream,
+    fetch_customizable_fields, sync_from_upstream, decline_sync, sever_upstream_link
+)
+from common.djangoapps.student.auth import has_studio_write_access, has_studio_read_access
+from openedx.core.lib.api.view_utils import (
+    DeveloperErrorViewMixin,
+    view_auth_classes,
+)
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.exceptions import ItemNotFoundError
+
+
+logger = logging.getLogger(__name__)
+
+
+class _AuthenticatedRequest(Request):
+    """
+    Alias for the `Request` class which tells mypy to assume that `.user` is not an AnonymousUser.
+
+    Using this does NOT ensure the request is actually authenticated--
+    you will some other way to ensure that, such as `@view_auth_classes(is_authenticated=True)`.
+    """
+    user: User
+
+
+# TODO: Potential future view.
+# @view_auth_classes(is_authenticated=True)
+# class DownstreamListView(DeveloperErrorViewMixin, APIView):
+#     """
+#     List all blocks which are linked to upstream content, with optional filtering.
+#     """
+#     def get(self, request: _AuthenticatedRequest) -> Response:
+#         """
+#         Handle the request.
+#         """
+#         course_key_string = request.GET['course_id']
+#         syncable = request.GET['ready_to_sync']
+#         ...
+
+
+@view_auth_classes(is_authenticated=True)
+class DownstreamView(DeveloperErrorViewMixin, APIView):
+    """
+    Inspect or manage an XBlock's link to upstream content.
+    """
+    def get(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
+        """
+        Inspect an XBlock's link to upstream content.
+        """
+        downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=False)
+        return Response(UpstreamLink.try_get_for_block(downstream).to_json())
+
+    def put(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
+        """
+        Edit an XBlock's link to upstream content.
+        """
+        downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=True)
+        new_upstream_ref = request.data.get("upstream_ref")
+
+        # Set `downstream.upstream` so that we can try to sync and/or fetch.
+        # Note that, if this fails and we raise a 4XX, then we will not call modulstore().update_item,
+        # thus preserving the former value of `downstream.upstream`.
+        downstream.upstream = new_upstream_ref
+        sync_param = request.data.get("sync", "false")
+        if isinstance(sync_param, str):
+            sync_param = sync_param.lower()
+        if sync_param not in ["true", "false", True, False]:
+            raise ValidationError({"sync": "must be 'true' or 'false'"})
+        try:
+            if sync_param == "true" or sync_param is True:
+                sync_from_upstream(downstream=downstream, user=request.user)
+            else:
+                # Even if we're not syncing (i.e., updating the downstream's values with the upstream's), we still need
+                # to fetch the upstream's customizable values and store them as hidden fields on the downstream. This
+                # ensures that downstream authors can restore defaults based on the upstream.
+                fetch_customizable_fields(downstream=downstream, user=request.user)
+        except BadDownstream as exc:
+            logger.exception(
+                "'%s' is an invalid downstream; refusing to set its upstream to '%s'",
+                usage_key_string,
+                new_upstream_ref,
+            )
+            raise ValidationError(str(exc)) from exc
+        except BadUpstream as exc:
+            logger.exception(
+                "'%s' is an invalid upstream reference; refusing to set it as upstream of '%s'",
+                new_upstream_ref,
+                usage_key_string,
+            )
+            raise ValidationError({"upstream_ref": str(exc)}) from exc
+        except NoUpstream as exc:
+            raise ValidationError({"upstream_ref": "value missing"}) from exc
+        modulestore().update_item(downstream, request.user.id)
+        # Note: We call `get_for_block` (rather than `try_get_for_block`) because if anything is wrong with the
+        #       upstream at this point, then that is completely unexpected, so it's appropriate to let the 500 happen.
+        return Response(UpstreamLink.get_for_block(downstream).to_json())
+
+    def delete(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
+        """
+        Sever an XBlock's link to upstream content.
+        """
+        downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=True)
+        try:
+            sever_upstream_link(downstream)
+        except NoUpstream as exc:
+            logger.exception(
+                "Tried to DELETE upstream link of '%s', but it wasn't linked to anything in the first place. "
+                "Will do nothing. ",
+                usage_key_string,
+            )
+        else:
+            modulestore().update_item(downstream, request.user.id)
+        return Response(status=204)
+
+
+@view_auth_classes(is_authenticated=True)
+class SyncFromUpstreamView(DeveloperErrorViewMixin, APIView):
+    """
+    Accept or decline an opportunity to sync a downstream block from its upstream content.
+    """
+
+    def post(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
+        """
+        Pull latest updates to the block at {usage_key_string} from its linked upstream content.
+        """
+        downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=True)
+        try:
+            sync_from_upstream(downstream, request.user)
+        except UpstreamLinkException as exc:
+            logger.exception(
+                "Could not sync from upstream '%s' to downstream '%s'",
+                downstream.upstream,
+                usage_key_string,
+            )
+            raise ValidationError(detail=str(exc)) from exc
+        modulestore().update_item(downstream, request.user.id)
+        # Note: We call `get_for_block` (rather than `try_get_for_block`) because if anything is wrong with the
+        #       upstream at this point, then that is completely unexpected, so it's appropriate to let the 500 happen.
+        return Response(UpstreamLink.get_for_block(downstream).to_json())
+
+    def delete(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
+        """
+        Decline the latest updates to the block at {usage_key_string}.
+        """
+        downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=True)
+        try:
+            decline_sync(downstream)
+        except (NoUpstream, BadUpstream, BadDownstream) as exc:
+            # This is somewhat unexpected. If the upstream link is missing or invalid, then the downstream author
+            # shouldn't have been prompted to accept/decline a sync in the first place. Of course, they could have just
+            # hit the HTTP API anyway, or they could be viewing a Studio page which hasn't been refreshed in a while.
+            # So, it's a 400, not a 500.
+            logger.exception(
+                "Tried to decline a sync to downstream '%s', but the upstream link '%s' is invalid.",
+                usage_key_string,
+                downstream.upstream,
+            )
+            raise ValidationError(str(exc)) from exc
+        modulestore().update_item(downstream, request.user.id)
+        return Response(status=204)
+
+
+def _load_accessible_block(user: User, usage_key_string: str, *, require_write_access: bool) -> XBlock:
+    """
+    Given a logged in-user and a serialized usage key of an upstream-linked XBlock, load it from the ModuleStore,
+    raising a DRF-friendly exception if anything goes wrong.
+
+    Raises NotFound if usage key is malformed, if the user lacks access, or if the block doesn't exist.
+    """
+    not_found = NotFound(detail=f"Block not found or not accessible: {usage_key_string}")
+    try:
+        usage_key = UsageKey.from_string(usage_key_string)
+    except InvalidKeyError as exc:
+        raise ValidationError(detail=f"Malformed block usage key: {usage_key_string}") from exc
+    if require_write_access and not has_studio_write_access(user, usage_key.context_key):
+        raise not_found
+    if not has_studio_read_access(user, usage_key.context_key):
+        raise not_found
+    try:
+        block = modulestore().get_item(usage_key)
+    except ItemNotFoundError as exc:
+        raise not_found from exc
+    return block
diff --git a/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py b/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py
new file mode 100644
index 000000000000..92da28bde989
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py
@@ -0,0 +1,276 @@
+"""
+Unit tests for /api/contentstore/v2/downstreams/* JSON APIs.
+"""
+from unittest.mock import patch
+from django.conf import settings
+
+from cms.lib.xblock.upstream_sync import UpstreamLink, BadUpstream
+from common.djangoapps.student.tests.factories import UserFactory
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
+
+from .. import downstreams as downstreams_views
+
+
+MOCK_LIB_KEY = "lib:OpenedX:CSPROB3"
+MOCK_UPSTREAM_REF = "lb:OpenedX:CSPROB3:html:843b4c73-1e2d-4ced-a0ff-24e503cdb3e4"
+MOCK_UPSTREAM_LINK = "{mfe_url}/library/{lib_key}/components?usageKey={usage_key}".format(
+    mfe_url=settings.COURSE_AUTHORING_MICROFRONTEND_URL,
+    lib_key=MOCK_LIB_KEY,
+    usage_key=MOCK_UPSTREAM_REF,
+)
+MOCK_UPSTREAM_ERROR = "your LibraryGPT subscription has expired"
+
+
+def _get_upstream_link_good_and_syncable(downstream):
+    return UpstreamLink(
+        upstream_ref=downstream.upstream,
+        version_synced=downstream.upstream_version,
+        version_available=(downstream.upstream_version or 0) + 1,
+        version_declined=downstream.upstream_version_declined,
+        error_message=None,
+    )
+
+
+def _get_upstream_link_bad(_downstream):
+    raise BadUpstream(MOCK_UPSTREAM_ERROR)
+
+
+class _DownstreamViewTestMixin:
+    """
+    Shared data and error test cases.
+    """
+
+    def setUp(self):
+        """
+        Create a simple course with one unit and two videos, one of which is linked to an "upstream".
+        """
+        super().setUp()
+        self.course = CourseFactory.create()
+        chapter = BlockFactory.create(category='chapter', parent=self.course)
+        sequential = BlockFactory.create(category='sequential', parent=chapter)
+        unit = BlockFactory.create(category='vertical', parent=sequential)
+        self.regular_video_key = BlockFactory.create(category='video', parent=unit).usage_key
+        self.downstream_video_key = BlockFactory.create(
+            category='video', parent=unit, upstream=MOCK_UPSTREAM_REF, upstream_version=123,
+        ).usage_key
+        self.fake_video_key = self.course.id.make_usage_key("video", "NoSuchVideo")
+        self.superuser = UserFactory(username="superuser", password="password", is_staff=True, is_superuser=True)
+        self.learner = UserFactory(username="learner", password="password")
+
+    def call_api(self, usage_key_string):
+        raise NotImplementedError
+
+    def test_404_downstream_not_found(self):
+        """
+        Do we raise 404 if the specified downstream block could not be loaded?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.fake_video_key)
+        assert response.status_code == 404
+        assert "not found" in response.data["developer_message"]
+
+    def test_404_downstream_not_accessible(self):
+        """
+        Do we raise 404 if the user lacks read access on the specified downstream block?
+        """
+        self.client.login(username="learner", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 404
+        assert "not found" in response.data["developer_message"]
+
+
+class GetDownstreamViewTest(_DownstreamViewTestMixin, SharedModuleStoreTestCase):
+    """
+    Test that `GET /api/v2/contentstore/downstreams/...` inspects a downstream's link to an upstream.
+    """
+    def call_api(self, usage_key_string):
+        return self.client.get(f"/api/contentstore/v2/downstreams/{usage_key_string}")
+
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_good_and_syncable)
+    def test_200_good_upstream(self):
+        """
+        Does the happy path work?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 200
+        assert response.data['upstream_ref'] == MOCK_UPSTREAM_REF
+        assert response.data['error_message'] is None
+        assert response.data['ready_to_sync'] is True
+        assert response.data['upstream_link'] == MOCK_UPSTREAM_LINK
+
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_bad)
+    def test_200_bad_upstream(self):
+        """
+        If the upstream link is broken, do we still return 200, but with an error message in body?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 200
+        assert response.data['upstream_ref'] == MOCK_UPSTREAM_REF
+        assert response.data['error_message'] == MOCK_UPSTREAM_ERROR
+        assert response.data['ready_to_sync'] is False
+        assert response.data['upstream_link'] is None
+
+    def test_200_no_upstream(self):
+        """
+        If the upstream link is missing, do we still return 200, but with an error message in body?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.regular_video_key)
+        assert response.status_code == 200
+        assert response.data['upstream_ref'] is None
+        assert "is not linked" in response.data['error_message']
+        assert response.data['ready_to_sync'] is False
+        assert response.data['upstream_link'] is None
+
+
+class PutDownstreamViewTest(_DownstreamViewTestMixin, SharedModuleStoreTestCase):
+    """
+    Test that `PUT /api/v2/contentstore/downstreams/...` edits a downstream's link to an upstream.
+    """
+    def call_api(self, usage_key_string, sync: str | None = None):
+        return self.client.put(
+            f"/api/contentstore/v2/downstreams/{usage_key_string}",
+            data={
+                "upstream_ref": MOCK_UPSTREAM_REF,
+                **({"sync": sync} if sync else {}),
+            },
+            content_type="application/json",
+        )
+
+    @patch.object(downstreams_views, "fetch_customizable_fields")
+    @patch.object(downstreams_views, "sync_from_upstream")
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_good_and_syncable)
+    def test_200_with_sync(self, mock_sync, mock_fetch):
+        """
+        Does the happy path work (with sync=True)?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.regular_video_key, sync='true')
+        assert response.status_code == 200
+        video_after = modulestore().get_item(self.regular_video_key)
+        assert mock_sync.call_count == 1
+        assert mock_fetch.call_count == 0
+        assert video_after.upstream == MOCK_UPSTREAM_REF
+
+    @patch.object(downstreams_views, "fetch_customizable_fields")
+    @patch.object(downstreams_views, "sync_from_upstream")
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_good_and_syncable)
+    def test_200_no_sync(self, mock_sync, mock_fetch):
+        """
+        Does the happy path work (with sync=False)?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.regular_video_key, sync='false')
+        assert response.status_code == 200
+        video_after = modulestore().get_item(self.regular_video_key)
+        assert mock_sync.call_count == 0
+        assert mock_fetch.call_count == 1
+        assert video_after.upstream == MOCK_UPSTREAM_REF
+
+    @patch.object(downstreams_views, "fetch_customizable_fields", side_effect=BadUpstream(MOCK_UPSTREAM_ERROR))
+    def test_400(self, sync: str):
+        """
+        Do we raise a 400 if the provided upstream reference is malformed or not accessible?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 400
+        assert MOCK_UPSTREAM_ERROR in response.data['developer_message']['upstream_ref']
+        video_after = modulestore().get_item(self.regular_video_key)
+        assert video_after.upstream is None
+
+
+class DeleteDownstreamViewTest(_DownstreamViewTestMixin, SharedModuleStoreTestCase):
+    """
+    Test that `DELETE /api/v2/contentstore/downstreams/...` severs a downstream's link to an upstream.
+    """
+    def call_api(self, usage_key_string):
+        return self.client.delete(f"/api/contentstore/v2/downstreams/{usage_key_string}")
+
+    @patch.object(downstreams_views, "sever_upstream_link")
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_good_and_syncable)
+    def test_204(self, mock_sever):
+        """
+        Does the happy path work?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 204
+        assert mock_sever.call_count == 1
+
+    @patch.object(downstreams_views, "sever_upstream_link")
+    def test_204_no_upstream(self, mock_sever):
+        """
+        If there's no upsream, do we still happily return 204?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.regular_video_key)
+        assert response.status_code == 204
+        assert mock_sever.call_count == 1
+
+
+class _DownstreamSyncViewTestMixin(_DownstreamViewTestMixin):
+    """
+    Shared tests between the /api/contentstore/v2/downstreams/.../sync endpoints.
+    """
+
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_bad)
+    def test_400_bad_upstream(self):
+        """
+        If the upstream link is bad, do we get a 400?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 400
+        assert MOCK_UPSTREAM_ERROR in response.data["developer_message"][0]
+
+    def test_400_no_upstream(self):
+        """
+        If the upstream link is missing, do we get a 400?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.regular_video_key)
+        assert response.status_code == 400
+        assert "is not linked" in response.data["developer_message"][0]
+
+
+class PostDownstreamSyncViewTest(_DownstreamSyncViewTestMixin, SharedModuleStoreTestCase):
+    """
+    Test that `POST /api/v2/contentstore/downstreams/.../sync` initiates a sync from the linked upstream.
+    """
+    def call_api(self, usage_key_string):
+        return self.client.post(f"/api/contentstore/v2/downstreams/{usage_key_string}/sync")
+
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_good_and_syncable)
+    @patch.object(downstreams_views, "sync_from_upstream")
+    def test_200(self, mock_sync_from_upstream):
+        """
+        Does the happy path work?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 200
+        assert mock_sync_from_upstream.call_count == 1
+
+
+class DeleteDownstreamSyncViewtest(_DownstreamSyncViewTestMixin, SharedModuleStoreTestCase):
+    """
+    Test that `DELETE /api/v2/contentstore/downstreams/.../sync` declines a sync from the linked upstream.
+    """
+    def call_api(self, usage_key_string):
+        return self.client.delete(f"/api/contentstore/v2/downstreams/{usage_key_string}/sync")
+
+    @patch.object(UpstreamLink, "get_for_block", _get_upstream_link_good_and_syncable)
+    @patch.object(downstreams_views, "decline_sync")
+    def test_204(self, mock_decline_sync):
+        """
+        Does the happy path work?
+        """
+        self.client.login(username="superuser", password="password")
+        response = self.call_api(self.downstream_video_key)
+        assert response.status_code == 204
+        assert mock_decline_sync.call_count == 1
diff --git a/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_home.py b/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_home.py
index c0ffa50903cd..e773e7f213c6 100644
--- a/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_home.py
+++ b/cms/djangoapps/contentstore/rest_api/v2/views/tests/test_home.py
@@ -45,6 +45,7 @@ def setUp(self):
             org=archived_course_key.org,
             end=(datetime.now() - timedelta(days=365)).replace(tzinfo=pytz.UTC),
         )
+        self.non_staff_client, _ = self.create_non_staff_authed_user_client()
 
     def test_home_page_response(self):
         """Get list of courses available to the logged in user.
@@ -62,7 +63,7 @@ def test_home_page_response(self):
                 OrderedDict([
                     ("course_key", course_id),
                     ("display_name", self.course.display_name),
-                    ("lms_link", f'//{settings.LMS_BASE}/courses/{course_id}/jump_to/{self.course.location}'),
+                    ("lms_link", f'{settings.LMS_ROOT_URL}/courses/{course_id}/jump_to/{self.course.location}'),
                     ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.course.id)}'),
                     ("number", self.course.number),
                     ("org", self.course.org),
@@ -76,7 +77,7 @@ def test_home_page_response(self):
                     ("display_name", self.archived_course.display_name),
                     (
                         "lms_link",
-                        f'//{settings.LMS_BASE}/courses/{archived_course_id}/jump_to/{self.archived_course.location}'
+                        f'{settings.LMS_ROOT_URL}/courses/{archived_course_id}/jump_to/{self.archived_course.location}'
                     ),
                     (
                         "cms_link",
@@ -139,7 +140,7 @@ def test_active_only_query_if_passed(self):
         self.assertEqual(response.data["results"]["courses"], [OrderedDict([
             ("course_key", str(self.course.id)),
             ("display_name", self.course.display_name),
-            ("lms_link", f'//{settings.LMS_BASE}/courses/{str(self.course.id)}/jump_to/{self.course.location}'),
+            ("lms_link", f'{settings.LMS_ROOT_URL}/courses/{str(self.course.id)}/jump_to/{self.course.location}'),
             ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.course.id)}'),
             ("number", self.course.number),
             ("org", self.course.org),
@@ -164,7 +165,11 @@ def test_archived_only_query_if_passed(self):
             ("display_name", self.archived_course.display_name),
             (
                 "lms_link",
-                f'//{settings.LMS_BASE}/courses/{str(self.archived_course.id)}/jump_to/{self.archived_course.location}',
+                '{url_root}/courses/{course_id}/jump_to/{location}'.format(
+                    url_root=settings.LMS_ROOT_URL,
+                    course_id=str(self.archived_course.id),
+                    location=self.archived_course.location
+                ),
             ),
             ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.archived_course.id)}'),
             ("number", self.archived_course.number),
@@ -190,7 +195,11 @@ def test_search_query_if_passed(self):
             ("display_name", self.archived_course.display_name),
             (
                 "lms_link",
-                f'//{settings.LMS_BASE}/courses/{str(self.archived_course.id)}/jump_to/{self.archived_course.location}',
+                '{url_root}/courses/{course_id}/jump_to/{location}'.format(
+                    url_root=settings.LMS_ROOT_URL,
+                    course_id=str(self.archived_course.id),
+                    location=self.archived_course.location
+                ),
             ),
             ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.archived_course.id)}'),
             ("number", self.archived_course.number),
@@ -239,3 +248,100 @@ def test_api_v2_is_disabled(self, mock_modulestore, mock_course_overview):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         mock_modulestore().get_course_summaries.assert_called_once()
         mock_course_overview.get_all_courses.assert_not_called()
+
+    @ddt.data(
+        ("active_only", "true"),
+        ("archived_only", "true"),
+        ("search", "sample"),
+        ("order", "org"),
+        ("page", 1),
+    )
+    @ddt.unpack
+    def test_if_empty_list_of_courses(self, query_param, value):
+        """Get list of courses when no courses are available.
+
+        Expected result:
+        - An empty list of courses available to the logged in user.
+        """
+        self.active_course.delete()
+        self.archived_course.delete()
+
+        response = self.client.get(self.api_v2_url, {query_param: value})
+
+        self.assertEqual(len(response.data['results']['courses']), 0)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    @override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API)
+    @ddt.data(
+        ("active_only", "true", 2, 0),
+        ("archived_only", "true", 0, 1),
+        ("search", "foo", 1, 0),
+        ("search", "demo", 0, 1),
+        ("order", "org", 2, 1),
+        ("order", "display_name", 2, 1),
+        ("order", "number", 2, 1),
+        ("order", "run", 2, 1)
+    )
+    @ddt.unpack
+    def test_filter_and_ordering_courses(
+        self,
+        filter_key,
+        filter_value,
+        expected_active_length,
+        expected_archived_length
+    ):
+        """Get list of courses when filter and ordering are applied.
+
+        This test creates two courses besides the default courses created in the setUp method.
+        Then filters and orders them based on the filter_key and filter_value passed as query parameters.
+
+        Expected result:
+        - A list of courses available to the logged in user for the specified filter and order.
+        """
+        archived_course_key = self.store.make_course_key("demo-org", "demo-number", "demo-run")
+        CourseOverviewFactory.create(
+            display_name="Course (Demo)",
+            id=archived_course_key,
+            org=archived_course_key.org,
+            end=(datetime.now() - timedelta(days=365)).replace(tzinfo=pytz.UTC),
+        )
+        active_course_key = self.store.make_course_key("foo-org", "foo-number", "foo-run")
+        CourseOverviewFactory.create(
+            display_name="Course (Foo)",
+            id=active_course_key,
+            org=active_course_key.org,
+        )
+
+        response = self.client.get(self.api_v2_url, {filter_key: filter_value})
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(
+            len([course for course in response.data["results"]["courses"] if course["is_active"]]),
+            expected_active_length
+        )
+        self.assertEqual(
+            len([course for course in response.data["results"]["courses"] if not course["is_active"]]),
+            expected_archived_length
+        )
+
+    @ddt.data(
+        ("active_only", "true"),
+        ("archived_only", "true"),
+        ("search", "sample"),
+        ("order", "org"),
+        ("page", 1),
+    )
+    @ddt.unpack
+    def test_if_empty_list_of_courses_non_staff(self, query_param, value):
+        """Get list of courses when no courses are available for non-staff users.
+
+        Expected result:
+        - An empty list of courses available to the logged in user.
+        """
+        self.active_course.delete()
+        self.archived_course.delete()
+
+        response = self.non_staff_client.get(self.api_v2_url, {query_param: value})
+
+        self.assertEqual(len(response.data["results"]["courses"]), 0)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
diff --git a/cms/djangoapps/contentstore/tests/test_courseware_index.py b/cms/djangoapps/contentstore/tests/test_courseware_index.py
index 98a60dce901f..3ab3fa373f81 100644
--- a/cms/djangoapps/contentstore/tests/test_courseware_index.py
+++ b/cms/djangoapps/contentstore/tests/test_courseware_index.py
@@ -504,6 +504,11 @@ def test_delete_course_from_search_index_after_course_deletion(self):
         """ Test for removing course from CourseAboutSearchIndexer """
         self._test_delete_course_from_search_index_after_course_deletion(self.store)
 
+    def test_empty_course(self):
+        empty_course = CourseFactory.create(modulestore=self.store, start=datetime(2015, 3, 1, tzinfo=UTC))
+        added_to_index = CoursewareSearchIndexer.do_course_reindex(self.store, empty_course.id)
+        assert added_to_index == 0
+
 
 @patch('django.conf.settings.SEARCH_ENGINE', 'search.tests.utils.ForceRefreshElasticSearchEngine')
 @ddt.ddt
diff --git a/cms/djangoapps/contentstore/tests/test_filters.py b/cms/djangoapps/contentstore/tests/test_filters.py
new file mode 100644
index 000000000000..13bdfa07473e
--- /dev/null
+++ b/cms/djangoapps/contentstore/tests/test_filters.py
@@ -0,0 +1,98 @@
+"""
+Unit tests for the asset upload endpoint.
+"""
+from datetime import datetime
+from urllib.parse import urljoin
+
+from pytz import UTC
+
+from django.test import override_settings
+from cms.djangoapps.contentstore import asset_storage_handlers
+from opaque_keys.edx.locator import CourseLocator
+from openedx_filters import PipelineStep
+from xmodule.contentstore.content import StaticContent
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+
+
+class TestPageURLRequestedPipelineStep(PipelineStep):
+    """
+    Utility class used when getting steps for pipeline.
+    """
+
+    def run_filter(self, url, org):  # pylint: disable=arguments-differ
+        """Pipeline step that modifies lms url creation."""
+        url = "https://lms-url-creation"
+        org = "org"
+        return {
+            "url": url,
+            "org": org,
+        }
+
+
+class LMSPageURLRequestedFiltersTest(ModuleStoreTestCase):
+    """
+    Tests for the Open edX Filters associated with the lms url requested process.
+    This class guarantees that the following filters are triggered during the microsite render:
+    - LMSPageURLRequested
+    """
+
+    def setUp(self):  # pylint: disable=arguments-differ
+        super().setUp()
+        self.upload_date = datetime(2013, 6, 1, 10, 30, tzinfo=UTC)
+        self.content_type = 'image/jpg'
+        self.course_key = CourseLocator('org', 'class', 'run')
+        self.location = self.course_key.make_asset_key('asset', 'my_file_name.jpg')
+        self.thumbnail_location = self.course_key.make_asset_key('thumbnail', 'my_file_name_thumb.jpg')
+
+        self.asset_url = StaticContent.serialize_asset_key_with_slash(self.location)
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.course_authoring.lms.page.url.requested.v1": {
+                "pipeline": [
+                    "common.djangoapps.util.tests.test_filters.TestPageURLRequestedPipelineStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_lms_url_requested_filter_executed(self):
+        """
+        Test that filter get new LMS URL for asset URL generation
+        based on the course organization settings for org.
+        Expected result:
+            - LMSPageURLRequested is triggered and executes TestPageURLRequestedPipelineStep.
+            - The arguments that the receiver gets are the arguments used by the filter.
+        """
+        output = asset_storage_handlers.get_asset_json(
+            "my_file",
+            self.content_type,
+            self.upload_date,
+            self.location,
+            self.thumbnail_location,
+            True,
+            self.course_key
+        )
+
+        self.assertEqual(output.get('external_url'), urljoin('https://lms-url-creation', self.asset_url))
+
+    @override_settings(OPEN_EDX_FILTERS_CONFIG={}, LMS_ROOT_URL="https://lms-base")
+    def test_lms_url_requested_without_filter_configuration(self):
+        """
+        Test that filter get new LMS URL for asset URL generation
+        based on LMS_ROOT_URL settings because OPEN_EDX_FILTERS_CONFIG is not set.
+        Expected result:
+            - Returns the asset URL with domain base LMS_ROOT_URL.
+            - The get process ends successfully.
+        """
+        output = asset_storage_handlers.get_asset_json(
+            "my_file",
+            self.content_type,
+            self.upload_date,
+            self.location,
+            self.thumbnail_location,
+            True,
+            self.course_key
+        )
+
+        self.assertEqual(output.get('external_url'), urljoin('https://lms-base', self.asset_url))
diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py
index 9c478ddfe5d7..a91379797060 100644
--- a/cms/djangoapps/contentstore/tests/test_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_utils.py
@@ -960,4 +960,32 @@ def test_course_update_notification_sent(self):
         send_course_update_notification(self.course.id, content, self.user)
         assert Notification.objects.all().count() == 1
         notification = Notification.objects.first()
-        assert notification.content == "<p><strong><p>content</p></strong></p>"
+        assert notification.content == "<p><strong>content</strong></p>"
+
+    def test_if_content_is_plain_text(self):
+        """
+        Test that the course_update notification is sent.
+        """
+        user = UserFactory()
+        CourseEnrollment.enroll(user=user, course_key=self.course.id)
+        assert Notification.objects.all().count() == 0
+        content = "<p>content<p>Sub content</p><h1>heading</h1></p><img src='' />"
+        send_course_update_notification(self.course.id, content, self.user)
+        assert Notification.objects.all().count() == 1
+        notification = Notification.objects.first()
+        assert notification.content == "<p><strong>content Sub content heading</strong></p>"
+
+    def test_if_html_unescapes(self):
+        """
+        Tests if html unescapes when creating content of course update notification
+        """
+        user = UserFactory()
+        CourseEnrollment.enroll(user=user, course_key=self.course.id)
+        assert Notification.objects.all().count() == 0
+        content = "<p>&lt;p&gt; &amp;nbsp;&lt;/p&gt;<br />"\
+                  "&lt;p&gt;abcd&lt;/p&gt;<br />"\
+                  "&lt;p&gt;&amp;nbsp;&lt;/p&gt;<br /></p>"
+        send_course_update_notification(self.course.id, content, self.user)
+        assert Notification.objects.all().count() == 1
+        notification = Notification.objects.first()
+        assert notification.content == "<p><strong>abcd</strong></p>"
diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py
index 7c3a369fed62..39b793f479a2 100644
--- a/cms/djangoapps/contentstore/toggles.py
+++ b/cms/djangoapps/contentstore/toggles.py
@@ -2,6 +2,7 @@
 CMS feature toggles.
 """
 from edx_toggles.toggles import SettingDictToggle, WaffleFlag
+from openedx.core.djangoapps.content.search import api as search_api
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
 
 # .. toggle_name: FEATURES['ENABLE_EXPORT_GIT']
@@ -593,3 +594,96 @@ 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: FEATURES['ENABLE_CONTENT_LIBRARIES']
+# .. toggle_implementation: SettingDictToggle
+# .. toggle_default: True
+# .. toggle_description: Enables use of the legacy and v2 libraries waffle flags.
+#    Note that legacy content libraries are only supported in courses using split mongo.
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2015-03-06
+# .. toggle_target_removal_date: 2025-04-09
+# .. toggle_warning: This flag is deprecated in Sumac, and will be removed in favor of the disable_legacy_libraries and
+#    disable_new_libraries waffle flags.
+ENABLE_CONTENT_LIBRARIES = SettingDictToggle(
+    "FEATURES", "ENABLE_CONTENT_LIBRARIES", default=True, module_name=__name__
+)
+
+# .. toggle_name: contentstore.new_studio_mfe.disable_legacy_libraries
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Hides legacy (v1) Libraries tab in Authoring MFE.
+#    This toggle interacts with ENABLE_CONTENT_LIBRARIES toggle: if this is disabled, then legacy libraries are also
+#    disabled.
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2024-10-02
+# .. toggle_target_removal_date: 2025-04-09
+# .. toggle_tickets: https://github.com/openedx/frontend-app-authoring/issues/1334
+# .. toggle_warning: Legacy libraries are deprecated in Sumac, cf https://github.com/openedx/edx-platform/issues/32457
+DISABLE_LEGACY_LIBRARIES = WaffleFlag(
+    f'{CONTENTSTORE_NAMESPACE}.new_studio_mfe.disable_legacy_libraries',
+    __name__,
+    CONTENTSTORE_LOG_PREFIX,
+)
+
+
+def libraries_v1_enabled():
+    """
+    Returns a boolean if Libraries V2 is enabled in the new Studio Home.
+    """
+    return (
+        ENABLE_CONTENT_LIBRARIES.is_enabled() and
+        not DISABLE_LEGACY_LIBRARIES.is_enabled()
+    )
+
+
+# .. toggle_name: contentstore.new_studio_mfe.disable_new_libraries
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Hides new Libraries v2 tab in Authoring MFE.
+#    This toggle interacts with settings.MEILISEARCH_ENABLED and ENABLE_CONTENT_LIBRARIES toggle: if these flags are
+#    False, then v2 libraries are also disabled.
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2024-10-02
+# .. toggle_target_removal_date: 2025-04-09
+# .. toggle_tickets: https://github.com/openedx/frontend-app-authoring/issues/1334
+# .. toggle_warning: Libraries v2 are in beta for Sumac, will be fully supported in Teak.
+DISABLE_NEW_LIBRARIES = WaffleFlag(
+    f'{CONTENTSTORE_NAMESPACE}.new_studio_mfe.disable_new_libraries',
+    __name__,
+    CONTENTSTORE_LOG_PREFIX,
+)
+
+
+def libraries_v2_enabled():
+    """
+    Returns a boolean if Libraries V2 is enabled in the new Studio Home.
+
+    Requires the ENABLE_CONTENT_LIBRARIES feature flag to be enabled, plus Meilisearch.
+    """
+    return (
+        ENABLE_CONTENT_LIBRARIES.is_enabled() and
+        search_api.is_meilisearch_enabled() and
+        not DISABLE_NEW_LIBRARIES.is_enabled()
+    )
+
+
+# .. toggle_name: contentstore.enable_course_optimizer
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: This flag enables the use of unique anonymous_user_id during studio preview
+# .. toggle_use_cases: temporary
+# .. toggle_creation_date: 2022-05-04
+# .. toggle_target_removal_date: 2022-05-30
+# .. toggle_tickets: MST-1455
+ENABLE_COURSE_OPTIMIZER = CourseWaffleFlag(
+    f'{CONTENTSTORE_NAMESPACE}.enable_course_optimizer', __name__
+)
+
+
+def enable_course_optimizer(course_id):
+    """
+    Returns a boolean if individualized anonymous_user_id is enabled on the course
+    """
+    return ENABLE_COURSE_OPTIMIZER.is_enabled(course_id)
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 17e94112bafe..7023bcaefaf7 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -3,12 +3,13 @@
 """
 from __future__ import annotations
 import configparser
+import html
 import logging
 import re
 from collections import defaultdict
 from contextlib import contextmanager
 from datetime import datetime, timezone
-from urllib.parse import quote_plus
+from urllib.parse import quote_plus, urlencode, urlunparse, urlparse
 from uuid import uuid4
 
 from bs4 import BeautifulSoup
@@ -34,7 +35,32 @@
 from pytz import UTC
 from xblock.fields import Scope
 
-from cms.djangoapps.contentstore.toggles import exam_setting_view_enabled
+from cms.djangoapps.contentstore.toggles import (
+    exam_setting_view_enabled,
+    libraries_v1_enabled,
+    libraries_v2_enabled,
+    split_library_view_on_dashboard,
+    use_new_advanced_settings_page,
+    use_new_course_outline_page,
+    use_new_certificates_page,
+    use_new_export_page,
+    use_new_files_uploads_page,
+    use_new_grading_page,
+    use_new_group_configurations_page,
+    use_new_course_team_page,
+    use_new_home_page,
+    use_new_import_page,
+    use_new_schedule_details_page,
+    use_new_text_editor,
+    use_new_textbooks_page,
+    use_new_unit_page,
+    use_new_updates_page,
+    use_new_video_editor,
+    use_new_video_uploads_page,
+    use_new_custom_pages,
+)
+from cms.djangoapps.models.settings.course_grading import CourseGradingModel
+from cms.djangoapps.models.settings.course_metadata import CourseMetadata
 from common.djangoapps.course_action_state.models import CourseRerunUIStateManager, CourseRerunState
 from common.djangoapps.course_action_state.managers import CourseActionStateItemNotFoundError
 from common.djangoapps.course_modes.models import CourseMode
@@ -75,30 +101,7 @@
 from openedx.features.content_type_gating.models import ContentTypeGatingConfig
 from openedx.features.content_type_gating.partitions import CONTENT_TYPE_GATING_SCHEME
 from openedx.features.course_experience.waffle import ENABLE_COURSE_ABOUT_SIDEBAR_HTML
-from cms.djangoapps.contentstore.toggles import (
-    split_library_view_on_dashboard,
-    use_new_advanced_settings_page,
-    use_new_course_outline_page,
-    use_new_certificates_page,
-    use_new_export_page,
-    use_new_files_uploads_page,
-    use_new_grading_page,
-    use_new_group_configurations_page,
-    use_new_course_team_page,
-    use_new_home_page,
-    use_new_import_page,
-    use_new_schedule_details_page,
-    use_new_text_editor,
-    use_new_textbooks_page,
-    use_new_unit_page,
-    use_new_updates_page,
-    use_new_video_editor,
-    use_new_video_uploads_page,
-    use_new_custom_pages,
-)
-from cms.djangoapps.models.settings.course_grading import CourseGradingModel
-from cms.djangoapps.models.settings.course_metadata import CourseMetadata
-from xmodule.library_tools import LibraryToolsService
+from xmodule.library_tools import LegacyLibraryToolsService
 from xmodule.course_block import DEFAULT_START_DATE  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.data import CertificatesDisplayBehaviors
 from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
@@ -190,31 +193,30 @@ def get_lms_link_for_item(location, preview=False):
     """
     assert isinstance(location, UsageKey)
 
-    # checks LMS_BASE value in site configuration for the given course_org_filter(org)
-    # if not found returns settings.LMS_BASE
+    # checks LMS_ROOT_URL value in site configuration for the given course_org_filter(org)
+    # if not found returns settings.LMS_ROOT_URL
     lms_base = SiteConfiguration.get_value_for_org(
         location.org,
-        "LMS_BASE",
-        settings.LMS_BASE
+        "LMS_ROOT_URL",
+        settings.LMS_ROOT_URL
     )
+    query_string = ''
 
     if lms_base is None:
         return None
 
     if preview:
-        # checks PREVIEW_LMS_BASE value in site configuration for the given course_org_filter(org)
-        # if not found returns settings.FEATURES.get('PREVIEW_LMS_BASE')
-        lms_base = SiteConfiguration.get_value_for_org(
-            location.org,
-            "PREVIEW_LMS_BASE",
-            settings.FEATURES.get('PREVIEW_LMS_BASE')
-        )
+        params = {'preview': '1'}
+        query_string = urlencode(params)
 
-    return "//{lms_base}/courses/{course_key}/jump_to/{location}".format(
-        lms_base=lms_base,
+    url_parts = list(urlparse(lms_base))
+    url_parts[2] = '/courses/{course_key}/jump_to/{location}'.format(
         course_key=str(location.course_key),
         location=str(location),
     )
+    url_parts[4] = query_string
+
+    return urlunparse(url_parts)
 
 
 def get_lms_link_for_certificate_web_view(course_key, mode):
@@ -427,6 +429,18 @@ def get_course_outline_url(course_locator) -> str:
     return course_outline_url
 
 
+def get_library_content_picker_url(course_locator) -> str:
+    """
+    Gets course authoring microfrontend library content picker URL for the given parent block.
+    """
+    content_picker_url = None
+    if libraries_v2_enabled():
+        mfe_base_url = get_course_authoring_url(course_locator)
+        content_picker_url = f'{mfe_base_url}/component-picker?variant=published'
+
+    return content_picker_url
+
+
 def get_unit_url(course_locator, unit_locator) -> str:
     """
     Gets course authoring microfrontend URL for unit page view.
@@ -1265,7 +1279,7 @@ def load_services_for_studio(runtime, user):
         "settings": SettingsService(),
         "lti-configuration": ConfigurationService(CourseAllowPIISharingInLTIFlag),
         "teams_configuration": TeamsConfigurationService(),
-        "library_tools": LibraryToolsService(modulestore(), user.id)
+        "library_tools": LegacyLibraryToolsService(modulestore(), user.id)
     }
 
     runtime._services.update(services)  # lint-amnesty, pylint: disable=protected-access
@@ -1536,10 +1550,13 @@ def get_library_context(request, request_is_json=False):
         _format_library_for_view,
     )
     from cms.djangoapps.contentstore.views.library import (
-        LIBRARIES_ENABLED,
+        user_can_view_create_library_button,
+    )
+    from openedx.core.djangoapps.content_libraries.api import (
+        user_can_create_library,
     )
 
-    libraries = _accessible_libraries_iter(request.user) if LIBRARIES_ENABLED else []
+    libraries = _accessible_libraries_iter(request.user) if libraries_v1_enabled() else []
     data = {
         'libraries': [_format_library_for_view(lib, request) for lib in libraries],
     }
@@ -1549,8 +1566,9 @@ def get_library_context(request, request_is_json=False):
             **data,
             'in_process_course_actions': [],
             'courses': [],
-            'libraries_enabled': LIBRARIES_ENABLED,
-            'show_new_library_button': LIBRARIES_ENABLED and request.user.is_active,
+            'libraries_enabled': libraries_v1_enabled(),
+            'show_new_library_button': user_can_view_create_library_button(request.user) and request.user.is_active,
+            'show_new_library_v2_button': user_can_create_library(request.user),
             'user': request.user,
             'request_course_creator_url': reverse('request_course_creator'),
             'course_creator_status': _get_course_creator_status(request.user),
@@ -1670,11 +1688,11 @@ def get_home_context(request, no_course=False):
         ENABLE_GLOBAL_STAFF_OPTIMIZATION,
     )
     from cms.djangoapps.contentstore.views.library import (
-        LIBRARY_AUTHORING_MICROFRONTEND_URL,
-        LIBRARIES_ENABLED,
-        should_redirect_to_library_authoring_mfe,
         user_can_view_create_library_button,
     )
+    from openedx.core.djangoapps.content_libraries.api import (
+        user_can_create_library,
+    )
 
     active_courses = []
     archived_courses = []
@@ -1688,7 +1706,7 @@ def get_home_context(request, no_course=False):
     if not no_course:
         active_courses, archived_courses, in_process_course_actions = get_course_context(request)
 
-    if not split_library_view_on_dashboard() and LIBRARIES_ENABLED and not no_course:
+    if not split_library_view_on_dashboard() and libraries_v1_enabled() and not no_course:
         libraries = get_library_context(request, True)['libraries']
 
     home_context = {
@@ -1696,14 +1714,14 @@ def get_home_context(request, no_course=False):
         'split_studio_home': split_library_view_on_dashboard(),
         'archived_courses': archived_courses,
         'in_process_course_actions': in_process_course_actions,
-        'libraries_enabled': LIBRARIES_ENABLED,
+        'libraries_enabled': libraries_v1_enabled(),
+        'libraries_v1_enabled': libraries_v1_enabled(),
+        'libraries_v2_enabled': libraries_v2_enabled(),
         'taxonomies_enabled': not is_tagging_feature_disabled(),
-        '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_view_create_library_button(user)
-        and not should_redirect_to_library_authoring_mfe(),
+        'show_new_library_button': user_can_view_create_library_button(user),
+        'show_new_library_v2_button': user_can_create_library(user),
         'user': user,
         'request_course_creator_url': reverse('request_course_creator'),
         'course_creator_status': _get_course_creator_status(user),
@@ -1715,6 +1733,7 @@ def get_home_context(request, no_course=False):
         'allowed_organizations': get_allowed_organizations(user),
         'allowed_organizations_for_libraries': get_allowed_organizations_for_libraries(user),
         'can_create_organizations': user_can_create_organizations(user),
+        'can_access_advanced_settings': auth.has_studio_advanced_settings_access(user),
     }
 
     return home_context
@@ -2044,6 +2063,7 @@ def get_container_handler_context(request, usage_key, course, xblock):  # pylint
         'user_clipboard': user_clipboard,
         'is_fullwidth_content': is_library_xblock,
         'course_sequence_ids': course_sequence_ids,
+        'library_content_picker_url': get_library_content_picker_url(course.id),
     }
     return context
 
@@ -2200,7 +2220,7 @@ class StudioPermissionsService:
 
     Deprecated. To be replaced by a more general authorization service.
 
-    Only used by LibraryContentBlock (and library_tools.py).
+    Only used by LegacyLibraryContentBlock (and library_tools.py).
     """
 
     def __init__(self, user):
@@ -2246,23 +2266,11 @@ def clean_html_body(html_body):
     """
     Get html body, remove tags and limit to 500 characters
     """
+    html_body = html.unescape(html_body).strip()
     html_body = BeautifulSoup(Truncator(html_body).chars(500, html=True), 'html.parser')
-
-    tags_to_remove = [
-        "a", "link",  # Link Tags
-        "img", "picture", "source",  # Image Tags
-        "video", "track",  # Video Tags
-        "audio",  # Audio Tags
-        "embed", "object", "iframe",  # Embedded Content
-        "script"
-    ]
-
-    # Remove the specified tags while keeping their content
-    for tag in tags_to_remove:
-        for match in html_body.find_all(tag):
-            match.unwrap()
-
-    return str(html_body)
+    text_content = html_body.get_text(separator=" ").strip()
+    text_content = text_content.replace('\n', '').replace('\r', '')
+    return text_content
 
 
 def send_course_update_notification(course_key, content, user):
diff --git a/cms/djangoapps/contentstore/video_storage_handlers.py b/cms/djangoapps/contentstore/video_storage_handlers.py
index 6827b295b0a8..4cc5c738b5dc 100644
--- a/cms/djangoapps/contentstore/video_storage_handlers.py
+++ b/cms/djangoapps/contentstore/video_storage_handlers.py
@@ -967,26 +967,38 @@ def get_course_youtube_edx_video_ids(course_id):
     """
     Get a list of youtube edx_video_ids
     """
-    error_msg = "Invalid course_key: '%s'." % course_id
-    try:
+    invalid_key_error_msg = "Invalid course_key: '%s'." % course_id
+    unexpected_error_msg = "Unexpected error occurred for course_id: '%s'." % course_id
+
+    try:  # lint-amnesty, pylint: disable=too-many-nested-blocks
         course_key = CourseKey.from_string(course_id)
         course = modulestore().get_course(course_key)
-    except InvalidKeyError:
-        return JsonResponse({'error': error_msg}, status=500)
-    blocks = []
-    block_yt_field = 'youtube_id_1_0'
-    block_edx_id_field = 'edx_video_id'
-    if hasattr(course, 'get_children'):
-        for section in course.get_children():
-            for subsection in section.get_children():
-                for vertical in subsection.get_children():
-                    for block in vertical.get_children():
-                        blocks.append(block)
-
-    edx_video_ids = []
-    for block in blocks:
-        if hasattr(block, block_yt_field) and getattr(block, block_yt_field):
-            if getattr(block, block_edx_id_field):
-                edx_video_ids.append(getattr(block, block_edx_id_field))
+
+        blocks = []
+        block_yt_field = 'youtube_id_1_0'
+        block_edx_id_field = 'edx_video_id'
+        if hasattr(course, 'get_children'):
+            for section in course.get_children():
+                for subsection in section.get_children():
+                    for vertical in subsection.get_children():
+                        for block in vertical.get_children():
+                            blocks.append(block)
+
+        edx_video_ids = []
+        for block in blocks:
+            if hasattr(block, block_yt_field) and getattr(block, block_yt_field):
+                if getattr(block, block_edx_id_field):
+                    edx_video_ids.append(getattr(block, block_edx_id_field))
+
+    except InvalidKeyError as error:
+        LOGGER.exception(
+            f"InvalidKeyError occurred while getting YouTube video IDs for course_id: {course_id}: {error}"
+        )
+        return JsonResponse({'error': invalid_key_error_msg}, status=500)
+    except Exception as error:
+        LOGGER.exception(
+            f"Unexpected error occurred while getting YouTube video IDs for course_id: {course_id}: {error}"
+        )
+        return JsonResponse({'error': unexpected_error_msg}, status=500)
 
     return JsonResponse({'edx_video_ids': edx_video_ids}, status=200)
diff --git a/cms/djangoapps/contentstore/views/block.py b/cms/djangoapps/contentstore/views/block.py
index 4d6c17838e57..e6b41dc261d2 100644
--- a/cms/djangoapps/contentstore/views/block.py
+++ b/cms/djangoapps/contentstore/views/block.py
@@ -135,6 +135,8 @@ def xblock_handler(request, usage_key_string=None):
                      if duplicate_source_locator is not present
                 :staged_content: use "clipboard" to paste from the OLX user's clipboard. (Incompatible with all other
                      fields except parent_locator)
+                :library_content_key: the key of the library content to add. (Incompatible with
+                     all other fields except parent_locator)
               The locator (unicode representation of a UsageKey) for the created xblock (minus children) is returned.
     """
     return handle_xblock(request, usage_key_string)
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index ba767df78dc9..914c07884665 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -11,6 +11,7 @@
 from django.http import Http404, HttpResponseBadRequest
 from django.shortcuts import redirect
 from django.utils.translation import gettext as _
+from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.decorators.http import require_GET
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import UsageKey
@@ -25,7 +26,12 @@
 from common.djangoapps.xblock_django.api import authorable_xblocks, disabled_xblocks
 from common.djangoapps.xblock_django.models import XBlockStudioConfigurationFlag
 from cms.djangoapps.contentstore.helpers import is_unit
-from cms.djangoapps.contentstore.toggles import use_new_problem_editor, use_new_unit_page
+from cms.djangoapps.contentstore.toggles import (
+    libraries_v1_enabled,
+    libraries_v2_enabled,
+    use_new_problem_editor,
+    use_new_unit_page,
+)
 from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import load_services_for_studio
 from openedx.core.lib.xblock_utils import get_aside_from_xblock, is_xblock_aside
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration
@@ -35,13 +41,26 @@
 
 __all__ = [
     'container_handler',
-    'component_handler'
+    'component_handler',
+    'container_embed_handler',
 ]
 
 log = logging.getLogger(__name__)
 
 # NOTE: This list is disjoint from ADVANCED_COMPONENT_TYPES
-COMPONENT_TYPES = ['discussion', 'library', 'html', 'openassessment', 'problem', 'video', 'drag-and-drop-v2']
+COMPONENT_TYPES = [
+    'html',
+    'video',
+    'problem',
+    'itembank',
+    'library_v2',  # Not an XBlock
+    'library',
+    'discussion',
+    'openassessment',
+    'drag-and-drop-v2',
+]
+
+BETA_COMPONENT_TYPES = ['library_v2', 'itembank']
 
 ADVANCED_COMPONENT_TYPES = sorted({name for name, class_ in XBlock.load_classes()} - set(COMPONENT_TYPES))
 
@@ -56,7 +75,7 @@
     "add-xblock-component-support-legend", "add-xblock-component-support-level", "add-xblock-component-menu-problem",
     "xblock-string-field-editor", "xblock-access-editor", "publish-xblock", "publish-history", "tag-list",
     "unit-outline", "container-message", "container-access", "license-selector", "copy-clipboard-button",
-    "edit-title-button",
+    "edit-title-button", "edit-upstream-alert",
 ]
 
 
@@ -95,6 +114,10 @@ def _load_mixed_class(category):
     """
     Load an XBlock by category name, and apply all defined mixins
     """
+    # Libraries v2 content doesn't have an XBlock.
+    if category == 'library_v2':
+        return None
+
     component_class = XBlock.load_class(category)
     mixologist = Mixologist(settings.XBLOCK_MIXINS)
     return mixologist.mix(component_class)
@@ -141,6 +164,36 @@ def container_handler(request, usage_key_string):  # pylint: disable=too-many-st
         return HttpResponseBadRequest("Only supports HTML requests")
 
 
+@require_GET
+@login_required
+@xframe_options_exempt
+def container_embed_handler(request, usage_key_string):  # pylint: disable=too-many-statements
+    """
+    Returns an HttpResponse with HTML content for the container XBlock.
+    The returned HTML is a chromeless rendering of the XBlock.
+
+    GET
+        html: returns the HTML page for editing a container
+        json: not currently supported
+    """
+
+    # Avoiding a circular dependency
+    from ..utils import get_container_handler_context
+
+    try:
+        usage_key = UsageKey.from_string(usage_key_string)
+    except InvalidKeyError:  # Raise Http404 on invalid 'usage_key_string'
+        return HttpResponseBadRequest()
+    with modulestore().bulk_operations(usage_key.course_key):
+        try:
+            course, xblock, lms_link, preview_lms_link = _get_item_in_course(request, usage_key)
+        except ItemNotFoundError:
+            raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
+
+        container_handler_context = get_container_handler_context(request, usage_key, course, xblock)
+        return render_to_response('container_chromeless.html', container_handler_context)
+
+
 def get_component_templates(courselike, library=False):  # lint-amnesty, pylint: disable=too-many-statements
     """
     Returns the applicable component templates that can be used by the specified course or library.
@@ -215,7 +268,9 @@ def create_support_legend_dict():
         'problem': _("Problem"),
         'video': _("Video"),
         'openassessment': _("Open Response"),
-        'library': _("Library Content"),
+        'library': _("Legacy Library"),
+        'library_v2': _("Library Content"),
+        'itembank': _("Problem Bank"),
         'drag-and-drop-v2': _("Drag and Drop"),
     }
 
@@ -226,7 +281,14 @@ def create_support_legend_dict():
     component_types = COMPONENT_TYPES[:]
 
     # Libraries do not support discussions, drag-and-drop, and openassessment and other libraries
-    component_not_supported_by_library = ['discussion', 'library', 'openassessment', 'drag-and-drop-v2']
+    component_not_supported_by_library = [
+        'discussion',
+        'library',
+        'openassessment',
+        'drag-and-drop-v2',
+        'library_v2',
+        'itembank',
+    ]
     if library:
         component_types = [component for component in component_types
                            if component not in set(component_not_supported_by_library)]
@@ -245,7 +307,7 @@ def create_support_legend_dict():
         templates_for_category = []
         component_class = _load_mixed_class(category)
 
-        if support_level_without_template and category != 'library':
+        if support_level_without_template and category not in ['library']:
             # add the default template with localized display name
             # TODO: Once mixins are defined per-application, rather than per-runtime,
             # this should use a cms mixed-in class. (cpennington)
@@ -366,7 +428,8 @@ def create_support_legend_dict():
             "type": category,
             "templates": templates_for_category,
             "display_name": component_display_names[category],
-            "support_legend": create_support_legend_dict()
+            "support_legend": create_support_legend_dict(),
+            "beta": category in BETA_COMPONENT_TYPES,
         })
 
     # Libraries do not support advanced components at this time.
@@ -416,7 +479,7 @@ def create_support_legend_dict():
             course_advanced_keys
         )
     if advanced_component_templates['templates']:
-        component_templates.insert(0, advanced_component_templates)
+        component_templates.append(advanced_component_templates)
 
     return component_templates
 
@@ -440,6 +503,11 @@ def _filter_disabled_blocks(all_blocks):
     Filter out disabled xblocks from the provided list of xblock names.
     """
     disabled_block_names = [block.name for block in disabled_xblocks()]
+    if not libraries_v1_enabled():
+        disabled_block_names.append('library')
+    if not libraries_v2_enabled():
+        disabled_block_names.append('library_v2')
+        disabled_block_names.append('itembank')
     return [block_name for block_name in all_blocks if block_name not in disabled_block_names]
 
 
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 9f6cfb7c430e..244804c3062b 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -15,6 +15,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import FieldError, PermissionDenied, ValidationError as DjangoValidationError
+from django.db.models import QuerySet
 from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import redirect
 from django.urls import reverse
@@ -575,6 +576,10 @@ def filter_ccx(course_access):
 
     if course_keys:
         courses_list = CourseOverview.get_all_courses(filter_={'id__in': course_keys})
+    else:
+        # If no course keys are found for the current user, then return without filtering
+        # or ordering the courses list.
+        return courses_list, []
 
     search_query, order, active_only, archived_only = get_query_params_if_present(request)
     courses_list = get_filtered_and_ordered_courses(
@@ -588,7 +593,11 @@ def filter_ccx(course_access):
     return courses_list, []
 
 
-def get_courses_by_status(active_only, archived_only, course_overviews):
+def get_courses_by_status(
+    active_only: bool,
+    archived_only: bool,
+    course_overviews: QuerySet[CourseOverview]
+) -> QuerySet[CourseOverview]:
     """
     Return course overviews based on a base queryset filtered by a status.
 
@@ -602,7 +611,10 @@ def get_courses_by_status(active_only, archived_only, course_overviews):
     return CourseOverview.get_courses_by_status(active_only, archived_only, course_overviews)
 
 
-def get_courses_by_search_query(search_query, course_overviews):
+def get_courses_by_search_query(
+    search_query: str | None,
+    course_overviews: QuerySet[CourseOverview]
+) -> QuerySet[CourseOverview]:
     """Return course overviews based on a base queryset filtered by a search query.
 
     Args:
@@ -614,7 +626,10 @@ def get_courses_by_search_query(search_query, course_overviews):
     return CourseOverview.get_courses_matching_query(search_query, course_overviews=course_overviews)
 
 
-def get_courses_order_by(order_query, course_overviews):
+def get_courses_order_by(
+    order_query: str | None,
+    course_overviews: QuerySet[CourseOverview]
+) -> QuerySet[CourseOverview]:
     """Return course overviews based on a base queryset ordered by a query.
 
     Args:
diff --git a/cms/djangoapps/contentstore/views/library.py b/cms/djangoapps/contentstore/views/library.py
index 870c192653d2..92e4329c2f94 100644
--- a/cms/djangoapps/contentstore/views/library.py
+++ b/cms/djangoapps/contentstore/views/library.py
@@ -41,8 +41,8 @@
 )
 from common.djangoapps.util.json_request import JsonResponse, JsonResponseBadRequest, expect_json
 
-from ..config.waffle import REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND
 from ..utils import add_instructor, reverse_library_url
+from ..toggles import libraries_v1_enabled
 from .component import CONTAINER_TEMPLATES, get_component_templates
 from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import create_xblock_info
 from .user import user_with_role
@@ -51,52 +51,11 @@
 
 log = logging.getLogger(__name__)
 
-LIBRARIES_ENABLED = settings.FEATURES.get('ENABLE_CONTENT_LIBRARIES', False)
-ENABLE_LIBRARY_AUTHORING_MICROFRONTEND = settings.FEATURES.get('ENABLE_LIBRARY_AUTHORING_MICROFRONTEND', False)
-LIBRARY_AUTHORING_MICROFRONTEND_URL = settings.LIBRARY_AUTHORING_MICROFRONTEND_URL
 
-
-def should_redirect_to_library_authoring_mfe():
-    """
-    Boolean helper method, returns whether or not to redirect to the Library
-    Authoring MFE based on settings and flags.
-    """
-
-    return (
-        ENABLE_LIBRARY_AUTHORING_MICROFRONTEND and
-        LIBRARY_AUTHORING_MICROFRONTEND_URL and
-        REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND.is_enabled()
-    )
-
-
-def user_can_view_create_library_button(user):
-    """
-    Helper method for displaying the visibilty of the create_library_button.
-    """
-    if not LIBRARIES_ENABLED:
-        return False
-    elif user.is_staff:
-        return True
-    elif settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
-        is_course_creator = get_course_creator_status(user) == 'granted'
-        has_org_staff_role = OrgStaffRole().get_orgs_for_user(user).exists()
-        has_course_staff_role = UserBasedRole(user=user, role=CourseStaffRole.ROLE).courses_with_role().exists()
-        has_course_admin_role = UserBasedRole(user=user, role=CourseInstructorRole.ROLE).courses_with_role().exists()
-        return is_course_creator or has_org_staff_role or has_course_staff_role or has_course_admin_role
-    else:
-        # EDUCATOR-1924: DISABLE_LIBRARY_CREATION overrides DISABLE_COURSE_CREATION, if present.
-        disable_library_creation = settings.FEATURES.get('DISABLE_LIBRARY_CREATION', None)
-        disable_course_creation = settings.FEATURES.get('DISABLE_COURSE_CREATION', False)
-        if disable_library_creation is not None:
-            return not disable_library_creation
-        else:
-            return not disable_course_creation
-
-
-def user_can_create_library(user, org):
+def _user_can_create_library_for_org(user, org=None):
     """
     Helper method for returning the library creation status for a particular user,
-    taking into account the value LIBRARIES_ENABLED.
+    taking into account the libraries_v1_enabled toggle.
 
     if the ENABLE_CREATOR_GROUP value is False, then any user can create a library (in any org),
     if library creation is enabled.
@@ -109,29 +68,29 @@ def user_can_create_library(user, org):
     Course Staff: Can make libraries in the organization which has courses of which they are staff.
     Course Admin: Can make libraries in the organization which has courses of which they are Admin.
     """
-    if org is None:
-        return False
-    if not LIBRARIES_ENABLED:
+    if not libraries_v1_enabled():
         return False
     elif user.is_staff:
         return True
-    if settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
+    elif settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
+        org_filter_params = {}
+        if org:
+            org_filter_params['org'] = org
         is_course_creator = get_course_creator_status(user) == 'granted'
-        has_org_staff_role = org in OrgStaffRole().get_orgs_for_user(user)
+        has_org_staff_role = OrgStaffRole().get_orgs_for_user(user).filter(**org_filter_params).exists()
         has_course_staff_role = (
             UserBasedRole(user=user, role=CourseStaffRole.ROLE)
             .courses_with_role()
-            .filter(org=org)
+            .filter(**org_filter_params)
             .exists()
         )
         has_course_admin_role = (
             UserBasedRole(user=user, role=CourseInstructorRole.ROLE)
             .courses_with_role()
-            .filter(org=org)
+            .filter(**org_filter_params)
             .exists()
         )
         return is_course_creator or has_org_staff_role or has_course_staff_role or has_course_admin_role
-
     else:
         # EDUCATOR-1924: DISABLE_LIBRARY_CREATION overrides DISABLE_COURSE_CREATION, if present.
         disable_library_creation = settings.FEATURES.get('DISABLE_LIBRARY_CREATION', None)
@@ -142,6 +101,22 @@ def user_can_create_library(user, org):
             return not disable_course_creation
 
 
+def user_can_view_create_library_button(user):
+    """
+    Helper method for displaying the visibilty of the create_library_button.
+    """
+    return _user_can_create_library_for_org(user)
+
+
+def user_can_create_library(user, org):
+    """
+    Helper method for to check if user can create library for given org.
+    """
+    if org is None:
+        return False
+    return _user_can_create_library_for_org(user, org)
+
+
 @login_required
 @ensure_csrf_cookie
 @require_http_methods(('GET', 'POST'))
@@ -149,7 +124,7 @@ def library_handler(request, library_key_string=None):
     """
     RESTful interface to most content library related functionality.
     """
-    if not LIBRARIES_ENABLED:
+    if not libraries_v1_enabled():
         log.exception("Attempted to use the content library API when the libraries feature is disabled.")
         raise Http404  # Should never happen because we test the feature in urls.py also
 
diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index acc5fc95dfe3..aa7421bb87b3 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -300,8 +300,9 @@ def _studio_wrap_xblock(xblock, view, frag, context, display_name_only=False):
             selected_groups_label = _('Access restricted to: {list_of_groups}').format(list_of_groups=selected_groups_label)  # lint-amnesty, pylint: disable=line-too-long
         course = modulestore().get_course(xblock.location.course_key)
         can_edit = context.get('can_edit', True)
+        can_add = context.get('can_add', True)
         # Is this a course or a library?
-        is_course = xblock.scope_ids.usage_id.context_key.is_course
+        is_course = xblock.context_key.is_course
         tags_count_map = context.get('tags_count_map')
         tags_count = 0
         if tags_count_map:
@@ -320,7 +321,10 @@ def _studio_wrap_xblock(xblock, view, frag, context, display_name_only=False):
             'is_selected': context.get('is_selected', False),
             'selectable': context.get('selectable', False),
             'selected_groups_label': selected_groups_label,
-            'can_add': context.get('can_add', True),
+            'can_add': can_add,
+            # Generally speaking, "if you can add, you can delete". One exception is itembank (Problem Bank)
+            # which has its own separate "add" workflow but uses the normal delete workflow for its child blocks.
+            'can_delete': can_add or (root_xblock and root_xblock.scope_ids.block_type == "itembank" and can_edit),
             'can_move': context.get('can_move', is_course),
             'language': getattr(course, 'language', None),
             'is_course': is_course,
diff --git a/cms/djangoapps/contentstore/views/tests/test_block.py b/cms/djangoapps/contentstore/views/tests/test_block.py
index fc119c7edd58..1190eb239518 100644
--- a/cms/djangoapps/contentstore/views/tests/test_block.py
+++ b/cms/djangoapps/contentstore/views/tests/test_block.py
@@ -312,12 +312,12 @@ def test_split_test(self):
         resp = self.create_xblock(
             parent_usage_key=split_test_usage_key,
             category="html",
-            boilerplate="zooming_image.yaml",
+            boilerplate="latex_html.yaml",
         )
         self.assertEqual(resp.status_code, 200)
         html, __ = self._get_container_preview(split_test_usage_key)
         self.assertIn("Announcement", html)
-        self.assertIn("Zooming", html)
+        self.assertIn("LaTeX", html)
 
     def test_split_test_edited(self):
         """
@@ -982,7 +982,7 @@ def test_shallow_duplicate(self):
 
     def test_duplicate_library_content_block(self):  # pylint: disable=too-many-statements
         """
-        Test the LibraryContentBlock's special duplication process.
+        Test the LegacyLibraryContentBlock's special duplication process.
         """
         store = modulestore()
 
@@ -3184,13 +3184,13 @@ def _verify_advanced_xblocks(self, expected_xblocks, expected_support_levels):
         templates = get_component_templates(self.course)
         button_names = [template["display_name"] for template in templates]
         self.assertIn("Advanced", button_names)
-        self.assertEqual(len(templates[0]["templates"]), len(expected_xblocks))
+        self.assertEqual(len(templates[-1]["templates"]), len(expected_xblocks))
         template_display_names = [
-            template["display_name"] for template in templates[0]["templates"]
+            template["display_name"] for template in templates[-1]["templates"]
         ]
         self.assertEqual(template_display_names, expected_xblocks)
         template_support_levels = [
-            template["support_level"] for template in templates[0]["templates"]
+            template["support_level"] for template in templates[-1]["templates"]
         ]
         self.assertEqual(template_support_levels, expected_support_levels)
 
@@ -3674,14 +3674,15 @@ def test_special_exam_xblock_info(
     @patch_does_backend_support_onboarding
     @patch_get_exam_by_content_id_success
     @ddt.data(
-        ("lti_external", False),
-        ("other_proctoring_backend", True),
+        ("lti_external", False, None),
+        ("other_proctoring_backend", True, "test_url"),
     )
     @ddt.unpack
-    def test_support_onboarding_is_correct_depending_on_lti_external(
+    def test_proctoring_values_correct_depending_on_lti_external(
         self,
         external_id,
-        expected_value,
+        expected_supports_onboarding_value,
+        expected_proctoring_link,
         mock_get_exam_by_content_id,
         mock_does_backend_support_onboarding,
         _mock_get_exam_configuration_dashboard_url,
@@ -3691,8 +3692,9 @@ def test_support_onboarding_is_correct_depending_on_lti_external(
             category="sequential",
             display_name="Test Lesson 1",
             user_id=self.user.id,
-            is_proctored_enabled=False,
-            is_time_limited=False,
+            is_proctored_enabled=True,
+            is_time_limited=True,
+            default_time_limit_minutes=100,
             is_onboarding_exam=False,
         )
 
@@ -3709,7 +3711,8 @@ def test_support_onboarding_is_correct_depending_on_lti_external(
             include_children_predicate=ALWAYS,
             course=self.course,
         )
-        assert xblock_info["supports_onboarding"] is expected_value
+        assert xblock_info["supports_onboarding"] is expected_supports_onboarding_value
+        assert xblock_info["proctoring_exam_configuration_link"] == expected_proctoring_link
 
     @patch_get_exam_configuration_dashboard_url
     @patch_does_backend_support_onboarding
@@ -3773,6 +3776,42 @@ def test_xblock_was_never_proctortrack_proctored_exam(
         assert xblock_info["was_exam_ever_linked_with_external"] is False
         assert mock_get_exam_by_content_id.call_count == 1
 
+    @patch_get_exam_configuration_dashboard_url
+    @patch_does_backend_support_onboarding
+    @patch_get_exam_by_content_id_success
+    def test_special_exam_xblock_info_get_dashboard_error(
+        self,
+        mock_get_exam_by_content_id,
+        _mock_does_backend_support_onboarding,
+        mock_get_exam_configuration_dashboard_url,
+    ):
+        sequential = BlockFactory.create(
+            parent_location=self.chapter.location,
+            category="sequential",
+            display_name="Test Lesson 1",
+            user_id=self.user.id,
+            is_proctored_enabled=True,
+            is_time_limited=True,
+            default_time_limit_minutes=100,
+            is_onboarding_exam=False,
+        )
+        sequential = modulestore().get_item(sequential.location)
+        mock_get_exam_configuration_dashboard_url.side_effect = Exception("proctoring error")
+        xblock_info = create_xblock_info(
+            sequential,
+            include_child_info=True,
+            include_children_predicate=ALWAYS,
+        )
+
+        # no errors should be raised and proctoring_exam_configuration_link is None
+        assert xblock_info["is_proctored_exam"] is True
+        assert xblock_info["was_exam_ever_linked_with_external"] is True
+        assert xblock_info["is_time_limited"] is True
+        assert xblock_info["default_time_limit_minutes"] == 100
+        assert xblock_info["proctoring_exam_configuration_link"] is None
+        assert xblock_info["supports_onboarding"] is True
+        assert xblock_info["is_onboarding_exam"] is False
+
 
 class TestLibraryXBlockInfo(ModuleStoreTestCase):
     """
diff --git a/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py b/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py
index 76dba57f1d67..9244ffa989b6 100644
--- a/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py
+++ b/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py
@@ -10,7 +10,7 @@
 from organizations.models import Organization
 from xmodule.modulestore.django import contentstore, modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, upload_file_to_course
-from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory, ToyCourseFactory
+from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory, ToyCourseFactory, LibraryFactory
 
 from cms.djangoapps.contentstore.utils import reverse_usage_url
 from openedx.core.djangoapps.content_libraries import api as library_api
@@ -165,12 +165,12 @@ def _setup_tagged_content(self, course_key) -> dict:
                 publish_item=True,
             ).location
 
-        library = ClipboardLibraryContentPasteTestCase.setup_library()
+        library = ClipboardPasteFromV1LibraryTestCase.setup_library()
         with self.store.bulk_operations(course_key):
             library_content_block_key = BlockFactory.create(
                 parent=self.store.get_item(unit_key),
                 category="library_content",
-                source_library_id=str(library.key),
+                source_library_id=str(library.context_key),
                 display_name="LC Block",
                 publish_item=True,
             ).location
@@ -184,7 +184,7 @@ def _setup_tagged_content(self, course_key) -> dict:
 
         tagging_api.set_taxonomy_orgs(taxonomy_all_org, all_orgs=True)
         for tag_value in ('tag_1', 'tag_2', 'tag_3', 'tag_4', 'tag_5', 'tag_6', 'tag_7'):
-            Tag.objects.create(taxonomy=taxonomy_all_org, value=tag_value)
+            tagging_api.add_tag_to_taxonomy(taxonomy_all_org, tag_value)
         tagging_api.tag_object(
             object_id=str(unit_key),
             taxonomy=taxonomy_all_org,
@@ -393,9 +393,9 @@ def test_paste_with_assets(self):
         assert source_pic2_hash != dest_pic2_hash  # Because there was a conflict, this file was unchanged.
 
 
-class ClipboardLibraryContentPasteTestCase(ModuleStoreTestCase):
+class ClipboardPasteFromV2LibraryTestCase(ModuleStoreTestCase):
     """
-    Test Clipboard Paste functionality with library content
+    Test Clipboard Paste functionality with a "new" (as of Sumac) library
     """
 
     def setUp(self):
@@ -406,14 +406,185 @@ def setUp(self):
         self.client = APIClient()
         self.client.login(username=self.user.username, password=self.user_password)
         self.store = modulestore()
-        library = self.setup_library()
+
+        self.library = library_api.create_library(
+            org=Organization.objects.create(name="Test Org", short_name="CL-TEST"),
+            slug="lib",
+            title="Library",
+        )
+
+        self.lib_block_key = library_api.create_library_block(self.library.key, "problem", "p1").usage_key  # v==1
+        library_api.set_library_block_olx(self.lib_block_key, """
+        <problem display_name="MCQ-published" max_attempts="1">
+            <multiplechoiceresponse>
+                <label>Q</label>
+                <choicegroup type="MultipleChoice">
+                    <choice correct="false">Wrong</choice>
+                    <choice correct="true">Right</choice>
+                </choicegroup>
+            </multiplechoiceresponse>
+        </problem>
+        """)  # v==2
+        library_api.publish_changes(self.library.key)
+        library_api.set_library_block_olx(self.lib_block_key, """
+        <problem display_name="MCQ-draft" max_attempts="5">
+            <multiplechoiceresponse>
+                <label>Q</label>
+                <choicegroup type="MultipleChoice">
+                    <choice correct="false">Wrong</choice>
+                    <choice correct="true">Right</choice>
+                </choicegroup>
+            </multiplechoiceresponse>
+        </problem>
+        """)  # v==3
+        lib_block_meta = library_api.get_library_block(self.lib_block_key)
+        assert lib_block_meta.published_version_num == 2
+        assert lib_block_meta.draft_version_num == 3
+
+        self.course = CourseFactory.create(display_name='Course')
+
+        taxonomy_all_org = tagging_api.create_taxonomy(
+            "test_taxonomy",
+            "Test Taxonomy",
+            export_id="ALL_ORGS",
+        )
+        tagging_api.set_taxonomy_orgs(taxonomy_all_org, all_orgs=True)
+        for tag_value in ('tag_1', 'tag_2', 'tag_3', 'tag_4', 'tag_5', 'tag_6', 'tag_7'):
+            tagging_api.add_tag_to_taxonomy(taxonomy_all_org, tag_value)
+
+        self.lib_block_tags = ['tag_1', 'tag_5']
+        tagging_api.tag_object(str(self.lib_block_key), taxonomy_all_org, self.lib_block_tags)
+
+    def test_paste_from_library_read_only_tags(self):
+        """
+        When we copy a v2 lib block into a course, the dest block should have read-only copied tags.
+        """
+
+        copy_response = self.client.post(CLIPBOARD_ENDPOINT, {"usage_key": str(self.lib_block_key)}, format="json")
+        assert copy_response.status_code == 200
+
+        paste_response = self.client.post(XBLOCK_ENDPOINT, {
+            "parent_locator": str(self.course.usage_key),
+            "staged_content": "clipboard",
+        }, format="json")
+        assert paste_response.status_code == 200
+
+        new_block_key = paste_response.json()["locator"]
+
+        object_tags = tagging_api.get_object_tags(new_block_key)
+        assert len(object_tags) == len(self.lib_block_tags)
+        for object_tag in object_tags:
+            assert object_tag.value in self.lib_block_tags
+            assert object_tag.is_copied
+
+    def test_paste_from_library_copies_asset(self):
+        """
+        Assets from a library component copied into a subdir of Files & Uploads.
+        """
+        # This is the binary for a real, 1px webp file – we need actual image
+        # data because contentstore will try to make a thumbnail and grab
+        # metadata.
+        webp_raw_data = b'RIFF\x16\x00\x00\x00WEBPVP8L\n\x00\x00\x00/\x00\x00\x00\x00E\xff#\xfa\x1f'
+
+        # First add the asset.
+        library_api.add_library_block_static_asset_file(
+            self.lib_block_key,
+            "static/1px.webp",
+            webp_raw_data,
+        )  # v==4
+
+        # Now add the reference to the asset
+        library_api.set_library_block_olx(self.lib_block_key, """
+        <problem display_name="MCQ-draft" max_attempts="5">
+            <p>Including this totally real image: <img src="/static/1px.webp" /></p>
+            <multiplechoiceresponse>
+                <label>Q</label>
+                <choicegroup type="MultipleChoice">
+                    <choice correct="false">Wrong</choice>
+                    <choice correct="true">Right</choice>
+                </choicegroup>
+            </multiplechoiceresponse>
+        </problem>
+        """)  # v==5
+
+        copy_response = self.client.post(
+            CLIPBOARD_ENDPOINT,
+            {"usage_key": str(self.lib_block_key)},
+            format="json"
+        )
+        assert copy_response.status_code == 200
+
+        paste_response = self.client.post(XBLOCK_ENDPOINT, {
+            "parent_locator": str(self.course.usage_key),
+            "staged_content": "clipboard",
+        }, format="json")
+        assert paste_response.status_code == 200
+
+        new_block_key = UsageKey.from_string(paste_response.json()["locator"])
+        new_block = modulestore().get_item(new_block_key)
+
+        # Check that the substitution worked.
+        expected_import_path = f"components/{new_block_key.block_type}/{new_block_key.block_id}/1px.webp"
+        assert f"/static/{expected_import_path}" in new_block.data
+
+        # Check that the asset was copied over properly
+        image_asset = contentstore().find(
+            self.course.id.make_asset_key("asset", expected_import_path.replace('/', '_'))
+        )
+        assert image_asset.import_path == expected_import_path
+        assert image_asset.name == "1px.webp"
+        assert image_asset.length == len(webp_raw_data)
+
+    def test_paste_from_course_block_imported_from_library_creates_link(self):
+        """
+        When we copy a course xblock which was imported or copied from v2 lib block into a course,
+        the dest block should be linked up to the original lib block.
+        """
+        def _copy_paste_and_assert_link(key_to_copy):
+            copy_response = self.client.post(CLIPBOARD_ENDPOINT, {"usage_key": str(key_to_copy)}, format="json")
+            assert copy_response.status_code == 200
+
+            paste_response = self.client.post(XBLOCK_ENDPOINT, {
+                "parent_locator": str(self.course.usage_key),
+                "staged_content": "clipboard",
+            }, format="json")
+            assert paste_response.status_code == 200
+
+            new_block_key = UsageKey.from_string(paste_response.json()["locator"])
+            new_block = modulestore().get_item(new_block_key)
+            assert new_block.upstream == str(self.lib_block_key)
+            assert new_block.upstream_version == 3
+            assert new_block.upstream_display_name == "MCQ-draft"
+            assert new_block.upstream_max_attempts == 5
+            return new_block_key
+
+        # first verify link for copied block from library
+        new_block_key = _copy_paste_and_assert_link(self.lib_block_key)
+        # next verify link for copied block from the pasted block
+        _copy_paste_and_assert_link(new_block_key)
+
+
+class ClipboardPasteFromV1LibraryTestCase(ModuleStoreTestCase):
+    """
+    Test Clipboard Paste functionality with legacy (v1) library content
+    """
+
+    def setUp(self):
+        """
+        Set up a v1 Content Library and a library content block
+        """
+        super().setUp()
+        self.client = APIClient()
+        self.client.login(username=self.user.username, password=self.user_password)
+        self.store = modulestore()
+        self.library = self.setup_library()
 
         # Create a library content block (lc), point it out our library, and sync it.
         self.course = CourseFactory.create(display_name='Course')
         self.orig_lc_block = BlockFactory.create(
             parent=self.course,
             category="library_content",
-            source_library_id=str(library.key),
+            source_library_id=str(self.library.context_key),
             display_name="LC Block",
             publish_item=False,
         )
@@ -426,18 +597,15 @@ def setUp(self):
     @classmethod
     def setup_library(cls):
         """
-        Creates and returns a content library.
+        Creates and returns a legacy content library with 1 problem
         """
-        library = library_api.create_library(
-            library_type=library_api.COMPLEX,
-            org=Organization.objects.create(name="Test Org", short_name="CL-TEST"),
-            slug="lib",
-            title="Library",
-        )
-        # Populate it with a problem:
-        problem_key = library_api.create_library_block(library.key, "problem", "p1").usage_key
-        library_api.set_library_block_olx(problem_key, """
-        <problem display_name="MCQ" max_attempts="1">
+        library = LibraryFactory.create(display_name='Library')
+        lib_block = BlockFactory.create(
+            parent_location=library.usage_key,
+            category="problem",
+            display_name="MCQ",
+            max_attempts=1,
+            data="""
             <multiplechoiceresponse>
                 <label>Q</label>
                 <choicegroup type="MultipleChoice">
@@ -445,9 +613,9 @@ def setup_library(cls):
                     <choice correct="true">Right</choice>
                 </choicegroup>
             </multiplechoiceresponse>
-        </problem>
-        """)
-        library_api.publish_changes(library.key)
+            """,
+            publish_item=False,
+        )
         return library
 
     def test_paste_library_content_block(self):
diff --git a/cms/djangoapps/contentstore/views/tests/test_container_page.py b/cms/djangoapps/contentstore/views/tests/test_container_page.py
index 1d5b52905357..426477e23408 100644
--- a/cms/djangoapps/contentstore/views/tests/test_container_page.py
+++ b/cms/djangoapps/contentstore/views/tests/test_container_page.py
@@ -242,3 +242,61 @@ def test_container_page_with_valid_and_invalid_usage_key_string(self):
             usage_key_string=str(self.vertical.location)
         )
         self.assertEqual(response.status_code, 200)
+
+
+class ContainerEmbedPageTestCase(ContainerPageTestCase):  # lint-amnesty, pylint: disable=test-inherits-tests
+    """
+    Unit tests for the container embed page.
+    """
+
+    def test_container_html(self):
+        assets_url = reverse(
+            'assets_handler', kwargs={'course_key_string': str(self.child_container.location.course_key)}
+        )
+        self._test_html_content(
+            self.child_container,
+            expected_section_tag=(
+                '<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" '
+                'data-locator="{0}" data-course-key="{0.course_key}" data-course-assets="{1}">'.format(
+                    self.child_container.location, assets_url
+                )
+            ),
+        )
+
+    def test_container_on_container_html(self):
+        """
+        Create the scenario of an xblock with children (non-vertical) on the container page.
+        This should create a container page that is a child of another container page.
+        """
+        draft_container = self._create_block(self.child_container, "wrapper", "Wrapper")
+        self._create_block(draft_container, "html", "Child HTML")
+
+        def test_container_html(xblock):
+            assets_url = reverse(
+                'assets_handler', kwargs={'course_key_string': str(draft_container.location.course_key)}
+            )
+            self._test_html_content(
+                xblock,
+                expected_section_tag=(
+                    '<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" '
+                    'data-locator="{0}" data-course-key="{0.course_key}" data-course-assets="{1}">'.format(
+                        draft_container.location, assets_url
+                    )
+                ),
+            )
+
+        # Test the draft version of the container
+        test_container_html(draft_container)
+
+        # Now publish the unit and validate again
+        self.store.publish(self.vertical.location, self.user.id)
+        draft_container = self.store.get_item(draft_container.location)
+        test_container_html(draft_container)
+
+    def _test_html_content(self, xblock, expected_section_tag):  # lint-amnesty, pylint: disable=arguments-differ
+        """
+        Get the HTML for a container page and verify the section tag is correct
+        and the breadcrumbs trail is correct.
+        """
+        html = self.get_page_html(xblock)
+        self.assertIn(expected_section_tag, html)
diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
index c3dcfe5305b7..a49273928062 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_index.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py
@@ -433,13 +433,13 @@ def check_index_page(self, separate_archived_courses, org):
     @override_settings(FEATURES=FEATURES_WITHOUT_HOME_PAGE_COURSE_V2_API)
     @ddt.data(
         # Staff user has course staff access
-        (True, 'staff', None, 0, 21),
-        (False, 'staff', None, 0, 21),
+        (True, 'staff', None, 0, 23),
+        (False, 'staff', None, 0, 23),
         # Base user has global staff access
-        (True, 'user', ORG, 2, 21),
-        (False, 'user', ORG, 2, 21),
-        (True, 'user', None, 2, 21),
-        (False, 'user', None, 2, 21),
+        (True, 'user', ORG, 2, 23),
+        (False, 'user', ORG, 2, 23),
+        (True, 'user', None, 2, 23),
+        (False, 'user', None, 2, 23),
     )
     @ddt.unpack
     def test_separate_archived_courses(self, separate_archived_courses, username, org, mongo_queries, sql_queries):
@@ -464,13 +464,13 @@ def test_separate_archived_courses(self, separate_archived_courses, username, or
     @override_settings(FEATURES=FEATURES_WITH_HOME_PAGE_COURSE_V2_API)
     @ddt.data(
         # Staff user has course staff access
-        (True, 'staff', None, 0, 21),
-        (False, 'staff', None, 0, 21),
+        (True, 'staff', None, 0, 23),
+        (False, 'staff', None, 0, 23),
         # Base user has global staff access
-        (True, 'user', ORG, 0, 21),
-        (False, 'user', ORG, 0, 21),
-        (True, 'user', None, 0, 21),
-        (False, 'user', None, 0, 21),
+        (True, 'user', ORG, 0, 23),
+        (False, 'user', ORG, 0, 23),
+        (True, 'user', None, 0, 23),
+        (False, 'user', None, 0, 23),
     )
     @ddt.unpack
     def test_separate_archived_courses_with_home_page_course_v2_api(
diff --git a/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py b/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py
index a7ee7f0ab0cd..0f38722e1208 100644
--- a/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py
+++ b/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py
@@ -162,6 +162,39 @@ def test_exam_settings_alert_with_exam_settings_disabled(self, page_handler):
         else:
             assert 'To update these settings go to the Advanced Settings page.' in alert_text
 
+    @override_settings(
+        PROCTORING_BACKENDS={
+            'DEFAULT': 'test_proctoring_provider',
+            'proctortrack': {},
+            'test_proctoring_provider': {},
+        },
+        FEATURES=FEATURES_WITH_EXAM_SETTINGS_ENABLED,
+    )
+    @ddt.data(
+        "advanced_settings_handler",
+        "course_handler",
+    )
+    def test_invalid_provider_alert(self, page_handler):
+        """
+        An alert should appear if the course has a proctoring provider that is not valid.
+        """
+        # create an error by setting an invalid proctoring provider
+        self.course.proctoring_provider = 'invalid_provider'
+        self.course.enable_proctored_exams = True
+        self.save_course()
+
+        url = reverse_course_url(page_handler, self.course.id)
+        resp = self.client.get(url, HTTP_ACCEPT='text/html')
+        alert_text = self._get_exam_settings_alert_text(resp.content)
+        assert (
+            'This course has proctored exam settings that are incomplete or invalid.'
+            in alert_text
+        )
+        assert (
+            'The proctoring provider configured for this course, \'invalid_provider\', is not valid.'
+            in alert_text
+        )
+
     @ddt.data(
         "advanced_settings_handler",
         "course_handler",
diff --git a/cms/djangoapps/contentstore/views/tests/test_library.py b/cms/djangoapps/contentstore/views/tests/test_library.py
index fa6505419725..b6c5765c5108 100644
--- a/cms/djangoapps/contentstore/views/tests/test_library.py
+++ b/cms/djangoapps/contentstore/views/tests/test_library.py
@@ -56,44 +56,44 @@ def setUp(self):
     # Tests for /library/ - list and create libraries:
 
     # When libraries are disabled, nobody can create libraries
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", False)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", False)
     def test_library_creator_status_libraries_not_enabled(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()
         self.assertEqual(user_can_create_library(nostaff_user, None), False)
 
     # When creator group is disabled, non-staff users can create libraries
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_no_course_creator_role(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()
         self.assertEqual(user_can_create_library(nostaff_user, 'An Org'), True)
 
     # When creator group is enabled, Non staff users cannot create libraries
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_for_enabled_creator_group_setting_for_non_staff_users(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()
         with mock.patch.dict('django.conf.settings.FEATURES', {"ENABLE_CREATOR_GROUP": True}):
             self.assertEqual(user_can_create_library(nostaff_user, None), False)
 
     # Global staff can create libraries for any org, even ones that don't exist.
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_is_staff_user(self):
         print(self.user.is_staff)
         self.assertEqual(user_can_create_library(self.user, 'aNyOrg'), True)
 
     # Global staff can create libraries for any org, but an org has to be supplied.
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_is_staff_user_no_org(self):
         print(self.user.is_staff)
         self.assertEqual(user_can_create_library(self.user, None), False)
 
     # When creator groups are enabled, global staff can create libraries in any org
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_for_enabled_creator_group_setting_with_is_staff_user(self):
         with mock.patch.dict('django.conf.settings.FEATURES', {"ENABLE_CREATOR_GROUP": True}):
             self.assertEqual(user_can_create_library(self.user, 'RandomOrg'), True)
 
     # When creator groups are enabled, course creators can create libraries in any org.
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_course_creator_role_for_enabled_creator_group_setting(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()
         with mock.patch.dict('django.conf.settings.FEATURES', {"ENABLE_CREATOR_GROUP": True}):
@@ -102,7 +102,7 @@ def test_library_creator_status_with_course_creator_role_for_enabled_creator_gro
 
     # When creator groups are enabled, course staff members can create libraries
     # but only in the org they are course staff for.
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_course_staff_role_for_enabled_creator_group_setting(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()
         with mock.patch.dict('django.conf.settings.FEATURES', {"ENABLE_CREATOR_GROUP": True}):
@@ -112,7 +112,7 @@ def test_library_creator_status_with_course_staff_role_for_enabled_creator_group
 
     # When creator groups are enabled, course instructor members can create libraries
     # but only in the org they are course staff for.
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_course_instructor_role_for_enabled_creator_group_setting(self):
         _, nostaff_user = self.create_non_staff_authed_user_client()
         with mock.patch.dict('django.conf.settings.FEATURES', {"ENABLE_CREATOR_GROUP": True}):
@@ -134,7 +134,7 @@ def test_library_creator_status_settings(self, disable_course, disable_library,
         Ensure that the setting DISABLE_LIBRARY_CREATION overrides DISABLE_COURSE_CREATION as expected.
         """
         _, nostaff_user = self.create_non_staff_authed_user_client()
-        with mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True):
+        with mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True):
             with mock.patch.dict(
                 "django.conf.settings.FEATURES",
                 {
@@ -145,7 +145,7 @@ def test_library_creator_status_settings(self, disable_course, disable_library,
                 self.assertEqual(user_can_create_library(nostaff_user, 'SomEOrg'), expected_status)
 
     @mock.patch.dict('django.conf.settings.FEATURES', {'DISABLE_COURSE_CREATION': True})
-    @mock.patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", True)
+    @mock.patch("cms.djangoapps.contentstore.toggles.libraries_v1_enabled", True)
     def test_library_creator_status_with_no_course_creator_role_and_disabled_nonstaff_course_creation(self):
         """
         Ensure that `DISABLE_COURSE_CREATION` feature works with libraries as well.
@@ -161,7 +161,7 @@ def test_library_creator_status_with_no_course_creator_role_and_disabled_nonstaf
         self.assertEqual(get_response.status_code, 200)
         self.assertEqual(post_response.status_code, 403)
 
-    @patch("cms.djangoapps.contentstore.views.library.LIBRARIES_ENABLED", False)
+    @mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_CONTENT_LIBRARIES': False})
     def test_with_libraries_disabled(self):
         """
         The library URLs should return 404 if libraries are disabled.
@@ -403,6 +403,8 @@ def test_get_component_templates(self):
         self.assertNotIn('advanced', templates)
         self.assertNotIn('openassessment', templates)
         self.assertNotIn('library', templates)
+        self.assertNotIn('library_v2', templates)
+        self.assertNotIn('itembank', templates)
 
     def test_advanced_problem_types(self):
         """
diff --git a/cms/djangoapps/contentstore/views/transcripts_ajax.py b/cms/djangoapps/contentstore/views/transcripts_ajax.py
index 892b76caae72..8cb7f455013b 100644
--- a/cms/djangoapps/contentstore/views/transcripts_ajax.py
+++ b/cms/djangoapps/contentstore/views/transcripts_ajax.py
@@ -649,6 +649,9 @@ def _get_item(request, data):
     Returns the item.
     """
     usage_key = UsageKey.from_string(data.get('locator'))
+    if not usage_key.context_key.is_course:
+        # TODO: implement transcript support for learning core / content libraries.
+        raise TranscriptsRequestValidationException(_('Transcripts are not yet supported in content libraries.'))
     # This is placed before has_course_author_access() to validate the location,
     # because has_course_author_access() raises  r if location is invalid.
     item = modulestore().get_item(usage_key)
diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
index e7dbec01f8e0..3b9ba5798a01 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
@@ -36,6 +36,7 @@
 from cms.djangoapps.contentstore.toggles import ENABLE_DEFAULT_ADVANCED_PROBLEM_EDITOR_FLAG
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.lib.ai_aside_summary_config import AiAsideSummaryConfig
+from cms.lib.xblock.upstream_sync import BadUpstream, sync_from_upstream
 from common.djangoapps.static_replace import replace_static_urls
 from common.djangoapps.student.auth import (
     has_studio_read_access,
@@ -539,7 +540,8 @@ def _create_block(request):
         # Paste from the user's clipboard (content_staging app clipboard, not browser clipboard) into 'usage_key':
         try:
             created_xblock, notices = import_staged_content_from_user_clipboard(
-                parent_key=usage_key, request=request
+                parent_key=usage_key,
+                request=request,
             )
         except Exception:  # pylint: disable=broad-except
             log.exception(
@@ -556,6 +558,7 @@ def _create_block(request):
             "locator": str(created_xblock.location),
             "courseKey": str(created_xblock.location.course_key),
             "static_file_notices": asdict(notices),
+            "upstreamRef": str(created_xblock.upstream),
         })
 
     category = request.json["category"]
@@ -585,12 +588,28 @@ def _create_block(request):
         boilerplate=request.json.get("boilerplate"),
     )
 
-    return JsonResponse(
-        {
-            "locator": str(created_block.location),
-            "courseKey": str(created_block.location.course_key),
-        }
-    )
+    response = {
+        "locator": str(created_block.location),
+        "courseKey": str(created_block.location.course_key),
+    }
+    # If it contains library_content_key, the block is being imported from a v2 library
+    # so it needs to be synced with upstream block.
+    if upstream_ref := request.json.get("library_content_key"):
+        try:
+            # Set `created_block.upstream` and then sync this with the upstream (library) version.
+            created_block.upstream = upstream_ref
+            sync_from_upstream(downstream=created_block, user=request.user)
+        except BadUpstream as exc:
+            _delete_item(created_block.location, request.user)
+            log.exception(
+                f"Could not sync to new block at '{created_block.usage_key}' "
+                f"using provided library_content_key='{upstream_ref}'"
+            )
+            return JsonResponse({"error": str(exc)}, status=400)
+        modulestore().update_item(created_block, request.user.id)
+        response['upstreamRef'] = upstream_ref
+
+    return JsonResponse(response)
 
 
 def _get_source_index(source_usage_key, source_parent):
@@ -1159,12 +1178,19 @@ def create_xblock_info(  # lint-amnesty, pylint: disable=too-many-statements
                     supports_onboarding = False
 
                 proctoring_exam_configuration_link = None
-                if xblock.is_proctored_exam:
-                    proctoring_exam_configuration_link = (
-                        get_exam_configuration_dashboard_url(
-                            course.id, xblock_info["id"]
+
+                # only call get_exam_configuration_dashboard_url if not using an LTI proctoring provider
+                if xblock.is_proctored_exam and (course.proctoring_provider != 'lti_external'):
+                    try:
+                        proctoring_exam_configuration_link = (
+                            get_exam_configuration_dashboard_url(
+                                course.id, xblock_info["id"]
+                            )
+                        )
+                    except Exception as e:  # pylint: disable=broad-except
+                        log.error(
+                            f"Error while getting proctoring exam configuration link: {e}"
                         )
-                    )
 
                 if course.proctoring_provider == "proctortrack":
                     show_review_rules = SHOW_REVIEW_RULES_FLAG.is_enabled(
diff --git a/cms/djangoapps/maintenance/tests.py b/cms/djangoapps/maintenance/tests.py
deleted file mode 100644
index a487f8e37faa..000000000000
--- a/cms/djangoapps/maintenance/tests.py
+++ /dev/null
@@ -1,311 +0,0 @@
-"""
-Tests for the maintenance app views.
-"""
-
-
-import json
-
-import ddt
-from django.conf import settings
-from django.urls import reverse
-
-from cms.djangoapps.contentstore.management.commands.utils import get_course_versions
-from common.djangoapps.student.tests.factories import AdminFactory, UserFactory
-from openedx.features.announcements.models import Announcement
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory  # lint-amnesty, pylint: disable=wrong-import-order
-
-from .views import COURSE_KEY_ERROR_MESSAGES, MAINTENANCE_VIEWS
-
-# This list contains URLs of all maintenance app views.
-MAINTENANCE_URLS = [reverse(view['url']) for view in MAINTENANCE_VIEWS.values()]
-
-
-class TestMaintenanceIndex(ModuleStoreTestCase):
-    """
-    Tests for maintenance index view.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.user = AdminFactory()
-        login_success = self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
-        self.assertTrue(login_success)
-        self.view_url = reverse('maintenance:maintenance_index')
-
-    def test_maintenance_index(self):
-        """
-        Test that maintenance index view lists all the maintenance app views.
-        """
-        response = self.client.get(self.view_url)
-        self.assertContains(response, 'Maintenance', status_code=200)
-
-        # Check that all the expected links appear on the index page.
-        for url in MAINTENANCE_URLS:
-            self.assertContains(response, url, status_code=200)
-
-
-@ddt.ddt
-class MaintenanceViewTestCase(ModuleStoreTestCase):
-    """
-    Base class for maintenance view tests.
-    """
-    view_url = ''
-
-    def setUp(self):
-        super().setUp()
-        self.user = AdminFactory()
-        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):
-        """
-        Verify the response contains error message.
-        """
-        response = self.client.post(self.view_url, data=data, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-        self.assertContains(response, error_message, status_code=200)
-
-    def tearDown(self):
-        """
-        Reverse the setup.
-        """
-        self.client.logout()
-        super().tearDown()
-
-
-@ddt.ddt
-class MaintenanceViewAccessTests(MaintenanceViewTestCase):
-    """
-    Tests for access control of maintenance views.
-    """
-    @ddt.data(*MAINTENANCE_URLS)
-    def test_require_login(self, url):
-        """
-        Test that maintenance app requires user login.
-        """
-        # Log out then try to retrieve the page
-        self.client.logout()
-        response = self.client.get(url)
-
-        # Expect a redirect to the login page
-        redirect_url = '{login_url}?next={original_url}'.format(
-            login_url=settings.LOGIN_URL,
-            original_url=url,
-        )
-
-        # Studio login redirects to LMS login
-        self.assertRedirects(response, redirect_url, target_status_code=302)
-
-    @ddt.data(*MAINTENANCE_URLS)
-    def test_global_staff_access(self, url):
-        """
-        Test that all maintenance app views are accessible to global staff user.
-        """
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    @ddt.data(*MAINTENANCE_URLS)
-    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=self.TEST_PASSWORD)
-        login_success = self.client.login(username=user.username, password=self.TEST_PASSWORD)
-        self.assertTrue(login_success)
-
-        response = self.client.get(url)
-        self.assertContains(
-            response,
-            f'Must be {settings.PLATFORM_NAME} staff to perform this action.',
-            status_code=403
-        )
-
-
-@ddt.ddt
-class TestForcePublish(MaintenanceViewTestCase):
-    """
-    Tests for the force publish view.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.view_url = reverse('maintenance:force_publish_course')
-
-    def setup_test_course(self):
-        """
-        Creates the course and add some changes to it.
-
-        Returns:
-            course: a course object
-        """
-        course = CourseFactory.create()
-        # Add some changes to course
-        chapter = BlockFactory.create(category='chapter', parent_location=course.location)
-        self.store.create_child(
-            self.user.id,
-            chapter.location,
-            'html',
-            block_id='html_component'
-        )
-        # verify that course has changes.
-        self.assertTrue(self.store.has_changes(self.store.get_item(course.location)))
-        return course
-
-    @ddt.data(
-        ('', COURSE_KEY_ERROR_MESSAGES['empty_course_key']),
-        ('edx', COURSE_KEY_ERROR_MESSAGES['invalid_course_key']),
-        ('course-v1:e+d+X', COURSE_KEY_ERROR_MESSAGES['course_key_not_found']),
-    )
-    @ddt.unpack
-    def test_invalid_course_key_messages(self, course_key, error_message):
-        """
-        Test all error messages for invalid course keys.
-        """
-        # validate that course key contains error message
-        self.verify_error_message(
-            data={'course-id': course_key},
-            error_message=error_message
-        )
-
-    def test_already_published(self):
-        """
-        Test that when a course is forcefully publish, we get a 'course is already published' message.
-        """
-        course = self.setup_test_course()
-
-        # publish the course
-        source_store = modulestore()._get_modulestore_for_courselike(course.id)  # pylint: disable=protected-access
-        source_store.force_publish_course(course.id, self.user.id, commit=True)
-
-        # now course is published, we should get `already published course` error.
-        self.verify_error_message(
-            data={'course-id': str(course.id)},
-            error_message='Course is already in published state.'
-        )
-
-    def verify_versions_are_different(self, course):
-        """
-        Verify draft and published versions point to different locations.
-
-        Arguments:
-            course (object): a course object.
-        """
-        # get draft and publish branch versions
-        versions = get_course_versions(str(course.id))
-
-        # verify that draft and publish point to different versions
-        self.assertNotEqual(versions['draft-branch'], versions['published-branch'])
-
-    def get_force_publish_course_response(self, course):
-        """
-        Get force publish the course response.
-
-        Arguments:
-            course (object): a course object.
-
-        Returns:
-            response : response from force publish post view.
-        """
-        # Verify versions point to different locations initially
-        self.verify_versions_are_different(course)
-
-        # force publish course view
-        data = {
-            'course-id': str(course.id)
-        }
-        response = self.client.post(self.view_url, data=data, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-        response_data = json.loads(response.content.decode('utf-8'))
-        return response_data
-
-    def test_force_publish_dry_run(self):
-        """
-        Test that dry run does not publishes the course but shows possible outcome if force published is executed.
-        """
-        course = self.setup_test_course()
-        response = self.get_force_publish_course_response(course)
-
-        self.assertIn('current_versions', response)
-
-        # verify that course still has changes as we just dry ran force publish course.
-        self.assertTrue(self.store.has_changes(self.store.get_item(course.location)))
-
-        # verify that both branch versions are still different
-        self.verify_versions_are_different(course)
-
-
-@ddt.ddt
-class TestAnnouncementsViews(MaintenanceViewTestCase):
-    """
-    Tests for the announcements edit view.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.admin = AdminFactory.create(
-            email='staff@edx.org',
-            username='admin',
-            password=self.TEST_PASSWORD
-        )
-        self.client.login(username=self.admin.username, password=self.TEST_PASSWORD)
-        self.non_staff_user = UserFactory.create(
-            email='test@edx.org',
-            username='test',
-            password=self.TEST_PASSWORD
-        )
-
-    def test_index(self):
-        """
-        Test create announcement view
-        """
-        url = reverse("maintenance:announcement_index")
-        response = self.client.get(url)
-        self.assertContains(response, '<div class="announcement-container">')
-
-    def test_create(self):
-        """
-        Test create announcement view
-        """
-        url = reverse("maintenance:announcement_create")
-        self.client.post(url, {"content": "Test Create Announcement", "active": True})
-        result = Announcement.objects.filter(content="Test Create Announcement").exists()
-        self.assertTrue(result)
-
-    def test_edit(self):
-        """
-        Test edit announcement view
-        """
-        announcement = Announcement.objects.create(content="test")
-        announcement.save()
-        url = reverse("maintenance:announcement_edit", kwargs={"pk": announcement.pk})
-        response = self.client.get(url)
-        self.assertContains(response, '<div class="wrapper-form announcement-container">')
-        self.client.post(url, {"content": "Test Edit Announcement", "active": True})
-        announcement = Announcement.objects.get(pk=announcement.pk)
-        self.assertEqual(announcement.content, "Test Edit Announcement")
-
-    def test_delete(self):
-        """
-        Test delete announcement view
-        """
-        announcement = Announcement.objects.create(content="Test Delete")
-        announcement.save()
-        url = reverse("maintenance:announcement_delete", kwargs={"pk": announcement.pk})
-        self.client.post(url)
-        result = Announcement.objects.filter(content="Test Edit Announcement").exists()
-        self.assertFalse(result)
-
-    def _test_403(self, viewname, kwargs=None):
-        url = reverse("maintenance:%s" % viewname, kwargs=kwargs)
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 403)
-
-    def test_authorization(self):
-        self.client.login(username=self.non_staff_user, password=self.TEST_PASSWORD)
-        announcement = Announcement.objects.create(content="Test Delete")
-        announcement.save()
-
-        self._test_403("announcement_index")
-        self._test_403("announcement_create")
-        self._test_403("announcement_edit", {"pk": announcement.pk})
-        self._test_403("announcement_delete", {"pk": announcement.pk})
diff --git a/cms/djangoapps/maintenance/urls.py b/cms/djangoapps/maintenance/urls.py
deleted file mode 100644
index 42febd139512..000000000000
--- a/cms/djangoapps/maintenance/urls.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-URLs for the maintenance app.
-"""
-
-from django.urls import path, re_path
-
-from .views import (
-    AnnouncementCreateView,
-    AnnouncementDeleteView,
-    AnnouncementEditView,
-    AnnouncementIndexView,
-    ForcePublishCourseView,
-    MaintenanceIndexView
-)
-
-app_name = 'cms.djangoapps.maintenance'
-
-urlpatterns = [
-    path('', MaintenanceIndexView.as_view(), name='maintenance_index'),
-    re_path(r'^force_publish_course/?$', ForcePublishCourseView.as_view(), name='force_publish_course'),
-    re_path(r'^announcements/(?P<page>\d+)?$', AnnouncementIndexView.as_view(), name='announcement_index'),
-    path('announcements/create', AnnouncementCreateView.as_view(), name='announcement_create'),
-    re_path(r'^announcements/edit/(?P<pk>\d+)?$', AnnouncementEditView.as_view(), name='announcement_edit'),
-    path('announcements/delete/<int:pk>', AnnouncementDeleteView.as_view(), name='announcement_delete'),
-]
diff --git a/cms/djangoapps/maintenance/views.py b/cms/djangoapps/maintenance/views.py
deleted file mode 100644
index 357f64e90ebd..000000000000
--- a/cms/djangoapps/maintenance/views.py
+++ /dev/null
@@ -1,301 +0,0 @@
-"""
-Views for the maintenance app.
-"""
-
-
-import logging
-
-from django.core.validators import ValidationError
-from django.db import transaction
-from django.urls import reverse, reverse_lazy
-from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
-from django.views.generic import View
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
-from django.views.generic.list import ListView
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import CourseKey
-
-from cms.djangoapps.contentstore.management.commands.utils import get_course_versions
-from common.djangoapps.edxmako.shortcuts import render_to_response
-from common.djangoapps.util.json_request import JsonResponse
-from common.djangoapps.util.views import require_global_staff
-from openedx.features.announcements.forms import AnnouncementForm
-from openedx.features.announcements.models import Announcement
-from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.exceptions import ItemNotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
-
-log = logging.getLogger(__name__)
-
-# This dict maintains all the views that will be used Maintenance app.
-MAINTENANCE_VIEWS = {
-    'force_publish_course': {
-        'url': 'maintenance:force_publish_course',
-        'name': _('Force Publish Course'),
-        'slug': 'force_publish_course',
-        'description': _(
-            'Sometimes the draft and published branches of a course can get out of sync. Force publish course command '
-            'resets the published branch of a course to point to the draft branch, effectively force publishing the '
-            'course. This view dry runs the force publish command'
-        ),
-    },
-    'announcement_index': {
-        'url': 'maintenance:announcement_index',
-        'name': _('Edit Announcements'),
-        'slug': 'announcement_index',
-        'description': _(
-            'This view shows the announcement editor to create or alter announcements that are shown on the right'
-            'side of the dashboard.'
-        ),
-    },
-}
-
-
-COURSE_KEY_ERROR_MESSAGES = {
-    'empty_course_key': _('Please provide course id.'),
-    'invalid_course_key': _('Invalid course key.'),
-    'course_key_not_found': _('No matching course found.')
-}
-
-
-class MaintenanceIndexView(View):
-    """
-    Index view for maintenance dashboard, used by global staff.
-
-    This view lists some commands/tasks that can be used to dry run or execute directly.
-    """
-
-    @method_decorator(require_global_staff)
-    def get(self, request):
-        """Render the maintenance index view. """
-        return render_to_response('maintenance/index.html', {
-            'views': MAINTENANCE_VIEWS,
-        })
-
-
-class MaintenanceBaseView(View):
-    """
-    Base class for Maintenance views.
-    """
-
-    template = 'maintenance/container.html'
-
-    def __init__(self, view=None):
-        super().__init__()
-        self.context = {
-            'view': view if view else '',
-            'form_data': {},
-            'error': False,
-            'msg': ''
-        }
-
-    def render_response(self):
-        """
-        A short method to render_to_response that renders response.
-        """
-        if self.request.headers.get('x-requested-with') == 'XMLHttpRequest':
-            return JsonResponse(self.context)
-        return render_to_response(self.template, self.context)
-
-    @method_decorator(require_global_staff)
-    def get(self, request):
-        """
-        Render get view.
-        """
-        return self.render_response()
-
-    def validate_course_key(self, course_key, branch=ModuleStoreEnum.BranchName.draft):
-        """
-        Validates the course_key that would be used by maintenance app views.
-
-        Arguments:
-            course_key (string): a course key
-            branch: a course locator branch, default value is ModuleStoreEnum.BranchName.draft .
-                    values can be either ModuleStoreEnum.BranchName.draft or ModuleStoreEnum.BranchName.published.
-
-        Returns:
-            course_usage_key (CourseLocator): course usage locator
-        """
-        if not course_key:
-            raise ValidationError(COURSE_KEY_ERROR_MESSAGES['empty_course_key'])
-
-        course_usage_key = CourseKey.from_string(course_key)
-
-        if not modulestore().has_course(course_usage_key):
-            raise ItemNotFoundError(COURSE_KEY_ERROR_MESSAGES['course_key_not_found'])
-
-        # get branch specific locator
-        course_usage_key = course_usage_key.for_branch(branch)
-
-        return course_usage_key
-
-
-class ForcePublishCourseView(MaintenanceBaseView):
-    """
-    View for force publishing state of the course, used by the global staff.
-
-    This view uses `force_publish_course` method of modulestore which publishes the draft state of the course. After
-    the course has been forced published, both draft and publish draft point to same location.
-    """
-
-    def __init__(self):
-        super().__init__(MAINTENANCE_VIEWS['force_publish_course'])
-        self.context.update({
-            'current_versions': [],
-            'updated_versions': [],
-            'form_data': {
-                'course_id': '',
-                'is_dry_run': True
-            }
-        })
-
-    def get_course_branch_versions(self, versions):
-        """
-        Returns a dict containing unicoded values of draft and published draft versions.
-        """
-        return {
-            'draft-branch': str(versions['draft-branch']),
-            'published-branch': str(versions['published-branch'])
-        }
-
-    @transaction.atomic
-    @method_decorator(require_global_staff)
-    def post(self, request):
-        """
-        This method force publishes a course if dry-run argument is not selected. If dry-run is selected, this view
-        shows possible outcome if the `force_publish_course` modulestore method is executed.
-
-        Arguments:
-            course_id (string): a request parameter containing course id
-            is_dry_run (string): a request parameter containing dry run value.
-                                 It is obtained from checkbox so it has either values 'on' or ''.
-        """
-        course_id = request.POST.get('course-id')
-
-        self.context.update({
-            'form_data': {
-                'course_id': course_id
-            }
-        })
-
-        try:
-            course_usage_key = self.validate_course_key(course_id)
-        except InvalidKeyError:
-            self.context['error'] = True
-            self.context['msg'] = COURSE_KEY_ERROR_MESSAGES['invalid_course_key']
-        except ItemNotFoundError as exc:
-            self.context['error'] = True
-            self.context['msg'] = str(exc)
-        except ValidationError as exc:
-            self.context['error'] = True
-            self.context['msg'] = str(exc)
-
-        if self.context['error']:
-            return self.render_response()
-
-        source_store = modulestore()._get_modulestore_for_courselike(course_usage_key)  # pylint: disable=protected-access
-        if not hasattr(source_store, 'force_publish_course'):
-            self.context['msg'] = _('Force publishing course is not supported with old mongo courses.')
-            log.warning(
-                'Force publishing course is not supported with old mongo courses. \
-                %s attempted to force publish the course %s.',
-                request.user,
-                course_id,
-                exc_info=True
-            )
-            return self.render_response()
-
-        current_versions = self.get_course_branch_versions(get_course_versions(course_id))
-
-        # if publish and draft are NOT different
-        if current_versions['published-branch'] == current_versions['draft-branch']:
-            self.context['msg'] = _('Course is already in published state.')
-            log.warning(
-                'Course is already in published state. %s attempted to force publish the course %s.',
-                request.user,
-                course_id,
-                exc_info=True
-            )
-            return self.render_response()
-
-        self.context['current_versions'] = current_versions
-        log.info(
-            '%s dry ran force publish the course %s.',
-            request.user,
-            course_id,
-            exc_info=True
-        )
-        return self.render_response()
-
-
-class AnnouncementBaseView(View):
-    """
-    Base view for Announcements pages
-    """
-
-    @method_decorator(require_global_staff)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
-
-class AnnouncementIndexView(ListView, MaintenanceBaseView):
-    """
-    View for viewing the announcements shown on the dashboard, used by the global staff.
-    """
-    model = Announcement
-    object_list = Announcement.objects.order_by('-active')
-    context_object_name = 'announcement_list'
-    paginate_by = 8
-
-    def __init__(self):
-        super().__init__(MAINTENANCE_VIEWS['announcement_index'])
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['view'] = MAINTENANCE_VIEWS['announcement_index']
-        return context
-
-    @method_decorator(require_global_staff)
-    def get(self, request, *args, **kwargs):
-        context = self.get_context_data()
-        return render_to_response(self.template, context)
-
-
-class AnnouncementEditView(UpdateView, AnnouncementBaseView):
-    """
-    View for editing an announcement.
-    """
-    model = Announcement
-    form_class = AnnouncementForm
-    success_url = reverse_lazy('maintenance:announcement_index')
-    template_name = '/maintenance/_announcement_edit.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['action_url'] = reverse('maintenance:announcement_edit', kwargs={'pk': context['announcement'].pk})
-        return context
-
-
-class AnnouncementCreateView(CreateView, AnnouncementBaseView):
-    """
-    View for creating an announcement.
-    """
-    model = Announcement
-    form_class = AnnouncementForm
-    success_url = reverse_lazy('maintenance:announcement_index')
-    template_name = '/maintenance/_announcement_edit.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['action_url'] = reverse('maintenance:announcement_create')
-        return context
-
-
-class AnnouncementDeleteView(DeleteView, AnnouncementBaseView):
-    """
-    View for deleting an announcement.
-    """
-    model = Announcement
-    success_url = reverse_lazy('maintenance:announcement_index')
-    template_name = '/maintenance/_announcement_delete.html'
diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index fd5219dfb472..5d4ac5a4a336 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -217,7 +217,10 @@ def update_from_json(cls, block, jsondict, user, filter_tabs=True):
             try:
                 val = model['value']
                 if hasattr(block, key) and getattr(block, key) != val:
-                    key_values[key] = block.fields[key].from_json(val)
+                    if key == 'proctoring_provider':
+                        key_values[key] = block.fields[key].from_json(val, validate_providers=True)
+                    else:
+                        key_values[key] = block.fields[key].from_json(val)
             except (TypeError, ValueError) as err:
                 raise ValueError(_("Incorrect format for field '{name}'. {detailed_message}").format(  # lint-amnesty, pylint: disable=raise-missing-from
                     name=model['display_name'], detailed_message=str(err)))
@@ -253,7 +256,10 @@ def validate_and_update_from_json(cls, block, jsondict, user, filter_tabs=True):
             try:
                 val = model['value']
                 if hasattr(block, key) and getattr(block, key) != val:
-                    key_values[key] = block.fields[key].from_json(val)
+                    if key == 'proctoring_provider':
+                        key_values[key] = block.fields[key].from_json(val, validate_providers=True)
+                    else:
+                        key_values[key] = block.fields[key].from_json(val)
             except (TypeError, ValueError, ValidationError) as err:
                 did_validate = False
                 errors.append({'key': key, 'message': str(err), 'model': model})
@@ -484,6 +490,24 @@ def validate_proctoring_settings(cls, block, settings_dict, user):
             enable_proctoring = block.enable_proctored_exams
 
         if enable_proctoring:
+
+            if proctoring_provider_model:
+                proctoring_provider = proctoring_provider_model.get('value')
+            else:
+                proctoring_provider = block.proctoring_provider
+
+            # If the proctoring provider stored in the course block no longer
+            # matches the available providers for this instance, show an error
+            if proctoring_provider not in available_providers:
+                message = (
+                    f'The proctoring provider configured for this course, \'{proctoring_provider}\', is not valid.'
+                )
+                errors.append({
+                    'key': 'proctoring_provider',
+                    'message': message,
+                    'model': proctoring_provider_model
+                })
+
             # Require a valid escalation email if Proctortrack is chosen as the proctoring provider
             escalation_email_model = settings_dict.get('proctoring_escalation_email')
             if escalation_email_model:
@@ -491,11 +515,6 @@ def validate_proctoring_settings(cls, block, settings_dict, user):
             else:
                 escalation_email = block.proctoring_escalation_email
 
-            if proctoring_provider_model:
-                proctoring_provider = proctoring_provider_model.get('value')
-            else:
-                proctoring_provider = block.proctoring_provider
-
             missing_escalation_email_msg = 'Provider \'{provider}\' requires an exam escalation contact.'
             if proctoring_provider_model and proctoring_provider == 'proctortrack':
                 if not escalation_email:
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 34dd8503f35e..591247388a9d 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -122,11 +122,22 @@
     # Password Validator Settings
     AUTH_PASSWORD_VALIDATORS
 )
+from lms.envs.common import (
+    USE_EXTRACTED_WORD_CLOUD_BLOCK,
+    USE_EXTRACTED_ANNOTATABLE_BLOCK,
+    USE_EXTRACTED_POLL_QUESTION_BLOCK,
+    USE_EXTRACTED_LTI_BLOCK,
+    USE_EXTRACTED_HTML_BLOCK,
+    USE_EXTRACTED_DISCUSSION_BLOCK,
+    USE_EXTRACTED_PROBLEM_BLOCK,
+    USE_EXTRACTED_VIDEO_BLOCK,
+)
 from path import Path as path
 from django.urls import reverse_lazy
 
 from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin
 from cms.lib.xblock.authoring_mixin import AuthoringMixin
+from cms.lib.xblock.upstream_sync import UpstreamSyncMixin
 from xmodule.modulestore.edit_info import EditInfoMixin
 from openedx.core.djangoapps.theming.helpers_dirs import (
     get_themes_unchecked,
@@ -434,18 +445,6 @@
     # .. toggle_tickets: https://openedx.atlassian.net/browse/DEPR-58
     'DEPRECATE_OLD_COURSE_KEYS_IN_STUDIO': True,
 
-    # .. toggle_name: FEATURES['ENABLE_LIBRARY_AUTHORING_MICROFRONTEND']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Set to True to enable the Library Authoring MFE
-    # .. toggle_use_cases: temporary
-    # .. toggle_creation_date: 2020-06-20
-    # .. toggle_target_removal_date: 2020-12-31
-    # .. toggle_tickets: https://openedx.atlassian.net/wiki/spaces/OEPM/pages/4106944527/Libraries+Relaunch+Proposal+For+Product+Review
-    # .. toggle_warning: Also set settings.LIBRARY_AUTHORING_MICROFRONTEND_URL and see
-    #   REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND for rollout.
-    'ENABLE_LIBRARY_AUTHORING_MICROFRONTEND': False,
-
     # .. toggle_name: FEATURES['DISABLE_COURSE_CREATION']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False
@@ -468,17 +467,6 @@
     # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/26106
     'ENABLE_HELP_LINK': True,
 
-    # .. toggle_name: FEATURES['ENABLE_V2_CERT_DISPLAY_SETTINGS']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Whether to use the reimagined certificates_display_behavior and certificate_available_date
-    # .. settings. Will eventually become the default.
-    # .. toggle_use_cases: temporary
-    # .. toggle_creation_date: 2021-07-26
-    # .. toggle_target_removal_date: 2021-10-01
-    # .. toggle_tickets: 'https://openedx.atlassian.net/browse/MICROBA-1405'
-    'ENABLE_V2_CERT_DISPLAY_SETTINGS': False,
-
     # .. toggle_name: FEATURES['ENABLE_INTEGRITY_SIGNATURE']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False
@@ -578,9 +566,6 @@
     # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/33911
     'ENABLE_GRADING_METHOD_IN_PROBLEMS': False,
 
-    # See annotations in lms/envs/common.py for details.
-    'ENABLE_BLAKE2B_HASHING': False,
-
     # .. toggle_name: FEATURES['BADGES_ENABLED']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False
@@ -588,6 +573,14 @@
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2024-04-10
     'BADGES_ENABLED': False,
+
+    # .. toggle_name: FEATURES['IN_CONTEXT_DISCUSSION_ENABLED_DEFAULT']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: True
+    # .. toggle_description: Set to False to disable in-context discussion for units by default.
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2024-09-02
+    'IN_CONTEXT_DISCUSSION_ENABLED_DEFAULT': True,
 }
 
 # .. toggle_name: ENABLE_COPPA_COMPLIANCE
@@ -612,7 +605,6 @@
 COURSE_AUTHORING_MICROFRONTEND_URL = None
 DISCUSSIONS_MICROFRONTEND_URL = None
 DISCUSSIONS_MFE_FEEDBACK_URL = None
-LIBRARY_AUTHORING_MICROFRONTEND_URL = None
 # .. toggle_name: ENABLE_AUTHN_RESET_PASSWORD_HIBP_POLICY
 # .. toggle_implementation: DjangoSetting
 # .. toggle_default: False
@@ -687,6 +679,7 @@
 LMS_ROOT = REPO_ROOT / "lms"
 ENV_ROOT = REPO_ROOT.dirname()  # virtualenv dir /edx-platform is in
 COURSES_ROOT = ENV_ROOT / "data"
+XMODULE_ROOT = REPO_ROOT / "xmodule"
 
 GITHUB_REPO_ROOT = ENV_ROOT / "data"
 
@@ -1019,6 +1012,7 @@
     XModuleMixin,
     EditInfoMixin,
     AuthoringMixin,
+    UpstreamSyncMixin,
 )
 
 # .. setting_name: XBLOCK_EXTRA_MIXINS
@@ -1292,6 +1286,10 @@
 STATICFILES_DIRS = [
     COMMON_ROOT / "static",
     PROJECT_ROOT / "static",
+    # Temporarily adding the following static path as we are migrating the built-in blocks' Sass to vanilla CSS.
+    # Once all of the built-in blocks are extracted from edx-platform, we can remove this static path.
+    # Relevant ticket: https://github.com/openedx/edx-platform/issues/35300
+    XMODULE_ROOT / "static",
 ]
 
 # Locale/Internationalization
@@ -1429,6 +1427,12 @@
         ],
         'output_filename': 'css/cms-style-xmodule-annotations.css',
     },
+    'course-unit-mfe-iframe-bundle': {
+        'source_filenames': [
+            'css/course-unit-mfe-iframe-bundle.css',
+        ],
+        'output_filename': 'css/course-unit-mfe-iframe-bundle.css',
+    },
 }
 
 base_vendor_js = [
@@ -1664,6 +1668,9 @@
     'corsheaders',
     'openedx.core.djangoapps.cors_csrf',
 
+    # Provides the 'django_markup' template library so we can use 'interpolate_html' in django templates
+    'xss_utils',
+
     # History tables
     'simple_history',
 
@@ -1695,8 +1702,6 @@
     # New (Learning-Core-based) XBlock runtime
     'openedx.core.djangoapps.xblock.apps.StudioXBlockAppConfig',
 
-    # Maintenance tools
-    'cms.djangoapps.maintenance',
     'openedx.core.djangoapps.util.apps.UtilConfig',
 
     # Tracking
@@ -2734,7 +2739,7 @@
 PASSWORD_RESET_EMAIL_RATE = '2/h'
 
 ######################## Setting for content libraries ########################
-MAX_BLOCKS_PER_CONTENT_LIBRARY = 1000
+MAX_BLOCKS_PER_CONTENT_LIBRARY = 100_000
 
 ################# Student Verification #################
 VERIFY_STUDENT = {
@@ -2790,6 +2795,7 @@
 CUSTOM_PAGES_HELP_URL = "https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/latest/course_assets/pages.html#adding-custom-pages"
 COURSE_LIVE_HELP_URL = "https://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/course_assets/course_live.html"
 ORA_SETTINGS_HELP_URL = "https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/latest/course_assets/pages.html#configuring-course-level-open-response-assessment-settings"
+# pylint: enable=line-too-long
 
 # keys for  big blue button live provider
 COURSE_LIVE_GLOBAL_CREDENTIALS = {}
@@ -2813,8 +2819,15 @@
 
 BRAZE_COURSE_ENROLLMENT_CANVAS_ID = ''
 
+######################## Discussion Forum settings ########################
+
+# Feedback link in upgraded discussion notification alert
 DISCUSSIONS_INCONTEXT_FEEDBACK_URL = ''
-DISCUSSIONS_INCONTEXT_LEARNMORE_URL = ''
+
+# Learn More link in upgraded discussion notification alert
+# pylint: disable=line-too-long
+DISCUSSIONS_INCONTEXT_LEARNMORE_URL = "https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/latest/manage_discussions/discussions.html"
+# pylint: enable=line-too-long
 
 #### django-simple-history##
 # disable indexing on date field its coming django-simple-history.
@@ -2936,3 +2949,10 @@ def _should_send_learning_badge_events(settings):
 # See https://www.meilisearch.com/docs/learn/security/tenant_tokens
 MEILISEARCH_INDEX_PREFIX = ""
 MEILISEARCH_API_KEY = "devkey"
+
+# .. setting_name: DISABLED_COUNTRIES
+# .. setting_default: []
+# .. setting_description: List of country codes that should be disabled
+# .. for now it wil impact country listing in auth flow and user profile.
+# .. eg ['US', 'CA']
+DISABLED_COUNTRIES = []
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index e944d67eda1b..1200a61b0617 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -174,9 +174,6 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 ################### FRONTEND APPLICATION PUBLISHER URL ###################
 FEATURES['FRONTEND_APP_PUBLISHER_URL'] = 'http://localhost:18400'
 
-################### FRONTEND APPLICATION LIBRARY AUTHORING ###################
-LIBRARY_AUTHORING_MICROFRONTEND_URL = 'http://localhost:3001'
-
 ################### FRONTEND APPLICATION COURSE AUTHORING ###################
 COURSE_AUTHORING_MICROFRONTEND_URL = 'http://localhost:2001'
 
@@ -267,7 +264,8 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 ################ Using LMS SSO for login to Studio ################
 SOCIAL_AUTH_EDX_OAUTH2_KEY = 'studio-sso-key'
 SOCIAL_AUTH_EDX_OAUTH2_SECRET = 'studio-sso-secret'  # in stage, prod would be high-entropy secret
-SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT = 'http://edx.devstack.lms:18000'  # routed internally server-to-server
+# routed internally server-to-server
+SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT = ENV_TOKENS.get('SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT', 'http://edx.devstack.lms:18000')
 SOCIAL_AUTH_EDX_OAUTH2_PUBLIC_URL_ROOT = 'http://localhost:18000'  # used in browser redirect
 
 # Don't form the return redirect URL with HTTPS on devstack
diff --git a/cms/envs/production.py b/cms/envs/production.py
index 50519b55229b..ad7667772f9a 100644
--- a/cms/envs/production.py
+++ b/cms/envs/production.py
@@ -689,3 +689,10 @@ def get_env_setting(setting):
 }
 
 BEAMER_PRODUCT_ID = ENV_TOKENS.get('BEAMER_PRODUCT_ID', BEAMER_PRODUCT_ID)
+
+# .. setting_name: DISABLED_COUNTRIES
+# .. setting_default: []
+# .. setting_description: List of country codes that should be disabled
+# .. for now it wil impact country listing in auth flow and user profile.
+# .. eg ['US', 'CA']
+DISABLED_COUNTRIES = ENV_TOKENS.get('DISABLED_COUNTRIES', [])
diff --git a/cms/envs/test.py b/cms/envs/test.py
index 38b7c7817149..49db50608858 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -333,3 +333,13 @@
     "SECRET": "***",
     "URL": "***",
 }
+
+############## openedx-learning (Learning Core) config ##############
+OPENEDX_LEARNING = {
+    'MEDIA': {
+        'BACKEND': 'django.core.files.storage.InMemoryStorage',
+        'OPTIONS': {
+            'location': MEDIA_ROOT + "_private"
+        }
+    }
+}
diff --git a/cms/lib/xblock/test/test_upstream_sync.py b/cms/lib/xblock/test/test_upstream_sync.py
new file mode 100644
index 000000000000..cc3d661ca6e9
--- /dev/null
+++ b/cms/lib/xblock/test/test_upstream_sync.py
@@ -0,0 +1,425 @@
+"""
+Test CMS's upstream->downstream syncing system
+"""
+import ddt
+
+from organizations.api import ensure_organization
+from organizations.models import Organization
+
+from cms.lib.xblock.upstream_sync import (
+    UpstreamLink,
+    sync_from_upstream, decline_sync, fetch_customizable_fields, sever_upstream_link,
+    NoUpstream, BadUpstream, BadDownstream,
+)
+from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangoapps.content_libraries import api as libs
+from openedx.core.djangoapps.content_tagging import api as tagging_api
+from openedx.core.djangoapps.xblock import api as xblock
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
+
+
+@ddt.ddt
+class UpstreamTestCase(ModuleStoreTestCase):
+    """
+    Tests the upstream_sync mixin, data object, and Python APIs.
+    """
+
+    def setUp(self):
+        """
+        Create a simple course with one unit, and simple V2 library with two blocks.
+        """
+        super().setUp()
+        course = CourseFactory.create()
+        chapter = BlockFactory.create(category='chapter', parent=course)
+        sequential = BlockFactory.create(category='sequential', parent=chapter)
+        self.unit = BlockFactory.create(category='vertical', parent=sequential)
+
+        ensure_organization("TestX")
+        self.library = libs.create_library(
+            org=Organization.objects.get(short_name="TestX"),
+            slug="TestLib",
+            title="Test Upstream Library",
+        )
+        self.upstream_key = libs.create_library_block(self.library.key, "html", "test-upstream").usage_key
+        libs.create_library_block(self.library.key, "video", "video-upstream")
+
+        upstream = xblock.load_block(self.upstream_key, self.user)
+        upstream.display_name = "Upstream Title V2"
+        upstream.data = "<html><body>Upstream content V2</body></html>"
+        upstream.save()
+
+        libs.publish_changes(self.library.key, self.user.id)
+
+        self.taxonomy_all_org = tagging_api.create_taxonomy(
+            "test_taxonomy",
+            "Test Taxonomy",
+            export_id="ALL_ORGS",
+        )
+        tagging_api.set_taxonomy_orgs(self.taxonomy_all_org, all_orgs=True)
+        for tag_value in ('tag_1', 'tag_2', 'tag_3', 'tag_4', 'tag_5', 'tag_6', 'tag_7'):
+            tagging_api.add_tag_to_taxonomy(self.taxonomy_all_org, tag_value)
+
+        self.upstream_tags = ['tag_1', 'tag_5']
+        tagging_api.tag_object(str(self.upstream_key), self.taxonomy_all_org, self.upstream_tags)
+
+    def test_sync_bad_downstream(self):
+        """
+        Syncing into an unsupported downstream (such as a another Content Library block) raises BadDownstream, but
+        doesn't affect the block.
+        """
+        downstream_lib_block_key = libs.create_library_block(self.library.key, "html", "bad-downstream").usage_key
+        downstream_lib_block = xblock.load_block(downstream_lib_block_key, self.user)
+        downstream_lib_block.display_name = "Another lib block"
+        downstream_lib_block.data = "<html>another lib block</html>"
+        downstream_lib_block.upstream = str(self.upstream_key)
+        downstream_lib_block.save()
+
+        with self.assertRaises(BadDownstream):
+            sync_from_upstream(downstream_lib_block, self.user)
+
+        assert downstream_lib_block.display_name == "Another lib block"
+        assert downstream_lib_block.data == "<html>another lib block</html>"
+
+    def test_sync_no_upstream(self):
+        """
+        Trivial case: Syncing a block with no upstream is a no-op
+        """
+        block = BlockFactory.create(category='html', parent=self.unit)
+        block.display_name = "Block Title"
+        block.data = "Block content"
+
+        with self.assertRaises(NoUpstream):
+            sync_from_upstream(block, self.user)
+
+        assert block.display_name == "Block Title"
+        assert block.data == "Block content"
+        assert not block.upstream_display_name
+
+    @ddt.data(
+        ("not-a-key-at-all", ".*is malformed.*"),
+        ("course-v1:Oops+ItsA+CourseKey", ".*is malformed.*"),
+        ("block-v1:The+Wrong+KindOfUsageKey+type@html+block@nope", ".*is malformed.*"),
+        ("lb:TestX:NoSuchLib:html:block-id", ".*not found in the system.*"),
+        ("lb:TestX:TestLib:video:should-be-html-but-is-a-video", ".*type mismatch.*"),
+        ("lb:TestX:TestLib:html:no-such-html", ".*not found in the system.*"),
+    )
+    @ddt.unpack
+    def test_sync_bad_upstream(self, upstream, message_regex):
+        """
+        Syncing with a bad upstream raises BadUpstream, but doesn't affect the block
+        """
+        block = BlockFactory.create(category='html', parent=self.unit, upstream=upstream)
+        block.display_name = "Block Title"
+        block.data = "Block content"
+
+        with self.assertRaisesRegex(BadUpstream, message_regex):
+            sync_from_upstream(block, self.user)
+
+        assert block.display_name == "Block Title"
+        assert block.data == "Block content"
+        assert not block.upstream_display_name
+
+    def test_sync_not_accessible(self):
+        """
+        Syncing with an block that exists, but is inaccessible, raises BadUpstream
+        """
+        downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(self.upstream_key))
+        user_who_cannot_read_upstream = UserFactory.create(username="rando", is_staff=False, is_superuser=False)
+        with self.assertRaisesRegex(BadUpstream, ".*could not be loaded.*") as exc:
+            sync_from_upstream(downstream, user_who_cannot_read_upstream)
+
+    def test_sync_updates_happy_path(self):
+        """
+        Can we sync updates from a content library block to a linked out-of-date course block?
+        """
+        downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(self.upstream_key))
+
+        # Initial sync
+        sync_from_upstream(downstream, self.user)
+        assert downstream.upstream_version == 2  # Library blocks start at version 2 (v1 is the empty new block)
+        assert downstream.upstream_display_name == "Upstream Title V2"
+        assert downstream.display_name == "Upstream Title V2"
+        assert downstream.data == "<html><body>Upstream content V2</body></html>"
+
+        # Verify tags
+        object_tags = tagging_api.get_object_tags(str(downstream.location))
+        assert len(object_tags) == len(self.upstream_tags)
+        for object_tag in object_tags:
+            assert object_tag.value in self.upstream_tags
+
+        # Upstream updates
+        upstream = xblock.load_block(self.upstream_key, self.user)
+        upstream.display_name = "Upstream Title V3"
+        upstream.data = "<html><body>Upstream content V3</body></html>"
+        upstream.save()
+        new_upstream_tags = self.upstream_tags + ['tag_2', 'tag_3']
+        tagging_api.tag_object(str(self.upstream_key), self.taxonomy_all_org, new_upstream_tags)
+
+        # Assert that un-published updates are not yet pulled into downstream
+        sync_from_upstream(downstream, self.user)
+        assert downstream.upstream_version == 2  # Library blocks start at version 2 (v1 is the empty new block)
+        assert downstream.upstream_display_name == "Upstream Title V2"
+        assert downstream.display_name == "Upstream Title V2"
+        assert downstream.data == "<html><body>Upstream content V2</body></html>"
+
+        # Publish changes
+        libs.publish_changes(self.library.key, self.user.id)
+
+        # Follow-up sync. Assert that updates are pulled into downstream.
+        sync_from_upstream(downstream, self.user)
+        assert downstream.upstream_version == 3
+        assert downstream.upstream_display_name == "Upstream Title V3"
+        assert downstream.display_name == "Upstream Title V3"
+        assert downstream.data == "<html><body>Upstream content V3</body></html>"
+
+        # Verify tags
+        object_tags = tagging_api.get_object_tags(str(downstream.location))
+        assert len(object_tags) == len(new_upstream_tags)
+        for object_tag in object_tags:
+            assert object_tag.value in new_upstream_tags
+
+    def test_sync_updates_to_modified_content(self):
+        """
+        If we sync to modified content, will it preserve customizable fields, but overwrite the rest?
+        """
+        downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(self.upstream_key))
+
+        # Initial sync
+        sync_from_upstream(downstream, self.user)
+        assert downstream.upstream_display_name == "Upstream Title V2"
+        assert downstream.display_name == "Upstream Title V2"
+        assert downstream.data == "<html><body>Upstream content V2</body></html>"
+
+        # Upstream updates
+        upstream = xblock.load_block(self.upstream_key, self.user)
+        upstream.display_name = "Upstream Title V3"
+        upstream.data = "<html><body>Upstream content V3</body></html>"
+        upstream.save()
+        libs.publish_changes(self.library.key, self.user.id)
+
+        # Downstream modifications
+        downstream.display_name = "Downstream Title Override"  # "safe" customization
+        downstream.data = "Downstream content override"  # "unsafe" override
+        downstream.save()
+
+        # Follow-up sync. Assert that updates are pulled into downstream, but customizations are saved.
+        sync_from_upstream(downstream, self.user)
+        assert downstream.upstream_display_name == "Upstream Title V3"
+        assert downstream.display_name == "Downstream Title Override"  # "safe" customization survives
+        assert downstream.data == "<html><body>Upstream content V3</body></html>"  # "unsafe" override is gone
+
+    # For the Content Libraries Relaunch Beta, we do not yet need to support this edge case.
+    # See "PRESERVING DOWNSTREAM CUSTOMIZATIONS and RESTORING UPSTREAM DEFAULTS" in cms/lib/xblock/upstream_sync.py.
+    #
+    #   def test_sync_to_downstream_with_subtle_customization(self):
+    #       """
+    #       Edge case: If our downstream customizes a field, but then the upstream is changed to match the
+    #                  customization do we still remember that the downstream field is customized? That is,
+    #                  if the upstream later changes again, do we retain the downstream customization (rather than
+    #                  following the upstream update?)
+    #       """
+    #       # Start with an uncustomized downstream block.
+    #       downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(self.upstream_key))
+    #       sync_from_upstream(downstream, self.user)
+    #       assert downstream.downstream_customized == []
+    #       assert downstream.display_name == downstream.upstream_display_name == "Upstream Title V2"
+    #
+    #       # Then, customize our downstream title.
+    #       downstream.display_name = "Title V3"
+    #       downstream.save()
+    #       assert downstream.downstream_customized == ["display_name"]
+    #
+    #       # Syncing should retain the customization.
+    #       sync_from_upstream(downstream, self.user)
+    #       assert downstream.upstream_version == 2
+    #       assert downstream.upstream_display_name == "Upstream Title V2"
+    #       assert downstream.display_name == "Title V3"
+    #
+    #       # Whoa, look at that, the upstream has updated itself to the exact same title...
+    #       upstream = xblock.load_block(self.upstream_key, self.user)
+    #       upstream.display_name = "Title V3"
+    #       upstream.save()
+    #
+    #       # ...which is reflected when we sync.
+    #       sync_from_upstream(downstream, self.user)
+    #       assert downstream.upstream_version == 3
+    #       assert downstream.upstream_display_name == downstream.display_name == "Title V3"
+    #
+    #       # But! Our downstream knows that its title is still customized.
+    #       assert downstream.downstream_customized == ["display_name"]
+    #       # So, if the upstream title changes again...
+    #       upstream.display_name = "Title V4"
+    #       upstream.save()
+    #
+    #       # ...then the downstream title should remain put.
+    #       sync_from_upstream(downstream, self.user)
+    #       assert downstream.upstream_version == 4
+    #       assert downstream.upstream_display_name == "Title V4"
+    #       assert downstream.display_name == "Title V3"
+    #
+    #       # Finally, if we "de-customize" the display_name field, then it should go back to syncing normally.
+    #       downstream.downstream_customized = []
+    #       upstream.display_name = "Title V5"
+    #       upstream.save()
+    #       sync_from_upstream(downstream, self.user)
+    #       assert downstream.upstream_version == 5
+    #       assert downstream.upstream_display_name == downstream.display_name == "Title V5"
+
+    @ddt.data(None, "Title From Some Other Upstream Version")
+    def test_fetch_customizable_fields(self, initial_upstream_display_name):
+        """
+        Can we fetch a block's upstream field values without syncing it?
+
+        Test both with and without a pre-"fetched" upstrema values on the downstream.
+        """
+        downstream = BlockFactory.create(category='html', parent=self.unit)
+        downstream.upstream_display_name = initial_upstream_display_name
+        downstream.display_name = "Some Title"
+        downstream.data = "<html><data>Some content</data></html>"
+
+        # Note that we're not linked to any upstream. fetch_customizable_fields shouldn't care.
+        assert not downstream.upstream
+        assert not downstream.upstream_version
+
+        # fetch!
+        upstream = xblock.load_block(self.upstream_key, self.user)
+        fetch_customizable_fields(upstream=upstream, downstream=downstream, user=self.user)
+
+        # Ensure: fetching doesn't affect the upstream link (or lack thereof).
+        assert not downstream.upstream
+        assert not downstream.upstream_version
+
+        # Ensure: fetching doesn't affect actual content or settings.
+        assert downstream.display_name == "Some Title"
+        assert downstream.data == "<html><data>Some content</data></html>"
+
+        # Ensure: fetching DOES set the upstream_* fields.
+        assert downstream.upstream_display_name == "Upstream Title V2"
+
+    def test_prompt_and_decline_sync(self):
+        """
+        Is the user prompted for sync when it's available? Does declining remove the prompt until a new sync is ready?
+        """
+        # Initial conditions (pre-sync)
+        downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(self.upstream_key))
+        link = UpstreamLink.get_for_block(downstream)
+        assert link.version_synced is None
+        assert link.version_declined is None
+        assert link.version_available == 2  # Library block with content starts at version 2
+        assert link.ready_to_sync is True
+
+        # Initial sync to V2
+        sync_from_upstream(downstream, self.user)
+        link = UpstreamLink.get_for_block(downstream)
+        assert link.version_synced == 2
+        assert link.version_declined is None
+        assert link.version_available == 2
+        assert link.ready_to_sync is False
+
+        # Upstream updated to V3, but not yet published
+        upstream = xblock.load_block(self.upstream_key, self.user)
+        upstream.data = "<html><body>Upstream content V3</body></html>"
+        upstream.save()
+        link = UpstreamLink.get_for_block(downstream)
+        assert link.version_synced == 2
+        assert link.version_declined is None
+        assert link.version_available == 2
+        assert link.ready_to_sync is False
+
+        # Publish changes
+        libs.publish_changes(self.library.key, self.user.id)
+        link = UpstreamLink.get_for_block(downstream)
+        assert link.version_synced == 2
+        assert link.version_declined is None
+        assert link.version_available == 3
+        assert link.ready_to_sync is True
+
+        # Decline to sync to V3 -- ready_to_sync becomes False.
+        decline_sync(downstream)
+        link = UpstreamLink.get_for_block(downstream)
+        assert link.version_synced == 2
+        assert link.version_declined == 3
+        assert link.version_available == 3
+        assert link.ready_to_sync is False
+
+        # Upstream updated to V4 -- ready_to_sync becomes True again.
+        upstream = xblock.load_block(self.upstream_key, self.user)
+        upstream.data = "<html><body>Upstream content V4</body></html>"
+        upstream.save()
+        libs.publish_changes(self.library.key, self.user.id)
+        link = UpstreamLink.get_for_block(downstream)
+        assert link.version_synced == 2
+        assert link.version_declined == 3
+        assert link.version_available == 4
+        assert link.ready_to_sync is True
+
+    def test_sever_upstream_link(self):
+        """
+        Does sever_upstream_link correctly disconnect a block from its upstream?
+        """
+        # Start with a course block that is linked+synced to a content library block.
+        downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(self.upstream_key))
+        sync_from_upstream(downstream, self.user)
+
+        # (sanity checks)
+        assert downstream.upstream == str(self.upstream_key)
+        assert downstream.upstream_version == 2
+        assert downstream.upstream_display_name == "Upstream Title V2"
+        assert downstream.display_name == "Upstream Title V2"
+        assert downstream.data == "<html><body>Upstream content V2</body></html>"
+        assert downstream.copied_from_block is None
+
+        # Now, disconnect the course block.
+        sever_upstream_link(downstream)
+
+        # All upstream metadata has been wiped out.
+        assert downstream.upstream is None
+        assert downstream.upstream_version is None
+        assert downstream.upstream_display_name is None
+
+        # BUT, the content which was synced into the upstream remains.
+        assert downstream.display_name == "Upstream Title V2"
+        assert downstream.data == "<html><body>Upstream content V2</body></html>"
+
+        # AND, we have recorded the old upstream as our copied_from_block.
+        assert downstream.copied_from_block == str(self.upstream_key)
+
+    def test_sync_library_block_tags(self):
+        upstream_lib_block_key = libs.create_library_block(self.library.key, "html", "upstream").usage_key
+        upstream_lib_block = xblock.load_block(upstream_lib_block_key, self.user)
+        upstream_lib_block.display_name = "Another lib block"
+        upstream_lib_block.data = "<html>another lib block</html>"
+        upstream_lib_block.save()
+
+        libs.publish_changes(self.library.key, self.user.id)
+
+        expected_tags = self.upstream_tags
+        tagging_api.tag_object(str(upstream_lib_block_key), self.taxonomy_all_org, expected_tags)
+
+        downstream = BlockFactory.create(category='html', parent=self.unit, upstream=str(upstream_lib_block_key))
+
+        # Initial sync
+        sync_from_upstream(downstream, self.user)
+
+        # Verify tags
+        object_tags = tagging_api.get_object_tags(str(downstream.location))
+        assert len(object_tags) == len(expected_tags)
+        for object_tag in object_tags:
+            assert object_tag.value in expected_tags
+
+        # Upstream updates
+        upstream_lib_block.display_name = "Upstream Title V3"
+        upstream_lib_block.data = "<html><body>Upstream content V3</body></html>"
+        upstream_lib_block.save()
+        new_upstream_tags = self.upstream_tags + ['tag_2', 'tag_3']
+        tagging_api.tag_object(str(upstream_lib_block_key), self.taxonomy_all_org, new_upstream_tags)
+
+        # Follow-up sync.
+        sync_from_upstream(downstream, self.user)
+
+        #Verify tags
+        object_tags = tagging_api.get_object_tags(str(downstream.location))
+        assert len(object_tags) == len(new_upstream_tags)
+        for object_tag in object_tags:
+            assert object_tag.value in new_upstream_tags
diff --git a/cms/lib/xblock/upstream_sync.py b/cms/lib/xblock/upstream_sync.py
new file mode 100644
index 000000000000..0d95931ce29d
--- /dev/null
+++ b/cms/lib/xblock/upstream_sync.py
@@ -0,0 +1,492 @@
+"""
+Synchronize content and settings from upstream blocks to their downstream usages.
+
+At the time of writing, we assume that for any upstream-downstream linkage:
+* The upstream is a Component from a Learning Core-backed Content Library.
+* The downstream is a block of matching type in a SplitModuleStore-backed Course.
+* They are both on the same Open edX instance.
+
+HOWEVER, those assumptions may loosen in the future. So, we consider these to be INTERNAL ASSUMPIONS that should not be
+exposed through this module's public Python interface.
+"""
+from __future__ import annotations
+
+import logging
+import typing as t
+from dataclasses import dataclass, asdict
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+from django.utils.translation import gettext_lazy as _
+from rest_framework.exceptions import NotFound
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.locator import LibraryUsageLocatorV2
+from xblock.exceptions import XBlockNotFoundError
+from xblock.fields import Scope, String, Integer
+from xblock.core import XBlockMixin, XBlock
+
+if t.TYPE_CHECKING:
+    from django.contrib.auth.models import User  # pylint: disable=imported-auth-user
+
+
+logger = logging.getLogger(__name__)
+
+
+class UpstreamLinkException(Exception):
+    """
+    Raised whenever we try to inspect, sync-from, fetch-from, or delete a block's link to upstream content.
+
+    There are three flavors (defined below): BadDownstream, BadUpstream, NoUpstream.
+
+    Should be constructed with a human-friendly, localized, PII-free message, suitable for API responses and UI display.
+    For now, at least, the message can assume that upstreams are Content Library blocks and downstreams are Course
+    blocks, although that may need to change (see module docstring).
+    """
+
+
+class BadDownstream(UpstreamLinkException):
+    """
+    Downstream content does not support sync.
+    """
+
+
+class BadUpstream(UpstreamLinkException):
+    """
+    Reference to upstream content is malformed, invalid, and/or inaccessible.
+    """
+
+
+class NoUpstream(UpstreamLinkException):
+    """
+    The downstream content does not have an upstream link at all (...as is the case for most XBlocks usages).
+
+    (This isn't so much an "error" like the other two-- it's just a case that needs to be handled exceptionally,
+     usually by logging a message and then doing nothing.)
+    """
+    def __init__(self):
+        super().__init__(_("Content is not linked to a Content Library."))
+
+
+@dataclass(frozen=True)
+class UpstreamLink:
+    """
+    Metadata about some downstream content's relationship with its linked upstream content.
+    """
+    upstream_ref: str | None  # Reference to the upstream content, e.g., a serialized library block usage key.
+    version_synced: int | None  # Version of the upstream to which the downstream was last synced.
+    version_available: int | None  # Latest version of the upstream that's available, or None if it couldn't be loaded.
+    version_declined: int | None  # Latest version which the user has declined to sync with, if any.
+    error_message: str | None  # If link is valid, None. Otherwise, a localized, human-friendly error message.
+
+    @property
+    def ready_to_sync(self) -> bool:
+        """
+        Should we invite the downstream's authors to sync the latest upstream updates?
+        """
+        return bool(
+            self.upstream_ref and
+            self.version_available and
+            self.version_available > (self.version_synced or 0) and
+            self.version_available > (self.version_declined or 0)
+        )
+
+    @property
+    def upstream_link(self) -> str | None:
+        """
+        Link to edit/view upstream block in library.
+        """
+        if self.version_available is None or self.upstream_ref is None:
+            return None
+        try:
+            usage_key = LibraryUsageLocatorV2.from_string(self.upstream_ref)
+        except InvalidKeyError:
+            return None
+        return _get_library_xblock_url(usage_key)
+
+    def to_json(self) -> dict[str, t.Any]:
+        """
+        Get an JSON-API-friendly representation of this upstream link.
+        """
+        return {
+            **asdict(self),
+            "ready_to_sync": self.ready_to_sync,
+            "upstream_link": self.upstream_link,
+        }
+
+    @classmethod
+    def try_get_for_block(cls, downstream: XBlock) -> t.Self:
+        """
+        Same as `get_for_block`, but upon failure, sets `.error_message` instead of raising an exception.
+        """
+        try:
+            return cls.get_for_block(downstream)
+        except UpstreamLinkException as exc:
+            logger.exception(
+                "Tried to inspect an unsupported, broken, or missing downstream->upstream link: '%s'->'%s'",
+                downstream.usage_key,
+                downstream.upstream,
+            )
+            return cls(
+                upstream_ref=downstream.upstream,
+                version_synced=downstream.upstream_version,
+                version_available=None,
+                version_declined=None,
+                error_message=str(exc),
+            )
+
+    @classmethod
+    def get_for_block(cls, downstream: XBlock) -> t.Self:
+        """
+        Get info on a block's relationship with its linked upstream content (without actually loading the content).
+
+        Currently, the only supported upstreams are LC-backed Library Components. This may change in the future (see
+        module docstring).
+
+        If link exists, is supported, and is followable, returns UpstreamLink.
+        Otherwise, raises an UpstreamLinkException.
+        """
+        if not downstream.upstream:
+            raise NoUpstream()
+        if not isinstance(downstream.usage_key.context_key, CourseKey):
+            raise BadDownstream(_("Cannot update content because it does not belong to a course."))
+        if downstream.has_children:
+            raise BadDownstream(_("Updating content with children is not yet supported."))
+        try:
+            upstream_key = LibraryUsageLocatorV2.from_string(downstream.upstream)
+        except InvalidKeyError as exc:
+            raise BadUpstream(_("Reference to linked library item is malformed")) from exc
+        downstream_type = downstream.usage_key.block_type
+        if upstream_key.block_type != downstream_type:
+            # Note: Currently, we strictly enforce that the downstream and upstream block_types must exactly match.
+            #       It could be reasonable to relax this requirement in the future if there's product need for it.
+            #       For example, there's no reason that a StaticTabBlock couldn't take updates from an HtmlBlock.
+            raise BadUpstream(
+                _("Content type mismatch: {downstream_type} cannot be linked to {upstream_type}.").format(
+                    downstream_type=downstream_type, upstream_type=upstream_key.block_type
+                )
+            ) from TypeError(
+                f"downstream block '{downstream.usage_key}' is linked to "
+                f"upstream block of different type '{upstream_key}'"
+            )
+        # We import this here b/c UpstreamSyncMixin is used by cms/envs, which loads before the djangoapps are ready.
+        from openedx.core.djangoapps.content_libraries.api import (
+            get_library_block  # pylint: disable=wrong-import-order
+        )
+        try:
+            lib_meta = get_library_block(upstream_key)
+        except XBlockNotFoundError as exc:
+            raise BadUpstream(_("Linked library item was not found in the system")) from exc
+        return cls(
+            upstream_ref=downstream.upstream,
+            version_synced=downstream.upstream_version,
+            version_available=(lib_meta.published_version_num if lib_meta else None),
+            version_declined=downstream.upstream_version_declined,
+            error_message=None,
+        )
+
+
+def sync_from_upstream(downstream: XBlock, user: User) -> None:
+    """
+    Update `downstream` with content+settings from the latest available version of its linked upstream content.
+
+    Preserves overrides to customizable fields; overwrites overrides to other fields.
+    Does not save `downstream` to the store. That is left up to the caller.
+
+    If `downstream` lacks a valid+supported upstream link, this raises an UpstreamLinkException.
+    """
+    link, upstream = _load_upstream_link_and_block(downstream, user)
+    _update_customizable_fields(upstream=upstream, downstream=downstream, only_fetch=False)
+    _update_non_customizable_fields(upstream=upstream, downstream=downstream)
+    _update_tags(upstream=upstream, downstream=downstream)
+    downstream.upstream_version = link.version_available
+
+
+def fetch_customizable_fields(*, downstream: XBlock, user: User, upstream: XBlock | None = None) -> None:
+    """
+    Fetch upstream-defined value of customizable fields and save them on the downstream.
+
+    If `upstream` is provided, use that block as the upstream.
+    Otherwise, load the block specified by  `downstream.upstream`, which may raise an UpstreamLinkException.
+    """
+    if not upstream:
+        _link, upstream = _load_upstream_link_and_block(downstream, user)
+    _update_customizable_fields(upstream=upstream, downstream=downstream, only_fetch=True)
+
+
+def _load_upstream_link_and_block(downstream: XBlock, user: User) -> tuple[UpstreamLink, XBlock]:
+    """
+    Load the upstream metadata and content for a downstream block.
+
+    Assumes that the upstream content is an XBlock in an LC-backed content libraries. This assumption may need to be
+    relaxed in the future (see module docstring).
+
+    If `downstream` lacks a valid+supported upstream link, this raises an UpstreamLinkException.
+    """
+    link = UpstreamLink.get_for_block(downstream)  # can raise UpstreamLinkException
+    # We import load_block here b/c UpstreamSyncMixin is used by cms/envs, which loads before the djangoapps are ready.
+    from openedx.core.djangoapps.xblock.api import load_block, CheckPerm, LatestVersion  # pylint: disable=wrong-import-order
+    try:
+        lib_block: XBlock = load_block(
+            LibraryUsageLocatorV2.from_string(downstream.upstream),
+            user,
+            check_permission=CheckPerm.CAN_READ_AS_AUTHOR,
+            version=LatestVersion.PUBLISHED,
+        )
+    except (NotFound, PermissionDenied) as exc:
+        raise BadUpstream(_("Linked library item could not be loaded: {}").format(downstream.upstream)) from exc
+    return link, lib_block
+
+
+def _update_customizable_fields(*, upstream: XBlock, downstream: XBlock, only_fetch: bool) -> None:
+    """
+    For each customizable field:
+    * Save the upstream value to a hidden field on the downstream ("FETCH").
+    * If `not only_fetch`, and if the field *isn't* customized on the downstream, then:
+      * Update it the downstream field's value from the upstream field ("SYNC").
+
+    Concrete example: Imagine `lib_problem` is our upstream and `course_problem` is our downstream.
+
+     * Say that the customizable fields are [display_name, max_attempts].
+
+     * Set `course_problem.upstream_display_name = lib_problem.display_name` ("fetch").
+     * If `not only_fetch`, and `course_problem.display_name` wasn't customized, then:
+       * Set `course_problem.display_name = lib_problem.display_name` ("sync").
+
+     * Set `course_problem.upstream_max_attempts = lib_problem.max_attempts` ("fetch").
+     * If `not only_fetch`, and `course_problem.max_attempts` wasn't customized, then:
+       * Set `course_problem.max_attempts = lib_problem.max_attempts` ("sync").
+    """
+    syncable_field_names = _get_synchronizable_fields(upstream, downstream)
+
+    for field_name, fetch_field_name in downstream.get_customizable_fields().items():
+
+        if field_name not in syncable_field_names:
+            continue
+
+        # FETCH the upstream's value and save it on the downstream (ie, `downstream.upstream_$FIELD`).
+        old_upstream_value = getattr(downstream, fetch_field_name)
+        new_upstream_value = getattr(upstream, field_name)
+        setattr(downstream, fetch_field_name, new_upstream_value)
+
+        if only_fetch:
+            continue
+
+        # Okay, now for the nuanced part...
+        # We need to update the downstream field *iff it has not been customized**.
+        # Determining whether a field has been customized will differ in Beta vs Future release.
+        # (See "PRESERVING DOWNSTREAM CUSTOMIZATIONS" comment below for details.)
+
+        ## FUTURE BEHAVIOR: field is "customized" iff we have noticed that the user edited it.
+        #  if field_name in downstream.downstream_customized:
+        #      continue
+
+        ## BETA BEHAVIOR: field is "customized" iff we have the prev upstream value, but field doesn't match it.
+        downstream_value = getattr(downstream, field_name)
+        if old_upstream_value and downstream_value != old_upstream_value:
+            continue  # Field has been customized. Don't touch it. Move on.
+
+        # Field isn't customized -- SYNC it!
+        setattr(downstream, field_name, new_upstream_value)
+
+
+def _update_non_customizable_fields(*, upstream: XBlock, downstream: XBlock) -> None:
+    """
+    For each field `downstream.blah` that isn't customizable: set it to `upstream.blah`.
+    """
+    syncable_fields = _get_synchronizable_fields(upstream, downstream)
+    customizable_fields = set(downstream.get_customizable_fields().keys())
+    for field_name in syncable_fields - customizable_fields:
+        new_upstream_value = getattr(upstream, field_name)
+        setattr(downstream, field_name, new_upstream_value)
+
+
+def _update_tags(*, upstream: XBlock, downstream: XBlock) -> None:
+    """
+    Update tags from `upstream` to `downstream`
+    """
+    from openedx.core.djangoapps.content_tagging.api import copy_tags_as_read_only
+    # For any block synced with an upstream, copy the tags as read_only
+    # This keeps tags added locally.
+    copy_tags_as_read_only(
+        str(upstream.location),
+        str(downstream.location),
+    )
+
+
+def _get_synchronizable_fields(upstream: XBlock, downstream: XBlock) -> set[str]:
+    """
+    The syncable fields are the ones which are content- or settings-scoped AND are defined on both (up,down)stream.
+    """
+    return set.intersection(*[
+        set(
+            field_name
+            for (field_name, field) in block.__class__.fields.items()
+            if field.scope in [Scope.settings, Scope.content]
+        )
+        for block in [upstream, downstream]
+    ])
+
+
+def decline_sync(downstream: XBlock) -> None:
+    """
+    Given an XBlock that is linked to upstream content, mark the latest available update as 'declined' so that its
+    authors are not prompted (until another upstream version becomes available).
+
+    Does not save `downstream` to the store. That is left up to the caller.
+
+    If `downstream` lacks a valid+supported upstream link, this raises an UpstreamLinkException.
+    """
+    upstream_link = UpstreamLink.get_for_block(downstream)  # Can raise UpstreamLinkException
+    downstream.upstream_version_declined = upstream_link.version_available
+
+
+def sever_upstream_link(downstream: XBlock) -> None:
+    """
+    Given an XBlock that is linked to upstream content, disconnect the link, such that authors are never again prompted
+    to sync upstream updates. Erase all `.upstream*` fields from the downtream block.
+
+    However, before nulling out the `.upstream` field, we copy its value over to `.copied_from_block`. This makes sense,
+    because once a downstream block has been de-linked from source (e.g., a Content Library block), it is no different
+    than if the block had just been copy-pasted in the first place.
+
+    Does not save `downstream` to the store. That is left up to the caller.
+
+    If `downstream` lacks a link, then this raises NoUpstream (though it is reasonable for callers to handle such
+    exception and ignore it, as the end result is the same: `downstream.upstream is None`).
+    """
+    if not downstream.upstream:
+        raise NoUpstream()
+    downstream.copied_from_block = downstream.upstream
+    downstream.upstream = None
+    downstream.upstream_version = None
+    for _, fetched_upstream_field in downstream.get_customizable_fields().items():
+        setattr(downstream, fetched_upstream_field, None)  # Null out upstream_display_name, et al.
+
+
+def _get_library_xblock_url(usage_key: LibraryUsageLocatorV2):
+    """
+    Gets authoring url for given library_key.
+    """
+    library_url = None
+    if mfe_base_url := settings.COURSE_AUTHORING_MICROFRONTEND_URL:  # type: ignore
+        library_key = usage_key.lib_key
+        library_url = f'{mfe_base_url}/library/{library_key}/components?usageKey={usage_key}'
+    return library_url
+
+
+class UpstreamSyncMixin(XBlockMixin):
+    """
+    Allows an XBlock in the CMS to be associated & synced with an upstream.
+
+    Mixed into CMS's XBLOCK_MIXINS, but not LMS's.
+    """
+
+    # Upstream synchronization metadata fields
+    upstream = String(
+        help=(
+            "The usage key of a block (generally within a content library) which serves as a source of upstream "
+            "updates for this block, or None if there is no such upstream. Please note: It is valid for this "
+            "field to hold a usage key for an upstream block that does not exist (or does not *yet* exist) on "
+            "this instance, particularly if this downstream block was imported from a different instance."
+        ),
+        default=None, scope=Scope.settings, hidden=True, enforce_type=True
+    )
+    upstream_version = Integer(
+        help=(
+            "Record of the upstream block's version number at the time this block was created from it. If this "
+            "upstream_version is smaller than the upstream block's latest published version, then the author will be "
+            "invited to sync updates into this downstream block, presuming that they have not already declined to sync "
+            "said version."
+        ),
+        default=None, scope=Scope.settings, hidden=True, enforce_type=True,
+    )
+    upstream_version_declined = Integer(
+        help=(
+            "Record of the latest upstream version for which the author declined to sync updates, or None if they have "
+            "never declined an update."
+        ),
+        default=None, scope=Scope.settings, hidden=True, enforce_type=True,
+    )
+
+    # Store the fetched upstream values for customizable fields.
+    upstream_display_name = String(
+        help=("The value of display_name on the linked upstream block."),
+        default=None, scope=Scope.settings, hidden=True, enforce_type=True,
+    )
+    upstream_max_attempts = Integer(
+        help=("The value of max_attempts on the linked upstream block."),
+        default=None, scope=Scope.settings, hidden=True, enforce_type=True,
+    )
+
+    @classmethod
+    def get_customizable_fields(cls) -> dict[str, str]:
+        """
+        Mapping from each customizable field to the field which can be used to restore its upstream value.
+
+        XBlocks outside of edx-platform can override this in order to set up their own customizable fields.
+        """
+        return {
+            "display_name": "upstream_display_name",
+            "max_attempts": "upstream_max_attempts",
+        }
+
+    # PRESERVING DOWNSTREAM CUSTOMIZATIONS and RESTORING UPSTREAM VALUES
+    #
+    # For the full Content Libraries Relaunch, we would like to keep track of which customizable fields the user has
+    # actually customized. The idea is: once an author has customized a customizable field....
+    #
+    #   - future upstream syncs will NOT blow away the customization,
+    #   - but future upstream syncs WILL fetch the upstream values and tuck them away in a hidden field,
+    #   - and the author can can revert back to said fetched upstream value at any point.
+    #
+    # Now, whether field is "customized" (and thus "revertible") is dependent on whether they have ever edited it.
+    # To instrument this, we need to keep track of which customizable fields have been edited using a new XBlock field:
+    # `downstream_customized`
+    #
+    # Implementing `downstream_customized` has proven difficult, because there is no simple way to keep it up-to-date
+    # with the many different ways XBlock fields can change. The `.save()` and `.editor_saved()` methods are promising,
+    # but we need to do more due diligence to be sure that they cover all cases, including API edits, import/export,
+    # copy/paste, etc. We will figure this out in time for the full Content Libraries Relaunch (related ticket:
+    # https://github.com/openedx/frontend-app-authoring/issues/1317). But, for the Beta realease, we're going to
+    # implement something simpler:
+    #
+    # - We fetch upstream values for customizable fields and tuck them away in a hidden field (same as above).
+    # - If a customizable field DOES match the fetched upstream value, then future upstream syncs DO update it.
+    # - If a customizable field does NOT the fetched upstream value, then future upstream syncs DO NOT update it.
+    # - There is no UI option for explicitly reverting back to the fetched upstream value.
+    #
+    # For future reference, here is a partial implementation of what we are thinking for the full Content Libraries
+    # Relaunch::
+    #
+    #    downstream_customized = List(
+    #        help=(
+    #            "Names of the fields which have values set on the upstream block yet have been explicitly "
+    #            "overridden on this downstream block. Unless explicitly cleared by the user, these customizations "
+    #            "will persist even when updates are synced from the upstream."
+    #        ),
+    #        default=[], scope=Scope.settings, hidden=True, enforce_type=True,
+    #    )
+    #
+    #    def save(self, *args, **kwargs):
+    #        """
+    #        Update `downstream_customized` when a customizable field is modified.
+    #
+    #        NOTE: This does not work, because save() isn't actually called in all the cases that we'd want it to be.
+    #        """
+    #        super().save(*args, **kwargs)
+    #        customizable_fields = self.get_customizable_fields()
+    #
+    #        # Loop through all the fields that are potentially cutomizable.
+    #        for field_name, restore_field_name in self.get_customizable_fields():
+    #
+    #            # If the field is already marked as customized, then move on so that we don't
+    #            # unneccessarily query the block for its current value.
+    #            if field_name in self.downstream_customized:
+    #                continue
+    #
+    #            # If this field's value doesn't match the synced upstream value, then mark the field
+    #            # as customized so that we don't clobber it later when syncing.
+    #            # NOTE: Need to consider the performance impact of all these field lookups.
+    #            if getattr(self, field_name) != getattr(self, restore_field_name):
+    #                self.downstream_customized.append(field_name)
diff --git a/cms/static/images/large-itembank-icon.png b/cms/static/images/large-itembank-icon.png
new file mode 100644
index 000000000000..655ef1531336
Binary files /dev/null and b/cms/static/images/large-itembank-icon.png differ
diff --git a/cms/static/images/large-library_v2-icon.png b/cms/static/images/large-library_v2-icon.png
new file mode 100644
index 000000000000..5242104c4ce6
Binary files /dev/null and b/cms/static/images/large-library_v2-icon.png differ
diff --git a/cms/static/images/pencil-icon.svg b/cms/static/images/pencil-icon.svg
new file mode 100644
index 000000000000..1744c884dccc
--- /dev/null
+++ b/cms/static/images/pencil-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" focusable="false" aria-hidden="true">
+  <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25ZM21.41 6.34l-3.75-3.75-2.53 2.54 3.75 3.75 2.53-2.54Z" fill="currentColor"></path>
+</svg>
diff --git a/cms/static/js/factories/settings.js b/cms/static/js/factories/settings.js
index f8f927287c64..472f3c874e9e 100644
--- a/cms/static/js/factories/settings.js
+++ b/cms/static/js/factories/settings.js
@@ -3,7 +3,7 @@ define([
 ], function($, CourseDetailsModel, MainView) {
     'use strict';
 
-    return function(detailsUrl, showMinGradeWarning, showCertificateAvailableDate, upgradeDeadline, useV2CertDisplaySettings) {
+    return function(detailsUrl, showMinGradeWarning, showCertificateAvailableDate, upgradeDeadline) {
         var model;
         // highlighting labels when fields are focused in
         $('form :input')
@@ -23,7 +23,6 @@ define([
         model = new CourseDetailsModel();
         model.urlRoot = detailsUrl;
         model.showCertificateAvailableDate = showCertificateAvailableDate;
-        model.useV2CertDisplaySettings = useV2CertDisplaySettings;
         model.set('upgrade_deadline', upgradeDeadline);
         model.fetch({
             // eslint-disable-next-line no-shadow
@@ -33,7 +32,6 @@ define([
                     model: model,
                     showMinGradeWarning: showMinGradeWarning
                 });
-                editor.useV2CertDisplaySettings = useV2CertDisplaySettings;
                 editor.render();
             },
             reset: true,
diff --git a/cms/static/js/maintenance/force_publish_course.js b/cms/static/js/maintenance/force_publish_course.js
deleted file mode 100644
index 642b5bea4f2b..000000000000
--- a/cms/static/js/maintenance/force_publish_course.js
+++ /dev/null
@@ -1,83 +0,0 @@
-define([ // jshint ignore:line
-    'jquery',
-    'underscore',
-    'gettext',
-    'common/js/components/utils/view_utils',
-    'edx-ui-toolkit/js/utils/string-utils',
-    'edx-ui-toolkit/js/utils/html-utils'
-],
-function($, _, gettext, ViewUtils, StringUtils, HtmlUtils) {
-    'use strict';
-
-    return function(maintenanceViewURL) {
-        var showError;
-        // Reset values
-        $('#reset-button').click(function(e) {
-            e.preventDefault();
-            $('#course-id').val('');
-            $('#dry-run').prop('checked', true);
-            // clear out result container
-            $('#result-container').html('');
-        });
-
-        showError = function(containerElSelector, error) {
-            var errorWrapperElSelector, errorHtml;
-            errorWrapperElSelector = containerElSelector + ' .wrapper-error';
-            errorHtml = HtmlUtils.joinHtml(
-                HtmlUtils.HTML('<div class="error" aria-live="polite" id="course-id-error">'),
-                error,
-                HtmlUtils.HTML('</div>')
-            );
-            HtmlUtils.setHtml($(errorWrapperElSelector), HtmlUtils.HTML(errorHtml));
-            $(errorWrapperElSelector).css('display', 'inline-block');
-            $(errorWrapperElSelector).fadeOut(5000);
-        };
-
-        $('form#force_publish').submit(function(event) {
-            var attrs, forcePublishedTemplate, $submitButton, deferred, promise, data;
-            event.preventDefault();
-
-            // clear out result container
-            $('#result-container').html('');
-
-            $submitButton = $('#submit_force_publish');
-            deferred = new $.Deferred();
-            promise = deferred.promise();
-
-            data = $('#force_publish').serialize();
-
-            // disable submit button while executing.
-            ViewUtils.disableElementWhileRunning($submitButton, function() { return promise; });
-
-            $.ajax({
-                type: 'POST',
-                url: maintenanceViewURL,
-                dataType: 'json',
-                data: data
-            })
-                .done(function(response) {
-                    if (response.error) {
-                        showError('#course-id-container', response.msg);
-                    } else {
-                        if (response.msg) {
-                            showError('#result-error', response.msg);
-                        } else {
-                            attrs = $.extend({}, response, {StringUtils: StringUtils});
-                            forcePublishedTemplate = HtmlUtils.template(
-                                $('#force-published-course-response-tpl').text()
-                            );
-                            HtmlUtils.setHtml($('#result-container'), forcePublishedTemplate(attrs));
-                        }
-                    }
-                })
-                .fail(function() {
-                // response.responseText here because it would show some strange output, it may output Traceback
-                // sometimes if unexpected issue arises. Better to show just internal error when getting 500 error.
-                    showError('#result-error', gettext('Internal Server Error.'));
-                })
-                .always(function() {
-                    deferred.resolve();
-                });
-        });
-    };
-});
diff --git a/cms/static/js/models/component_template.js b/cms/static/js/models/component_template.js
index b2306d40e9c8..358b7b2f3433 100644
--- a/cms/static/js/models/component_template.js
+++ b/cms/static/js/models/component_template.js
@@ -11,7 +11,8 @@ define(['backbone'], function(Backbone) {
             // boilerplate_name (may be null)
             // is_common (only used for problems)
             templates: [],
-            support_legend: {}
+            support_legend: {},
+            beta: false,
         },
         parse: function(response) {
             // Returns true only for templates that both have no boilerplate and are of
@@ -26,6 +27,7 @@ define(['backbone'], function(Backbone) {
             this.templates = response.templates;
             this.display_name = response.display_name;
             this.support_legend = response.support_legend;
+            this.beta = response.beta;
 
             // Sort the templates.
             this.templates.sort(function(a, b) {
diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
index 302f214fd6ea..1714436d7d32 100644
--- a/cms/static/js/models/settings/course_details.js
+++ b/cms/static/js/models/settings/course_details.js
@@ -84,35 +84,33 @@ function(Backbone, _, gettext, ValidationHelpers, DateUtils, StringUtils) {
                 );
             }
 
-            if (this.useV2CertDisplaySettings) {
-                if (
-                    newattrs.certificates_display_behavior
-                        && !(Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).includes(newattrs.certificates_display_behavior))
-                ) {
-                    errors.certificates_display_behavior = StringUtils.interpolate(
-                        gettext(
-                            'The certificate display behavior must be one of: {behavior_options}'
-                        ),
-                        {
-                            behavior_options: Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).join(', ')
-                        }
-                    );
-                }
+            if (
+                newattrs.certificates_display_behavior
+                    && !(Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).includes(newattrs.certificates_display_behavior))
+            ) {
+                errors.certificates_display_behavior = StringUtils.interpolate(
+                    gettext(
+                        'The certificate display behavior must be one of: {behavior_options}'
+                    ),
+                    {
+                        behavior_options: Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).join(', ')
+                    }
+                );
+            }
 
-                // Throw error if there's a value for certificate_available_date
-                if (
-                    (newattrs.certificate_available_date && newattrs.certificates_display_behavior != CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
-                        || (!newattrs.certificate_available_date && newattrs.certificates_display_behavior == CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
-                ) {
-                    errors.certificates_display_behavior = StringUtils.interpolate(
-                        gettext(
-                            'The certificates display behavior must be {valid_option} if certificate available date is set.'
-                        ),
-                        {
-                            valid_option: CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE
-                        }
-                    );
-                }
+            // Throw error if there's a value for certificate_available_date
+            if (
+                (newattrs.certificate_available_date && newattrs.certificates_display_behavior != CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
+                    || (!newattrs.certificate_available_date && newattrs.certificates_display_behavior == CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
+            ) {
+                errors.certificates_display_behavior = StringUtils.interpolate(
+                    gettext(
+                        'The certificates display behavior must be {valid_option} if certificate available date is set.'
+                    ),
+                    {
+                        valid_option: CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE
+                    }
+                );
             }
 
             if (newattrs.intro_video && newattrs.intro_video !== this.get('intro_video')) {
diff --git a/cms/static/js/spec_helpers/edit_helpers.js b/cms/static/js/spec_helpers/edit_helpers.js
index acfdeff32344..4c7e7d5a5815 100644
--- a/cms/static/js/spec_helpers/edit_helpers.js
+++ b/cms/static/js/spec_helpers/edit_helpers.js
@@ -92,6 +92,7 @@ installEditTemplates = function(append) {
     TemplateHelpers.installTemplate('edit-xblock-modal');
     TemplateHelpers.installTemplate('editor-mode-button');
     TemplateHelpers.installTemplate('edit-title-button');
+    TemplateHelpers.installTemplate('edit-upstream-alert');
 
     // Add templates needed by the settings editor
     TemplateHelpers.installTemplate('metadata-editor');
diff --git a/cms/static/js/views/components/add_library_content.js b/cms/static/js/views/components/add_library_content.js
new file mode 100644
index 000000000000..1459ed3e0145
--- /dev/null
+++ b/cms/static/js/views/components/add_library_content.js
@@ -0,0 +1,76 @@
+/**
+ * Provides utilities to open and close the library content picker.
+ * This is for adding a single, selected, non-randomized component (XBlock)
+ * from the library into the course. It achieves the same effect as copy-pasting
+ * the block from a library into the course. The block will remain synced with
+ * the "upstream" library version.
+ *
+ * Compare cms/static/js/views/modals/select_v2_library_content.js which uses
+ * a multi-select modal to add component(s) to a Problem Bank (for
+ * randomization).
+ */
+define(['jquery', 'underscore', 'gettext', 'js/views/modals/base_modal'],
+function($, _, gettext, BaseModal) {
+    'use strict';
+
+    var AddLibraryContent = BaseModal.extend({
+        options: $.extend({}, BaseModal.prototype.options, {
+            modalName: 'add-component-from-library',
+            modalSize: 'lg',
+            view: 'studio_view',
+            viewSpecificClasses: 'modal-add-component-picker confirm',
+            // Translators: "title" is the name of the current component being edited.
+            titleFormat: gettext('Add library content'),
+            addPrimaryActionButton: false,
+            showEditorModeButtons: false,
+        }),
+
+        initialize: function() {
+            BaseModal.prototype.initialize.call(this);
+            // Add event listen to close picker when the iframe tells us to
+            const handleMessage = (event) => {
+                if (event.data?.type === 'pickerComponentSelected') {
+                    var requestData = {
+                        library_content_key: event.data.usageKey,
+                        category: event.data.category,
+                    }
+                    this.refreshFunction(requestData);
+                    this.hide();
+                }
+            };
+            this.messageListener = window.addEventListener("message", handleMessage);
+            this.cleanupListener = () => { window.removeEventListener("message", handleMessage) };
+        },
+
+        hide: function() {
+            BaseModal.prototype.hide.call(this);
+            this.cleanupListener();
+        },
+
+        /**
+         * Adds the action buttons to the modal.
+         */
+        addActionButtons: function() {
+            this.addActionButton('cancel', gettext('Cancel'));
+        },
+
+        /**
+         * Show a component picker modal from library.
+         * @param contentPickerUrl Url for component picker
+         * @param refreshFunction A function to refresh the block after it has been updated
+         */
+        showComponentPicker: function(contentPickerUrl, refreshFunction) {
+            this.contentPickerUrl = contentPickerUrl;
+            this.refreshFunction = refreshFunction;
+
+            this.render();
+            this.show();
+        },
+
+        getContentHtml: function() {
+            return `<iframe src="${this.contentPickerUrl}" onload="this.contentWindow.focus()" frameborder="0" style="width: 100%; height: 100%;"/>`;
+        },
+    });
+
+    return AddLibraryContent;
+});
diff --git a/cms/static/js/views/components/add_xblock.js b/cms/static/js/views/components/add_xblock.js
index 5f4911166937..29ce5eec7673 100644
--- a/cms/static/js/views/components/add_xblock.js
+++ b/cms/static/js/views/components/add_xblock.js
@@ -3,8 +3,9 @@
  */
 define(['jquery', 'underscore', 'gettext', 'js/views/baseview', 'common/js/components/utils/view_utils',
     'js/views/components/add_xblock_button', 'js/views/components/add_xblock_menu',
+    'js/views/components/add_library_content',
     'edx-ui-toolkit/js/utils/html-utils'],
-function($, _, gettext, BaseView, ViewUtils, AddXBlockButton, AddXBlockMenu, HtmlUtils) {
+function($, _, gettext, BaseView, ViewUtils, AddXBlockButton, AddXBlockMenu, AddLibraryContent, HtmlUtils) {
     'use strict';
 
     var AddXBlockComponent = BaseView.extend({
@@ -67,14 +68,32 @@ function($, _, gettext, BaseView, ViewUtils, AddXBlockButton, AddXBlockMenu, Htm
                 oldOffset = ViewUtils.getScrollOffset(this.$el);
             event.preventDefault();
             this.closeNewComponent(event);
-            ViewUtils.runOperationShowingMessage(
-                gettext('Adding'),
-                _.bind(this.options.createComponent, this, saveData, $element)
-            ).always(function() {
-                // Restore the scroll position of the buttons so that the new
-                // component appears above them.
-                ViewUtils.setScrollOffset(self.$el, oldOffset);
-            });
+
+            if (saveData.type === 'library_v2') {
+                var modal = new AddLibraryContent();
+                modal.showComponentPicker(
+                    this.options.libraryContentPickerUrl,
+                    function(data) {
+                        ViewUtils.runOperationShowingMessage(
+                            gettext('Adding'),
+                            _.bind(this.options.createComponent, this, data, $element),
+                        ).always(function() {
+                            // Restore the scroll position of the buttons so that the new
+                            // component appears above them.
+                            ViewUtils.setScrollOffset(self.$el, oldOffset);
+                        });
+                    }.bind(this)
+                );
+            } else {
+                ViewUtils.runOperationShowingMessage(
+                    gettext('Adding'),
+                    _.bind(this.options.createComponent, this, saveData, $element),
+                ).always(function() {
+                    // Restore the scroll position of the buttons so that the new
+                    // component appears above them.
+                    ViewUtils.setScrollOffset(self.$el, oldOffset);
+                });
+            }
         }
     });
 
diff --git a/cms/static/js/views/components/add_xblock_button.js b/cms/static/js/views/components/add_xblock_button.js
index 36b420a61068..4fa4d2effeff 100644
--- a/cms/static/js/views/components/add_xblock_button.js
+++ b/cms/static/js/views/components/add_xblock_button.js
@@ -8,7 +8,8 @@ define(['js/views/baseview', 'edx-ui-toolkit/js/utils/html-utils'],
                 var attributes = {
                     type: this.model.type,
                     templates: this.model.templates,
-                    display_name: this.model.display_name
+                    display_name: this.model.display_name,
+                    beta: this.model.beta,
                 };
                 BaseView.prototype.initialize.call(this);
                 this.template = this.loadTemplate('add-xblock-component-button');
diff --git a/cms/static/js/views/modals/edit_xblock.js b/cms/static/js/views/modals/edit_xblock.js
index 7182d8b0e51a..b5b69c721b10 100644
--- a/cms/static/js/views/modals/edit_xblock.js
+++ b/cms/static/js/views/modals/edit_xblock.js
@@ -75,6 +75,27 @@ function($, _, Backbone, gettext, BaseModal, ViewUtils, XBlockViewUtils, XBlockE
             this.$('.modal-window-title').html(this.loadTemplate('edit-title-button')({title: title}));
         },
 
+        createWarningToast: function(upstreamLink) {
+            // xss-lint: disable=javascript-jquery-insertion
+            this.$('.modal-header').before(this.loadTemplate('edit-upstream-alert')({
+                upstreamLink: upstreamLink,
+            }));
+        },
+
+        getXBlockUpstreamLink: function() {
+            const usageKey = this.xblockElement.data('locator');
+            $.ajax({
+                url: '/api/contentstore/v2/downstreams/' + usageKey,
+                type: 'GET',
+                success: function(data) {
+                    if (data?.upstream_link) {
+                        this.createWarningToast(data.upstream_link);
+                    }
+                }.bind(this),
+                notifyOnError: false,
+            })
+        },
+
         onDisplayXBlock: function() {
             var editorView = this.editorView,
                 title = this.getTitle(),
@@ -101,6 +122,7 @@ function($, _, Backbone, gettext, BaseModal, ViewUtils, XBlockViewUtils, XBlockE
             } else {
                 this.$('.modal-window-title').text(title);
             }
+            this.getXBlockUpstreamLink();
 
             // If the xblock is not using custom buttons then choose which buttons to show
             if (!editorView.hasCustomButtons()) {
diff --git a/cms/static/js/views/modals/preview_v2_library_changes.js b/cms/static/js/views/modals/preview_v2_library_changes.js
new file mode 100644
index 000000000000..943fe103220e
--- /dev/null
+++ b/cms/static/js/views/modals/preview_v2_library_changes.js
@@ -0,0 +1,117 @@
+/**
+ * The PreviewLibraryChangesModal is a Backbone view that shows an iframe in a
+ * modal window. The iframe embeds a view from the Authoring MFE that allows
+ * authors to preview the new version of a library-sourced XBlock, and decide
+ * whether to accept ("sync") or reject ("ignore") the changes.
+ */
+define(['jquery', 'underscore', 'gettext', 'js/views/modals/base_modal', 'common/js/components/utils/view_utils'],
+function($, _, gettext, BaseModal, ViewUtils) {
+    'use strict';
+
+    var PreviewLibraryChangesModal = BaseModal.extend({
+        events: _.extend({}, BaseModal.prototype.events, {
+            'click .action-accept': 'acceptChanges',
+            'click .action-ignore': 'ignoreChanges',
+        }),
+
+        options: $.extend({}, BaseModal.prototype.options, {
+            modalName: 'preview-lib-changes',
+            modalSize: 'lg',
+            view: 'studio_view',
+            viewSpecificClasses: 'modal-lib-preview confirm',
+            // Translators: "title" is the name of the current component being edited.
+            titleFormat: gettext('Preview changes to: {title}'),
+            addPrimaryActionButton: false,
+        }),
+
+        initialize: function() {
+            BaseModal.prototype.initialize.call(this);
+        },
+
+        /**
+         * Adds the action buttons to the modal.
+         */
+        addActionButtons: function() {
+            this.addActionButton('accept', gettext('Accept changes'), true);
+            this.addActionButton('ignore', gettext('Ignore changes'));
+            this.addActionButton('cancel', gettext('Cancel'));
+        },
+
+        /**
+         * Show an edit modal for the specified xblock
+         * @param xblockInfo The XBlockInfo model that describes the xblock.
+         * @param courseAuthoringMfeUrl The course authoring mfe url.
+         * @param upstreamBlockId The library block id.
+         * @param upstreamBlockVersionSynced The library block current version.
+         * @param refreshFunction A function to refresh the block after it has been updated
+         */
+        showPreviewFor: function(
+          xblockInfo,
+          courseAuthoringMfeUrl,
+          upstreamBlockId,
+          upstreamBlockVersionSynced,
+          refreshFunction
+        ) {
+            this.xblockInfo = xblockInfo;
+            this.courseAuthoringMfeUrl = courseAuthoringMfeUrl;
+            this.downstreamBlockId = this.xblockInfo.get('id');
+            this.upstreamBlockId = upstreamBlockId;
+            this.upstreamBlockVersionSynced = upstreamBlockVersionSynced;
+            this.refreshFunction = refreshFunction;
+
+            this.render();
+            this.show();
+        },
+
+        getContentHtml: function() {
+            return `
+                <iframe src="${this.courseAuthoringMfeUrl}/legacy/preview-changes/${this.upstreamBlockId}?old=${this.upstreamBlockVersionSynced}">
+            `;
+        },
+
+        getTitle: function() {
+            var displayName = this.xblockInfo.get('display_name');
+            if (!displayName) {
+                if (this.xblockInfo.isVertical()) {
+                    displayName = gettext('Unit');
+                } else {
+                    displayName = gettext('Component');
+                }
+            }
+            return edx.StringUtils.interpolate(
+                this.options.titleFormat, {
+                    title: displayName
+                }
+            );
+        },
+
+        acceptChanges: function(event) {
+            event.preventDefault();
+            $.post(`/api/contentstore/v2/downstreams/${this.downstreamBlockId}/sync`).done(() => {
+                this.hide();
+                this.refreshFunction();
+            }); // Note: if this POST request fails, Studio will display an error toast automatically.
+        },
+
+        ignoreChanges: function(event) {
+            event.preventDefault();
+            ViewUtils.confirmThenRunOperation(
+                gettext('Ignore these changes?'),
+                gettext('Would you like to permanently ignore this updated version? If so, you won\'t be able to update this until a newer version is published (in the library).'),
+                gettext('Ignore'),
+                () => {
+                    $.ajax({
+                        type: 'DELETE',
+                        url: `/api/contentstore/v2/downstreams/${this.downstreamBlockId}/sync`,
+                        data: {},
+                    }).done(() => {
+                        this.hide();
+                        this.refreshFunction();
+                    }); // Note: if this DELETE request fails, Studio will display an error toast automatically.
+                }
+            );
+        },
+    });
+
+    return PreviewLibraryChangesModal;
+});
diff --git a/cms/static/js/views/modals/select_v2_library_content.js b/cms/static/js/views/modals/select_v2_library_content.js
new file mode 100644
index 000000000000..79b13015c845
--- /dev/null
+++ b/cms/static/js/views/modals/select_v2_library_content.js
@@ -0,0 +1,103 @@
+/**
+ * Provides utilities to open and close the library content picker.
+ * This is for adding multiple components to a Problem Bank (for randomization).
+ *
+ * Compare cms/static/js/views/components/add_library_content.js which uses
+ * a single-select modal to add one component to a course (non-randomized).
+ */
+define(['jquery', 'underscore', 'gettext', 'js/views/modals/base_modal'],
+function($, _, gettext, BaseModal) {
+    'use strict';
+
+    var SelectV2LibraryContent = BaseModal.extend({
+        options: $.extend({}, BaseModal.prototype.options, {
+            modalName: 'add-components-from-library',
+            modalSize: 'lg',
+            view: 'studio_view',
+            viewSpecificClasses: 'modal-add-component-picker confirm',
+            titleFormat: gettext('Add library content'),
+            addPrimaryActionButton: false,
+            showEditorModeButtons: false,
+        }),
+
+        events: {
+            'click .action-add': 'addSelectedComponents',
+            'click .action-cancel': 'cancel',
+        },
+
+        initialize: function() {
+            BaseModal.prototype.initialize.call(this);
+            this.selections = [];
+            // Add event listen to close picker when the iframe tells us to
+            const handleMessage = (event) => {
+                if (event.data?.type === 'pickerSelectionChanged') {
+                    this.selections = event.data.selections;
+                    if (this.selections.length > 0) {
+                        this.enableActionButton('add');
+                    } else {
+                        this.disableActionButton('add');
+                    }
+                }
+                if (event.data?.type === 'addSelectedComponentsToBank') {
+                    this.selections = event.data.payload.selectedComponents;
+                    this.callback(this.selections);
+                }
+            };
+            this.messageListener = window.addEventListener("message", handleMessage);
+            this.cleanupListener = () => { window.removeEventListener("message", handleMessage) };
+        },
+
+        hide: function() {
+            BaseModal.prototype.hide.call(this);
+            this.cleanupListener();
+        },
+
+        /**
+         * Adds the action buttons to the modal.
+         */
+        addActionButtons: function() {
+            this.addActionButton('add', gettext('Add selected components'), true);
+            this.addActionButton('cancel', gettext('Cancel'));
+            this.disableActionButton('add');
+        },
+
+        /** Handler when the user clicks the "Add Selected Components" primary button */
+        addSelectedComponents: function(event) {
+            if (event) {
+                event.preventDefault();
+                event.stopPropagation(); // Make sure parent modals don't see the click
+            }
+            this.hide();
+            this.callback(this.selections);
+        },
+
+        /**
+         * Show a component picker modal from library.
+         * @param contentPickerUrl Url for component picker
+         * @param callback A function to call with the selected block(s)
+         * @param isIframeEmbed Boolean indicating if the unit is displayed inside an iframe
+         */
+        showComponentPicker: function(contentPickerUrl, callback, isIframeEmbed) {
+            this.contentPickerUrl = contentPickerUrl;
+            this.callback = callback;
+            if (isIframeEmbed) {
+                window.parent.postMessage(
+                    {
+                        type: 'showMultipleComponentPicker',
+                        payload: {}
+                    }, document.referrer
+                );
+                return true;
+            }
+
+            this.render();
+            this.show();
+        },
+
+        getContentHtml: function() {
+            return `<iframe src="${this.contentPickerUrl}" onload="this.contentWindow.focus()" frameborder="0" style="width: 100%; height: 100%;"/>`;
+        },
+    });
+
+    return SelectV2LibraryContent;
+});
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index 7e1f6de3b652..fb8fd2482d4e 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -8,14 +8,16 @@ define(['jquery', 'underscore', 'backbone', 'gettext', 'js/views/pages/base_page
     'js/models/xblock_info', 'js/views/xblock_string_field_editor', 'js/views/xblock_access_editor',
     'js/views/pages/container_subviews', 'js/views/unit_outline', 'js/views/utils/xblock_utils',
     'common/js/components/views/feedback_notification', 'common/js/components/views/feedback_prompt',
-    'js/views/utils/tagging_drawer_utils', 'js/utils/module',
+    'js/views/utils/tagging_drawer_utils', 'js/utils/module', 'js/views/modals/preview_v2_library_changes',
+    'js/views/modals/select_v2_library_content'
 ],
 function($, _, Backbone, gettext, BasePage,
     ViewUtils, ContainerView, XBlockView,
     AddXBlockComponent, EditXBlockModal, MoveXBlockModal,
     XBlockInfo, XBlockStringFieldEditor, XBlockAccessEditor,
     ContainerSubviews, UnitOutlineView, XBlockUtils,
-    NotificationView, PromptView, TaggingDrawerUtils, ModuleUtils) {
+    NotificationView, PromptView, TaggingDrawerUtils, ModuleUtils,
+    PreviewLibraryChangesModal, SelectV2LibraryContent) {
     'use strict';
 
     var XBlockContainerPage = BasePage.extend({
@@ -28,6 +30,8 @@ function($, _, Backbone, gettext, BasePage,
             'click .copy-button': 'copyXBlock',
             'click .move-button': 'showMoveXBlockModal',
             'click .delete-button': 'deleteXBlock',
+            'click .library-sync-button': 'showXBlockLibraryChangesPreview',
+            'click .problem-bank-v2-add-button': 'showSelectV2LibraryContent',
             'click .show-actions-menu-button': 'showXBlockActionsMenu',
             'click .new-component-button': 'scrollToNewComponentButtons',
             'click .save-button': 'saveSelectedLibraryComponents',
@@ -124,6 +128,14 @@ function($, _, Backbone, gettext, BasePage,
 
             }
 
+            if (this.options.isIframeEmbed) {
+                window.addEventListener('message', (event) => {
+                  if (event.data && event.data.type === 'refreshXBlock') {
+                      this.render();
+                  }
+               });
+            }
+
             this.listenTo(Backbone, 'move:onXBlockMoved', this.onXBlockMoved);
         },
 
@@ -207,12 +219,13 @@ function($, _, Backbone, gettext, BasePage,
 
         renderAddXBlockComponents: function() {
             var self = this;
-            if (self.options.canEdit) {
+            if (self.options.canEdit && !self.options.isIframeEmbed) {
                 this.$('.add-xblock-component').each(function(index, element) {
                     var component = new AddXBlockComponent({
                         el: element,
                         createComponent: _.bind(self.createComponent, self),
-                        collection: self.options.templates
+                        collection: self.options.templates,
+                        libraryContentPickerUrl: self.options.libraryContentPickerUrl,
                     });
                     component.render();
                 });
@@ -222,7 +235,7 @@ function($, _, Backbone, gettext, BasePage,
         },
 
         initializePasteButton() {
-            if (this.options.canEdit) {
+            if (this.options.canEdit && !this.options.isIframeEmbed) {
                 // We should have the user's clipboard status.
                 const data = this.options.clipboardData;
                 this.refreshPasteButton(data);
@@ -239,7 +252,7 @@ function($, _, Backbone, gettext, BasePage,
         refreshPasteButton(data) {
             // Do not perform any changes on paste button since they are not
             // rendered on Library or LibraryContent pages
-            if (!this.isLibraryPage && !this.isLibraryContentPage) {
+            if (!this.isLibraryPage && !this.isLibraryContentPage && !this.options.isIframeEmbed) {
                 // 'data' is the same data returned by the "get clipboard status" API endpoint
                 // i.e. /api/content-staging/v1/clipboard/
                 if (this.options.canEdit && data.content) {
@@ -252,6 +265,7 @@ function($, _, Backbone, gettext, BasePage,
                     } else {
                         // The thing in the clipboard can be pasted into this unit:
                         const detailsPopupEl = this.$(".clipboard-details-popup")[0];
+                        if (!detailsPopupEl) return; // This happens on the Problem Bank container page - no paste button is there anyways
                         detailsPopupEl.querySelector(".detail-block-name").innerText = data.content.display_name;
                         detailsPopupEl.querySelector(".detail-block-type").innerText = data.content.block_type_display;
                         detailsPopupEl.querySelector(".detail-course-name").innerText = data.source_context_title;
@@ -273,6 +287,18 @@ function($, _, Backbone, gettext, BasePage,
         /** The user has clicked on the "Paste Component button" */
         pasteComponent(event) {
             event.preventDefault();
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'pasteComponent',
+                            payload: {}
+                        }, document.referrer
+                    );
+                }
+            } catch (e) {
+                console.error(e);
+            }
             // Get the ID of the container (usually a unit/vertical) that we're pasting into:
             const parentElement = this.findXBlockElement(event.target);
             const parentLocator = parentElement.data('locator');
@@ -365,6 +391,18 @@ function($, _, Backbone, gettext, BasePage,
 
         editXBlock: function(event, options) {
             event.preventDefault();
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'editXBlock',
+                            payload: {}
+                        }, document.referrer
+                    );
+                }
+            } catch (e) {
+                console.error(e);
+            }
 
             if (!options || options.view !== 'visibility_view') {
                 const primaryHeader = $(event.target).closest('.xblock-header-primary, .nav-actions');
@@ -378,7 +416,13 @@ function($, _, Backbone, gettext, BasePage,
                         || (useNewVideoEditor === 'True' && blockType === 'video')
                         || (useNewProblemEditor === 'True' && blockType === 'problem')
                 ) {
-                    var destinationUrl = primaryHeader.attr('authoring_MFE_base_url') + '/' + blockType + '/' + encodeURI(primaryHeader.attr('data-usage-id'));
+                    var destinationUrl = primaryHeader.attr('authoring_MFE_base_url')
+                        + '/' + blockType
+                        + '/' + encodeURI(primaryHeader.attr('data-usage-id'));
+                    var upstreamRef = primaryHeader.attr('data-upstream-ref');
+                    if(upstreamRef) {
+                        destinationUrl += '?upstreamLibRef=' + upstreamRef;
+                    }
                     window.location.href = destinationUrl;
                     return;
                 }
@@ -396,6 +440,93 @@ function($, _, Backbone, gettext, BasePage,
             });
         },
 
+        /** Show the modal for previewing changes before syncing a library-sourced XBlock. */
+        showXBlockLibraryChangesPreview: function(event, options) {
+            const xblockElement = this.findXBlockElement(event.target);
+            const self = this;
+            const xblockInfo = XBlockUtils.findXBlockInfo(xblockElement, this.model);
+            const courseAuthoringMfeUrl = this.model.attributes.course_authoring_url;
+            const headerElement = xblockElement.find('.xblock-header-primary');
+            const upstreamBlockId = headerElement.data('upstream-ref');
+            const upstreamBlockVersionSynced = headerElement.data('version-synced');
+
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'showXBlockLibraryChangesPreview',
+                            payload: {
+                                downstreamBlockId: xblockInfo.get('id'),
+                                displayName: xblockInfo.get('display_name'),
+                                isVertical: xblockInfo.isVertical(),
+                                upstreamBlockId,
+                                upstreamBlockVersionSynced,
+                            }
+                        }, document.referrer
+                    );
+                    return true;
+                }
+            } catch (e) {
+                console.error(e);
+            }
+
+            event.preventDefault();
+            var modal = new PreviewLibraryChangesModal(options);
+            modal.showPreviewFor(
+                xblockInfo,
+                courseAuthoringMfeUrl,
+                upstreamBlockId,
+                upstreamBlockVersionSynced,
+                function() { self.refreshXBlock(xblockElement, false); }
+            );
+        },
+
+        /** Show the multi-select library content picker, for adding to a Problem Bank (itembank) Component */
+        showSelectV2LibraryContent: function(event, options) {
+            event.preventDefault();
+
+            const xblockElement = this.findXBlockElement(event.target);
+            const modal = new SelectV2LibraryContent(options);
+            const courseAuthoringMfeUrl = this.model.attributes.course_authoring_url;
+            const itemBankBlockId = xblockElement.data("locator");
+            const pickerUrl = courseAuthoringMfeUrl + '/component-picker/multiple?variant=published';
+
+            modal.showComponentPicker(pickerUrl, (selectedBlocks) => {
+                // selectedBlocks has type: {usageKey: string, blockType: string}[]
+                let doneAddingAllBlocks = () => { this.refreshXBlock(xblockElement, false); };
+                let doneAddingBlock = () => {};
+                if (this.model.id === itemBankBlockId) {
+                    // We're on the detailed view, showing all the components inside the problem bank.
+                    // Create a placeholder that will become the new block(s)
+                    const $insertSpot = xblockElement.find('.insert-new-lib-blocks-here');
+                    doneAddingBlock = (addResult) => {
+                        const $placeholderEl = $(this.createPlaceholderElement());
+                        const placeholderElement = $placeholderEl.insertBefore($insertSpot);
+                        placeholderElement.data('locator', addResult.locator);
+                        return this.refreshXBlock(placeholderElement, true);
+                    };
+                    doneAddingAllBlocks = () => {};
+                }
+                // Note: adding all the XBlocks in parallel will cause a race condition 😢 so we have to add
+                // them one at a time:
+                let lastAdded = $.when();
+                for (const { usageKey, blockType } of selectedBlocks) {
+                    const addData = {
+                        library_content_key: usageKey,
+                        category: blockType,
+                        parent_locator: itemBankBlockId,
+                    };
+                    lastAdded = lastAdded.then(() => (
+                        $.postJSON(this.getURLRoot() + '/', addData, doneAddingBlock)
+                    ));
+                }
+                // Now we actually add the block:
+                ViewUtils.runOperationShowingMessage(gettext('Adding'), () => {
+                    return lastAdded.done(() => { doneAddingAllBlocks() });
+                });
+            }, this.options.isIframeEmbed);
+        },
+
         /**
          * If the new "Actions" menu is enabled, most XBlock actions like
          * Duplicate, Move, Delete, Manage Access, etc. are moved into this
@@ -432,66 +563,43 @@ function($, _, Backbone, gettext, BasePage,
             });
         },
 
-        duplicateXBlock: function(event) {
-            event.preventDefault();
-            this.duplicateComponent(this.findXBlockElement(event.target));
-        },
-
         openManageTags: function(event) {
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'openManageTags',
+                            payload: {}
+                        }, document.referrer
+                    );
+                }
+            } catch (e) {
+                console.error(e);
+            }
             const taxonomyTagsWidgetUrl = this.model.get('taxonomy_tags_widget_url');
             const contentId = this.findXBlockElement(event.target).data('locator');
 
             TaggingDrawerUtils.openDrawer(taxonomyTagsWidgetUrl, contentId);
         },
 
-        showMoveXBlockModal: function(event) {
-            var xblockElement = this.findXBlockElement(event.target),
-                parentXBlockElement = xblockElement.parents('.studio-xblock-wrapper'),
-                modal = new MoveXBlockModal({
-                    sourceXBlockInfo: XBlockUtils.findXBlockInfo(xblockElement, this.model),
-                    sourceParentXBlockInfo: XBlockUtils.findXBlockInfo(parentXBlockElement, this.model),
-                    XBlockURLRoot: this.getURLRoot(),
-                    outlineURL: this.options.outlineURL
-                });
-
-            event.preventDefault();
-            modal.show();
-        },
-
-        deleteXBlock: function(event) {
-            event.preventDefault();
-            this.deleteComponent(this.findXBlockElement(event.target));
-        },
-
         createPlaceholderElement: function() {
             return $('<div/>', {class: 'studio-xblock-wrapper'});
         },
 
-        createComponent: function(template, target) {
-            // A placeholder element is created in the correct location for the new xblock
-            // and then onNewXBlock will replace it with a rendering of the xblock. Note that
-            // for xblocks that can't be replaced inline, the entire parent will be refreshed.
-            var parentElement = this.findXBlockElement(target),
-                parentLocator = parentElement.data('locator'),
-                buttonPanel = target.closest('.add-xblock-component'),
-                listPanel = buttonPanel.prev(),
-                scrollOffset = ViewUtils.getScrollOffset(buttonPanel),
-                $placeholderEl = $(this.createPlaceholderElement()),
-                requestData = _.extend(template, {
-                    parent_locator: parentLocator
-                }),
-                placeholderElement;
-            placeholderElement = $placeholderEl.appendTo(listPanel);
-            return $.postJSON(this.getURLRoot() + '/', requestData,
-                _.bind(this.onNewXBlock, this, placeholderElement, scrollOffset, false))
-                .fail(function() {
-                    // Remove the placeholder if the update failed
-                    placeholderElement.remove();
-                });
-        },
-
         copyXBlock: function(event) {
             event.preventDefault();
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'copyXBlock',
+                            payload: {}
+                        }, document.referrer
+                    );
+                }
+            } catch (e) {
+                console.error(e);
+            }
             const clipboardEndpoint = "/api/content-staging/v1/clipboard/";
             const element = this.findXBlockElement(event.target);
             const usageKeyToCopy = element.data('locator');
@@ -535,41 +643,58 @@ function($, _, Backbone, gettext, BasePage,
             });
         },
 
-        duplicateComponent: function(xblockElement) {
-            // A placeholder element is created in the correct location for the duplicate xblock
-            // and then onNewXBlock will replace it with a rendering of the xblock. Note that
-            // for xblocks that can't be replaced inline, the entire parent will be refreshed.
-            var self = this,
-                parentElement = self.findXBlockElement(xblockElement.parent()),
-                scrollOffset = ViewUtils.getScrollOffset(xblockElement),
-                $placeholderEl = $(self.createPlaceholderElement()),
-                placeholderElement;
-
-            placeholderElement = $placeholderEl.insertAfter(xblockElement);
-            XBlockUtils.duplicateXBlock(xblockElement, parentElement)
-                .done(function(data) {
-                    self.onNewXBlock(placeholderElement, scrollOffset, true, data);
-                })
-                .fail(function() {
-                    // Remove the placeholder if the update failed
-                    placeholderElement.remove();
-                });
-        },
-
         duplicateXBlock: function(event) {
             event.preventDefault();
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'duplicateXBlock',
+                            payload: {}
+                        }, document.referrer
+                    );
+                }
+            } catch (e) {
+                console.error(e);
+            }
             this.duplicateComponent(this.findXBlockElement(event.target));
         },
 
         showMoveXBlockModal: function(event) {
             var xblockElement = this.findXBlockElement(event.target),
                 parentXBlockElement = xblockElement.parents('.studio-xblock-wrapper'),
+                sourceXBlockInfo = XBlockUtils.findXBlockInfo(xblockElement, this.model),
+                sourceParentXBlockInfo = XBlockUtils.findXBlockInfo(parentXBlockElement, this.model),
                 modal = new MoveXBlockModal({
-                sourceXBlockInfo: XBlockUtils.findXBlockInfo(xblockElement, this.model),
-                sourceParentXBlockInfo: XBlockUtils.findXBlockInfo(parentXBlockElement, this.model),
-                XBlockURLRoot: this.getURLRoot(),
-                outlineURL: this.options.outlineURL
-            });
+                    sourceXBlockInfo: sourceXBlockInfo,
+                    sourceParentXBlockInfo: sourceParentXBlockInfo,
+                    XBlockURLRoot: this.getURLRoot(),
+                    outlineURL: this.options.outlineURL
+                });
+
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'showMoveXBlockModal',
+                            payload: {
+                                sourceXBlockInfo: {
+                                  id: sourceXBlockInfo.attributes.id,
+                                  displayName: sourceXBlockInfo.attributes.display_name,
+                                },
+                                sourceParentXBlockInfo: {
+                                  id: sourceParentXBlockInfo.attributes.id,
+                                  category: sourceParentXBlockInfo.attributes.category,
+                                  hasChildren: sourceParentXBlockInfo.attributes.has_children,
+                                },
+                            },
+                        }, document.referrer
+                    );
+                    return true;
+                }
+            } catch (e) {
+                console.error(e);
+            }
 
             event.preventDefault();
             modal.show();
@@ -577,6 +702,18 @@ function($, _, Backbone, gettext, BasePage,
 
         deleteXBlock: function(event) {
             event.preventDefault();
+            try {
+                if (this.options.isIframeEmbed) {
+                    window.parent.postMessage(
+                        {
+                            type: 'deleteXBlock',
+                            payload: {}
+                        }, document.referrer
+                    );
+                }
+            } catch (e) {
+                console.error(e);
+            }
             this.deleteComponent(this.findXBlockElement(event.target));
         },
 
@@ -725,9 +862,10 @@ function($, _, Backbone, gettext, BasePage,
                 var matchBlockTypeFromLocator = /\@(.*?)\+/;
                 var blockType = data.locator.match(matchBlockTypeFromLocator);
             }
-            if((useNewTextEditor === 'True' && blockType.includes('html'))
+            // open mfe editors for new blocks only and not for content imported from libraries
+            if(!data.hasOwnProperty('upstreamRef') && ((useNewTextEditor === 'True' && blockType.includes('html'))
                     || (useNewVideoEditor === 'True' && blockType.includes('video'))
-                    || (useNewProblemEditor === 'True' && blockType.includes('problem'))
+                    || (useNewProblemEditor === 'True' && blockType.includes('problem')))
             ){
                 var destinationUrl;
                 if (useVideoGalleryFlow === "True" && blockType.includes("video")) {
diff --git a/cms/static/js/views/pages/container_subviews.js b/cms/static/js/views/pages/container_subviews.js
index b32c86ae8dec..cfb47c7cd895 100644
--- a/cms/static/js/views/pages/container_subviews.js
+++ b/cms/static/js/views/pages/container_subviews.js
@@ -506,9 +506,13 @@ function($, _, gettext, BaseView, ViewUtils, XBlockViewUtils, MoveXBlockUtils, H
         },
 
         renderTagElements: function(tags, depth, parentId) {
+            /* This function displays the tags in the sidebar of the legacy Unit Outline Page.
+             * It is not used when the Authoring MFE iframes a component in the Unit Outline. */
+            const parentElement = document.querySelector(`.content-tags-${parentId}`);
+            if (!parentElement) return;
+
             const tagListElement = this;
             tags.forEach(function(tag) {
-                const parentElement = document.querySelector(`.content-tags-${parentId}`);
                 var tagContentElement = document.createElement('div'),
                     tagValueElement = document.createElement('span');
 
diff --git a/cms/static/js/views/settings/main.js b/cms/static/js/views/settings/main.js
index 4f3bf0bb2733..5b7a25dbde95 100644
--- a/cms/static/js/views/settings/main.js
+++ b/cms/static/js/views/settings/main.js
@@ -388,9 +388,6 @@ function(ValidatingView, CodeMirror, _, $, ui, DateUtils, FileUploadModel,
                     Hides and clears the certificate available date field if a display behavior that doesn't use it is
                     chosen. Because we are clearing it, toggling back to "end_with_date" will require re-entering the date
                     */
-            if (!this.useV2CertDisplaySettings) {
-                return;
-            }
             // eslint-disable-next-line prefer-const
             let showDatepicker = this.model.get('certificates_display_behavior') == 'end_with_date';
             // eslint-disable-next-line prefer-const
diff --git a/cms/static/sass/_build-v1.scss b/cms/static/sass/_build-v1.scss
index 178f6b167473..7aedd0c6b8a3 100644
--- a/cms/static/sass/_build-v1.scss
+++ b/cms/static/sass/_build-v1.scss
@@ -77,7 +77,6 @@
 @import 'views/group-configuration';
 @import 'views/video-upload';
 @import 'views/certificates';
-@import 'views/maintenance';
 
 // +Base - Contexts
 // ====================
diff --git a/cms/static/sass/assets/_graphics.scss b/cms/static/sass/assets/_graphics.scss
index 2230e0aca7ee..afb830d5dd71 100644
--- a/cms/static/sass/assets/_graphics.scss
+++ b/cms/static/sass/assets/_graphics.scss
@@ -66,3 +66,17 @@
   height: ($baseline*3);
   background: url('#{$static-path}/images/large-library-icon.png') center no-repeat;
 }
+
+.large-library_v2-icon {
+  display: inline-block;
+  width: ($baseline*3);
+  height: ($baseline*3);
+  background: url('#{$static-path}/images/large-library_v2-icon.png') center no-repeat;
+}
+
+.large-itembank-icon {
+  display: inline-block;
+  width: ($baseline*3);
+  height: ($baseline*3);
+  background: url('#{$static-path}/images/large-itembank-icon.png') center no-repeat;
+}
diff --git a/cms/static/sass/course-unit-mfe-iframe-bundle.scss b/cms/static/sass/course-unit-mfe-iframe-bundle.scss
new file mode 100644
index 000000000000..a71882f1c355
--- /dev/null
+++ b/cms/static/sass/course-unit-mfe-iframe-bundle.scss
@@ -0,0 +1,658 @@
+@import 'cms/theme/variables-v1';
+@import 'elements/course-unit-mfe-iframe';
+
+.wrapper {
+  .wrapper-xblock {
+    background-color: $transparent;
+    border-radius: 6px;
+    border: none;
+
+    &:hover {
+      border-color: none;
+    }
+
+    .xblock-header-primary {
+      padding: ($baseline * 1.2) ($baseline * 1.2) ($baseline / 1.67);
+      border-bottom: none;
+
+      .header-details .xblock-display-name {
+        font-size: 22px;
+        line-height: 28px;
+        font-weight: 700;
+        color: $black;
+      }
+    }
+
+    &.level-element {
+      box-shadow: 0 2px 4px rgba(0, 0, 0, .15), 0 2px 8px rgba(0, 0, 0, .15);
+      margin: 0 0 ($baseline * 1.4) 0;
+    }
+
+    &.level-element .xblock-header-primary {
+      background-color: $white;
+    }
+
+    &.level-element .xblock-render {
+      background: $white;
+      margin: 0;
+      padding: $baseline;
+      border-bottom-left-radius: 6px;
+      border-bottom-right-radius: 6px;
+    }
+
+    .wrapper-xblock .header-actions .actions-list .action-item .action-button {
+      @extend %button-styles;
+
+      color: $primary;
+
+      .fa-ellipsis-v {
+        font-size: $base-font-size;
+      }
+
+      &:hover {
+        background-color: $primary;
+        color: $white;
+        border-color: $transparent;
+      }
+
+      &:focus {
+        outline: 2px $transparent;
+        background-color: $transparent;
+        box-shadow: inset 0 0 0 2px $primary;
+        color: $primary;
+        border-color: $transparent;
+      }
+    }
+
+    .xblock-header-primary .header-actions .nav-dd .nav-sub {
+      border: 1px solid rgba(0, 0, 0, .15);
+      border-radius: 6px;
+      padding: ($baseline / 2) 0;
+      min-width: 288px;
+      right: 90px;
+
+      .nav-item {
+        border-bottom: none;
+        color: $dark;
+        font-size: $base-font-size;
+
+        a {
+          padding: ($baseline / 2) ($baseline / 1.25);
+        }
+
+        &:hover {
+          background-color: #f2f0ef;
+          color: $dark;
+        }
+
+        a:hover {
+          color: $dark;
+        }
+
+        a:focus {
+          outline: none;
+        }
+
+        &:active {
+          background-color: $primary;
+
+          a {
+            color: $white;
+          }
+        }
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  &.wrapper-modal-window .modal-window .modal-actions a {
+    color: $text-color;
+    background-color: $transparent;
+    border-color: $transparent;
+    box-shadow: none;
+    font-weight: 500;
+    border: 1px solid $transparent;
+    padding: ($baseline / 2) ($baseline / 1.25);
+    font-size: $base-font-size;
+    line-height: 20px;
+    border-radius: $btn-border-radius;
+    text-align: center;
+    vertical-align: middle;
+    user-select: none;
+    background-image: none;
+    display: block;
+
+    &:hover {
+      background-color: $light-background-color;
+      border-color: $transparent;
+      color: $text-color;
+    }
+
+    &:focus {
+      background: $transparent;
+      outline: none;
+    }
+  }
+
+  .modal-window.modal-editor {
+    background-color: $white;
+    border-radius: 6px;
+
+    a {
+      color: #00688d;
+    }
+
+    select {
+      &:focus {
+        background-color: $white;
+        color: $text-color;
+        outline: 0;
+        box-shadow: 0 0 0 1px $primary;
+      }
+    }
+
+    input:not([type="radio"], [type="checkbox"], [type="submit"]) {
+      @extend %input-styles;
+
+      line-height: 20px;
+      height: 44px;
+
+      &:hover {
+        border: solid 1px #002121;
+      }
+
+      &:focus {
+        color: $text-color;
+        background-color: $white;
+        border-color: $primary;
+        outline: 0;
+        box-shadow: 0 0 0 1px $primary;
+      }
+    }
+
+    #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body
+    .openassessment_training_example_essay_wrapper textarea {
+      @extend %input-styles;
+
+      box-shadow: none;
+    }
+
+    textarea {
+      @extend %input-styles;
+
+      box-shadow: none;
+
+      &#poll-question-editor,
+      &#poll-feedback-editor {
+        box-shadow: none;
+
+        &:focus {
+          color: $text-color;
+          background-color: $white;
+          border-color: $primary;
+          outline: 0;
+          box-shadow: 0 0 0 1px $primary;
+        }
+      }
+
+      &:hover {
+        border: solid 1px #002121;
+      }
+
+      &:focus {
+        color: $text-color;
+        background-color: $white;
+        border-color: $primary;
+        outline: 0;
+        box-shadow: 0 0 0 1px $primary;
+      }
+    }
+
+    .tip.setting-help {
+      color: $border-color;
+      font-size: 14px;
+      line-height: $base-font-size;
+    }
+
+    label,
+    .label.setting-label {
+      font-size: $base-font-size;
+      line-height: 28px;
+      color: $text-color;
+      font-weight: 400;
+    }
+
+    .title.modal-window-title {
+      color: $black;
+      font-weight: 700;
+      font-size: 22px;
+      line-height: 28px;
+    }
+
+    .xblock-actions {
+      background-color: $white;
+
+      .action-button {
+        background-color: $transparent;
+        border: 1px solid $transparent;
+        padding: ($baseline / 2.22) ($baseline / 1.25);
+        border-radius: $input-border-radius;
+        font-weight: 400;
+        color: #00688d;
+        font-size: $base-font-size;
+        line-height: 20px;
+        cursor: pointer;
+
+        &:focus {
+          outline: none;
+        }
+      }
+
+      .openassessment_save_button,
+      .save-button,
+      .continue-button {
+        color: $white;
+        background-color: $primary;
+        border-color: $primary;
+        box-shadow: none;
+        font-weight: 500;
+        border: 1px solid $transparent;
+        padding: ($baseline / 2) ($baseline / 1.25);
+        font-size: $base-font-size;
+        line-height: 20px;
+        border-radius: $btn-border-radius;
+        text-align: center;
+        vertical-align: middle;
+        user-select: none;
+        background-image: none;
+        height: auto;
+        display: block;
+
+        &:hover {
+          background: darken($primary, 5%);
+          border-color: $transparent;
+          color: $white;
+        }
+
+        &:focus {
+          background: $primary;
+          outline: none;
+        }
+      }
+
+      .openassessment_cancel_button,
+      .cancel-button {
+        color: $text-color;
+        background-color: $transparent;
+        border-color: $transparent;
+        box-shadow: none;
+        font-weight: 500;
+        border: 1px solid $transparent;
+        padding: ($baseline / 2) ($baseline / 1.25);
+        font-size: $base-font-size;
+        line-height: 20px;
+        border-radius: $btn-border-radius;
+        text-align: center;
+        vertical-align: middle;
+        user-select: none;
+        background-image: none;
+        display: block;
+
+        &:hover {
+          background-color: $light-background-color;
+          border-color: $transparent;
+          color: $text-color;
+        }
+
+        &:focus {
+          background: $transparent;
+          outline: none;
+        }
+      }
+    }
+  }
+
+  .modal-lg.modal-window.confirm.openassessment_modal_window {
+    height: 635px;
+  }
+}
+
+.view-container .content-primary {
+  background-color: $transparent;
+  width: 100%;
+}
+
+.wrapper-content.wrapper {
+  padding: $baseline / 4;
+}
+
+.btn-default.action-edit.title-edit-button {
+  @extend %button-styles;
+
+  position: relative;
+  top: 7px;
+
+  .fa-pencil {
+    display: none;
+  }
+
+  &::before {
+    @extend %icon-position;
+
+    content: '';
+    position: absolute;
+    background-color: $black;
+    mask: url('#{$static-path}/images/pencil-icon.svg') center no-repeat;
+  }
+
+  &:hover {
+    background-color: $primary;
+    border-color: $transparent;
+
+    &::before {
+      background-color: $white;
+    }
+  }
+
+  &:focus {
+    outline: 2px $transparent;
+    background-color: $transparent;
+    box-shadow: inset 0 0 0 2px $primary;
+    border-color: $transparent;
+
+    &:hover {
+      color: $white;
+      border-color: $transparent;
+
+      &::before {
+        background-color: $primary;
+      }
+    }
+  }
+}
+
+.library-sync-button {
+  .action-button-text {
+    display: none;
+  }
+}
+
+.action-edit {
+  .action-button-text {
+    display: none;
+  }
+
+  .edit-button.action-button {
+    @extend %button-styles;
+
+    position: relative;
+
+    .fa-pencil {
+      display: none;
+    }
+
+    &::before {
+      @extend %icon-position;
+
+      content: '';
+      position: absolute;
+      background-color: $black;
+      mask: url('#{$static-path}/images/pencil-icon.svg') center no-repeat;
+    }
+
+    &:hover {
+      background-color: $primary;
+      border-color: $transparent;
+
+      &::before {
+        background-color: $white;
+      }
+    }
+
+    &:focus {
+      outline: 2px $transparent;
+      background-color: $transparent;
+      box-shadow: inset 0 0 0 2px $primary;
+      border-color: $transparent;
+
+      &:hover {
+        color: $white;
+        border-color: $transparent;
+
+        &::before {
+          background-color: $primary;
+        }
+      }
+    }
+  }
+}
+
+.nav-dd.ui-right .nav-sub {
+  &::before,
+  &::after {
+    display: none;
+  }
+}
+
+[class*="view-"] .modal-lg.modal-editor .modal-header .editor-modes .action-item {
+  .editor-button,
+  .settings-button {
+    @extend %light-button;
+  }
+}
+
+[class*="view-"] .wrapper.wrapper-modal-window .modal-window .modal-actions .action-primary {
+  @extend %primary-button;
+}
+
+.wrapper-comp-settings {
+  .list-input.settings-list {
+    .metadata-list-enum .create-setting {
+      @extend %modal-actions-button;
+
+      background-color: $primary;
+      color: $white;
+      border: 1px solid $primary;
+      cursor: pointer;
+
+      &:hover {
+        background: darken($primary, 5%);
+        border-color: #2d494e;
+      }
+
+      &:focus {
+        background: $primary;
+        outline: none;
+      }
+    }
+  }
+
+  .list-input.settings-list {
+    .field.comp-setting-entry.is-set .setting-input {
+      color: $text-color;
+    }
+
+    select {
+      border: 1px solid $border-color;
+      border-radius: $input-border-radius;
+      color: $text-color;
+      height: 44px;
+
+      &:focus {
+        background-color: $white;
+        color: $text-color;
+        outline: 0;
+        box-shadow: 0 0 0 1px $primary;
+      }
+    }
+
+    .setting-label {
+      font-size: $base-font-size;
+      line-height: 28px;
+      color: $text-color;
+      font-weight: 400;
+    }
+
+    input[type="number"] {
+      width: 45%;
+    }
+
+    .action.setting-clear {
+      @extend %button-styles;
+
+      background-color: $transparent;
+      color: $primary;
+      border: none;
+
+      &:hover {
+        background-color: $primary;
+        color: $white;
+        border: none;
+      }
+
+      &:focus {
+        outline: 2px $transparent;
+        background-color: $transparent;
+        box-shadow: inset 0 0 0 2px $primary;
+        color: $primary;
+      }
+    }
+  }
+
+  .list-input.settings-list .metadata-list-enum .remove-setting .fa-times-circle {
+    color: $primary;
+  }
+}
+
+select {
+  border: 1px solid $border-color;
+  border-radius: $input-border-radius;
+  color: $text-color;
+  height: 44px;
+  padding: ($baseline / 2) ($baseline / 1.25);
+
+  &:focus {
+    background-color: $white;
+    color: $text-color;
+    outline: 0;
+    box-shadow: 0 0 0 1px $primary;
+  }
+}
+
+.xblock {
+  .xblock--drag-and-drop--editor .tab {
+    background-color: $white;
+    display: inline-block;
+  }
+
+  #openassessment-editor #oa_rubric_editor_wrapper {
+    .openassessment_criterion .openassessment_criterion_basic_editor .comp-setting-entry .wrapper-comp-settings label input,
+    .openassessment_criterion_option .openassessment_criterion_option_name_wrapper label,
+    .openassessment_criterion_option .openassessment_criterion_option_explanation_wrapper label,
+    .openassessment_criterion .openassessment_criterion_feedback_wrapper label,
+    #openassessment_rubric_feedback_wrapper label,
+    .openassessment_criterion_option .openassessment_criterion_option_point_wrapper label,
+    .openassessment_criterion_option .openassessment_criterion_option_name_wrapper label input,
+    .openassessment_criterion .openassessment_criterion_basic_editor .comp-setting-entry .wrapper-comp-settings .openassessment_criterion_prompt,
+    #openassessment_rubric_feedback_wrapper textarea,
+    .openassessment_criterion_option
+    .openassessment_criterion_option_explanation_wrapper label textarea,
+    input[type=number] {
+      font-size: $base-font-size;
+      background-color: $white;
+      background-image: none;
+    }
+  }
+
+  #openassessment-editor {
+    #openassessment_editor_header .editor_tabs .oa_editor_tab {
+      @extend %light-button;
+
+      padding: 0 10px;
+    }
+
+    #openassessment_editor_header,
+    .openassessment_tab_instructions {
+      background-color: $white;
+    }
+
+    #oa_schedule_editor_wrapper #dates_config_new_badge {
+      background-color: $primary;
+    }
+
+    .openassessment_description {
+      font-size: 14px;
+      line-height: $base-font-size;
+    }
+
+    #oa_rubric_editor_wrapper .openassessment_criterion
+    .openassessment_criterion_basic_editor .comp-setting-entry
+    .wrapper-comp-settings label {
+      font-size: $base-font-size;
+      line-height: 28px;
+      color: $text-color;
+      font-weight: 400;
+    }
+
+    #oa_rubric_editor_wrapper .openassessment_criterion_option
+    .openassessment_criterion_option_point_wrapper label input {
+      min-width: 70px;
+      font-size: 18px;
+      height: 44px;
+    }
+
+    .openassessment_assessment_module_settings_editor:hover {
+      border-color: $primary;
+
+      .drag-handle {
+        background-color: $primary;
+        border-color: $primary;
+      }
+    }
+
+    .setting-help,
+    .ti.wrapper-comp-settings .list-input.settings-list .setting-help {
+      color: $border-color;
+      font-size: 14px;
+      line-height: $base-font-size;
+    }
+  }
+
+  .xblock--drag-and-drop--editor .btn,
+  #openassessment-editor .openassessment_container_add_button,
+  #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_add_option,
+  #student_training_settings_editor .openassessment_add_training_example {
+    @extend %primary-button;
+  }
+}
+
+.xblock-header-primary {
+  position: relative;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 83px;
+    left: 25px;
+    width: 95%;
+    height: 1px;
+    background-color: #eae6e5;
+  }
+}
+
+.ui-loading {
+  background-color: #f8f7f6;
+  box-shadow: none;
+
+  .spin,
+  .copy {
+    color: $primary;
+  }
+}
+
+.wrapper-comp-setting.metadata-list-enum .action.setting-clear.active {
+  margin-top: 0;
+}
diff --git a/cms/static/sass/elements/_course-unit-mfe-iframe.scss b/cms/static/sass/elements/_course-unit-mfe-iframe.scss
new file mode 100644
index 000000000000..dc7510994228
--- /dev/null
+++ b/cms/static/sass/elements/_course-unit-mfe-iframe.scss
@@ -0,0 +1,65 @@
+%button-styles {
+  width: 44px;
+  height: 44px;
+  border-radius: 50%;
+}
+
+%input-styles {
+  font-size: $base-font-size;
+  color: $text-color !important;
+  background-color: $white;
+  border: 1px solid $border-color !important;
+  border-radius: $input-border-radius !important;
+  padding: 10px 16px !important;
+  background-image: none;
+  transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+}
+
+%modal-actions-button {
+  font-size: $base-font-size;
+  line-height: 20px;
+  padding: 10px 16px;
+  border-radius: $btn-border-radius;
+}
+
+%primary-button {
+  @extend %modal-actions-button;
+
+  background-color: $primary;
+  color: $white;
+  border: 1px solid $primary;
+  cursor: pointer;
+  background-image: none;
+  display: block;
+
+  &:hover {
+    background: darken($primary, 5%);
+    border-color: #2d494e;
+    box-shadow: none;
+    color: $white;
+  }
+
+  &:focus {
+    background: $primary;
+    outline: none;
+    box-shadow: none;
+  }
+}
+
+%light-button {
+  @extend %modal-actions-button;
+
+  color: $black;
+  background-color: $light-background-color;
+  border-color: $light-background-color;
+  box-shadow: none;
+  border: 1px solid $transparent;
+  font-weight: 500;
+}
+
+%icon-position {
+  top: 11px;
+  left: 11px;
+  width: 20px;
+  height: 20px;
+}
diff --git a/cms/static/sass/elements/_drawer.scss b/cms/static/sass/elements/_drawer.scss
index 96edfe1983f1..75355b6d7a3c 100644
--- a/cms/static/sass/elements/_drawer.scss
+++ b/cms/static/sass/elements/_drawer.scss
@@ -1,7 +1,8 @@
 // studio - elements - side drawers
 // ====================
 
-.drawer-cover {
+.drawer-cover,
+.picker-cover {
   @extend %ui-depth3;
 
   display: none;
@@ -13,7 +14,8 @@
   background: rgba(0, 0, 0, 0.8);
 }
 
-.drawer-cover.gray-cover {
+.drawer-cover.gray-cover,
+.picker-cover.gray-cover {
   background: rgba(112, 112, 112, 0.8);
 }
 
@@ -29,6 +31,20 @@
   background-color: $gray-l4;
 }
 
-body.drawer-open {
+body.drawer-open,
+body.picker-open {
   overflow: hidden;
 }
+
+.picker {
+  @extend %ui-depth4;
+
+  display: none;
+  position: fixed;
+  top: 1em;
+  left: 1em;
+  right: 1em;
+  bottom: 1em;
+  background-color: $gray-l4;
+}
+
diff --git a/cms/static/sass/elements/_modules.scss b/cms/static/sass/elements/_modules.scss
index 7812a221b4f5..1e9f52691fc8 100644
--- a/cms/static/sass/elements/_modules.scss
+++ b/cms/static/sass/elements/_modules.scss
@@ -140,12 +140,13 @@
         position: relative;
         display: inline-block;
         width: ($baseline*6.25);
-        height: ($baseline*5);
+        height: ($baseline*7);
         margin-bottom: ($baseline/2);
         box-shadow: 0 1px 1px $shadow, 0 1px 0 rgba(255, 255, 255, 0.4) inset;
         border-radius: ($baseline/4);
         padding: 0;
         text-align: center;
+        vertical-align: top;
 
         @extend %btn-primary-green;
 
@@ -154,6 +155,21 @@
           display: block;
           color: $white;
         }
+
+        .beta {
+          margin-top: 3px;
+          margin-bottom: -20px;
+          padding: 4px;
+          display: inline-block;
+
+          color: $uxpl-green-base;
+          background-color: theme-color("inverse");
+          border-color: theme-color("inverse");
+          border-radius: 3px;
+
+          font-size: 90%;
+          line-height: 90%;
+        }
       }
     }
   }
diff --git a/cms/static/sass/elements/_vendor.scss b/cms/static/sass/elements/_vendor.scss
index 5418745922f9..b57fa04175c2 100644
--- a/cms/static/sass/elements/_vendor.scss
+++ b/cms/static/sass/elements/_vendor.scss
@@ -66,13 +66,6 @@
   z-index: 100000 !important;
 }
 
-//jQuery loupeAndLightbox Plugin
-.zooming-image-place {
-  .larger {
-    left: 0 !important;
-    bottom: 100% !important;
-  }
-}
 // ====================
 
 // reset styles to remove ui-lightness jquery ui theme from the tabs component (used in the add component problem tab menu)
diff --git a/cms/static/sass/partials/cms/theme/_variables-v1.scss b/cms/static/sass/partials/cms/theme/_variables-v1.scss
index c2ff073b94b1..a008210b25b2 100644
--- a/cms/static/sass/partials/cms/theme/_variables-v1.scss
+++ b/cms/static/sass/partials/cms/theme/_variables-v1.scss
@@ -304,3 +304,12 @@ $state-danger-bg: #f2dede !default;
 $state-danger-border: darken($state-danger-bg, 5%) !default;
 
 $text-dark-black-blue: #2c3e50;
+
+$primary: #0a3055 !default;
+$btn-border-radius: 6px !default;
+$input-border-radius: 6px !default;
+$text-color: #454545 !default;
+$light-background-color: #e1dddb !default;
+$border-color: #707070 !default;
+$base-font-size: 18px !default;
+$dark: #212529;
diff --git a/cms/static/sass/views/_container.scss b/cms/static/sass/views/_container.scss
index 5a674ba6e03a..ee48e71deb74 100644
--- a/cms/static/sass/views/_container.scss
+++ b/cms/static/sass/views/_container.scss
@@ -562,7 +562,74 @@
   }
 }
 
+// Modal for previewing changes to a library-sourced block
+// cms/static/js/views/modals/preview_v2_library_changes.js
+.modal-lib-preview {
+  .modal-content {
+    padding: 0 !important;
+
+    & > iframe {
+      width: 100%;
+      min-height: 450px;
+      background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
+    }
+  }
+}
+
 .ltiLaunchFrame{
     width:100%;
     height:100%
 }
+
+// Modal for adding components from libary using component picker
+// cms/static/js/views/components/add_library_content_with_picker.js
+.modal-add-component-picker {
+  top: 10%;
+  padding: 0px !important;
+  .modal-content {
+    padding: 0 !important;
+    border-radius: ($baseline/5);
+
+    & > iframe {
+      width: 100%;
+      min-height: 80vh;
+      background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
+      border-radius: ($baseline/5);
+    }
+  }
+}
+
+.modal-alert {
+    display: flex;
+    align-items: center;
+    padding: $baseline;
+    margin-bottom: $baseline;
+
+    &.warning {
+        background-color: $state-warning-bg;
+
+        .fa-warning {
+            color: $orange;
+            margin-right: $baseline;
+        }
+    }
+
+    .action-btn {
+        text-wrap: nowrap;
+        background-color: $black;
+        color: $white;
+        margin-left: auto;
+        padding: ($baseline/2);
+
+        .fa {
+            margin-left: ($baseline/4);
+            color: $white
+        }
+
+        &:hover,
+        &:focus,
+        &:active {
+            background-color: lighten($black, 20%);
+        }
+    }
+}
diff --git a/cms/static/sass/views/_maintenance.scss b/cms/static/sass/views/_maintenance.scss
deleted file mode 100644
index 58d1b7494751..000000000000
--- a/cms/static/sass/views/_maintenance.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-.maintenance-header {
-  text-align: center;
-  margin-top: 50px;
-
-  h2 {
-    margin-bottom: 10px;
-  }
-}
-
-.maintenance-content {
-  padding: 3rem 0;
-
-  .maintenance-list {
-    max-width: 1280px;
-    margin: 0 auto;
-
-    .view-list-container {
-      padding: 10px 15px;
-      background-color: #fff;
-      border-bottom: 1px solid #ddd;
-
-      &:hover {
-        background-color: #fafafa;
-      }
-
-      .view-name {
-        display: inline-block;
-        width: 20%;
-        float: left;
-      }
-
-      .view-desc {
-        display: inline-block;
-        width: 80%;
-        font-size: 15px;
-      }
-    }
-  }
-
-  .maintenance-form {
-    width: 60%;
-    margin: auto;
-
-    .result-list {
-      height: calc(100vh - 200px);
-      overflow: auto;
-    }
-
-    .result {
-      box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
-      margin-top: 15px;
-      padding: 15px 30px;
-      background: #f9f9f9;
-    }
-
-    li {
-      font-size: 13px;
-      line-height: 9px;
-    }
-
-    .actions {
-      text-align: right;
-    }
-
-    .field-radio div {
-      display: inline-block;
-      margin-right: 10px;
-    }
-
-    div.error {
-      color: #f00;
-      margin-top: 10px;
-      font-size: 13px;
-    }
-
-    div.head-output {
-      font-size: 13px;
-      margin-bottom: 10px;
-    }
-
-    div.main-output {
-      color: #0a0;
-      font-size: 15px;
-    }
-  }
-
-  .announcement-container {
-    width: 100%;
-    text-align: center;
-
-    .announcement-item {
-      display: inline-block;
-      max-width: 300px;
-      min-width: 300px;
-      margin: 15px;
-
-      .announcement-content {
-        background-color: $body-bg;
-        text-align: center;
-        padding: 22px 33px;
-      }
-    }
-  }
-}
diff --git a/cms/templates/container.html b/cms/templates/container.html
index 058587e6bbe1..007d94bb0975 100644
--- a/cms/templates/container.html
+++ b/cms/templates/container.html
@@ -52,6 +52,7 @@
                 isUnitPage: ${is_unit_page | n, dump_js_escaped_json},
                 canEdit: true,
                 outlineURL: "${outline_url | n, js_escaped_string}",
+                libraryContentPickerUrl: "${library_content_picker_url | n, js_escaped_string}",
                 clipboardData: ${user_clipboard | n, dump_js_escaped_json},
             }
         );
diff --git a/cms/templates/container_chromeless.html b/cms/templates/container_chromeless.html
new file mode 100644
index 000000000000..2fe821e49d5e
--- /dev/null
+++ b/cms/templates/container_chromeless.html
@@ -0,0 +1,278 @@
+## coding=utf-8
+## mako
+##
+## Studio view template for rendering the whole Unit in an iframe with
+## XBlocks controls specifically for Authoring MFE. This template renders
+## a chromeless version of a unit container without headers, footers,
+## and a navigation bar.
+
+<%! main_css = "style-main-v1" %>
+
+<%! course_unit_mfe_iframe_css = "course-unit-mfe-iframe-bundle" %>
+
+<%namespace name='static' file='static_content.html'/>
+<%!
+from django.urls import reverse
+from django.utils.translation import gettext as _
+
+from cms.djangoapps.contentstore.config.waffle import CUSTOM_RELATIVE_DATES
+from cms.djangoapps.contentstore.helpers import xblock_type_display_name
+from lms.djangoapps.branding import api as branding_api
+from openedx.core.djangoapps.util.user_messages import PageLevelMessages
+from openedx.core.djangolib.js_utils import (
+    dump_js_escaped_json, js_escaped_string
+)
+from openedx.core.djangolib.markup import HTML, Text
+from openedx.core.release import RELEASE_LINE
+%>
+
+<%page expression_filter="h"/>
+<!doctype html>
+<!--[if lte IE 9]><html class="ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
+<!--[if !IE]><<!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
+    <head dir="${static.dir_rtl()}">
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="openedx-release-line" content="${RELEASE_LINE}" />
+        <title>
+            ${xblock.display_name_with_default} ${xblock_type_display_name(xblock)} |
+            % if context_course:
+            <% ctx_loc = context_course.location %>
+            ${context_course.display_name_with_default} |
+            % elif context_library:
+            ${context_library.display_name_with_default} |
+            % endif
+            ${settings.STUDIO_NAME}
+        </title>
+
+        <%
+        jsi18n_path = "js/i18n/{language}/djangojs.js".format(language=LANGUAGE_CODE)
+        %>
+
+        % if getattr(settings, 'CAPTURE_CONSOLE_LOG', False):
+            <script type="text/javascript">
+                var oldOnError = window.onerror;
+                window.localStorage.setItem('console_log_capture', JSON.stringify([]));
+
+                window.onerror = function (message, url, lineno, colno, error) {
+                    if (oldOnError) {
+                        oldOnError.apply(this, arguments);
+                    }
+
+                    var messages = JSON.parse(window.localStorage.getItem('console_log_capture'));
+                    messages.push([message, url, lineno, colno, (error || {}).stack]);
+                    window.localStorage.setItem('console_log_capture', JSON.stringify(messages));
+                }
+            </script>
+        % endif
+
+        <script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
+        % if settings.DEBUG:
+        ## Provides a fallback for gettext functions in development environment
+        <script type="text/javascript" src="${static.url('js/src/gettext_fallback.js')}"></script>
+        % endif
+        <meta name="viewport" content="width=device-width,initial-scale=1">
+        <meta name="path_prefix" content="${EDX_ROOT_URL}">
+        <% favicon_url = branding_api.get_favicon_url() %>
+        <link rel="icon" type="image/x-icon" href="${favicon_url}"/>
+        <%static:css group='style-vendor'/>
+        <%static:css group='style-vendor-tinymce-content'/>
+        <%static:css group='style-vendor-tinymce-skin'/>
+
+        % if uses_bootstrap:
+        <link rel="stylesheet" href="${static.url(self.attr.main_css)}" type="text/css" media="all" />
+        % else:
+        <%static:css group='${self.attr.main_css}'/>
+        % endif
+
+        <%static:css group='${self.attr.course_unit_mfe_iframe_css}'/>
+
+        <%include file="widgets/segment-io.html" />
+
+        % for template_name in templates:
+        <script type="text/template" id="${template_name}-tpl">
+            <%static:include path="js/${template_name}.underscore" />
+        </script>
+        % endfor
+        <script type="text/template" id="image-modal-tpl">
+            <%static:include path="common/templates/image-modal.underscore" />
+        </script>
+        <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
+        ## The following stylesheets are included for studio-frontend debugging.
+        ## Remove this as part of studio frontend deprecation.
+        ## https://github.com/openedx/studio-frontend/issues/381
+        % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
+            <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
+            <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
+        % endif
+    </head>
+
+    <body class="${static.dir_rtl()} is-signedin course container view-container lang_${LANGUAGE_CODE}">
+
+        <a class="nav-skip" href="#main">${_("Skip to main content")}</a>
+
+        <%static:js group='base_vendor'/>
+
+        <%static:webpack entry="commons"/>
+
+        <script type="text/javascript">
+        window.baseUrl = "${settings.STATIC_URL | n, js_escaped_string}";
+        require.config({
+            baseUrl: window.baseUrl
+        });
+        </script>
+
+        <script type="text/javascript" src="${static.url("cms/js/require-config.js")}"></script>
+
+        <!-- view -->
+        <div class="wrapper wrapper-view" dir="${static.dir_rtl()}">
+        <%
+        banner_messages = list(PageLevelMessages.user_messages(request))
+        %>
+
+        % if banner_messages:
+            <div class="page-banner">
+            <div class="user-messages">
+                % for message in banner_messages:
+                <div class="alert ${message.css_class}" role="alert">
+                    <span class="icon icon-alert fa ${message.icon_class}" aria-hidden="true"></span>
+                    ${HTML(message.message_html)}
+                </div>
+                % endfor
+            </div>
+            </div>
+        % endif
+
+        <main id="main" aria-label="Content" tabindex="-1">
+            <div id="content">
+
+                <div class="wrapper-content wrapper">
+                    <div class="inner-wrapper">
+                        <section class="content-area">
+                            <article class="content-primary ${'content-primary-fullwidth' if is_fullwidth_content else ''}">
+                                <%
+                                    assets_url = reverse('assets_handler', kwargs={'course_key_string': str(xblock_locator.course_key)})
+                                %>
+                                <section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${xblock_locator}" data-course-key="${xblock_locator.course_key}" data-course-assets="${assets_url}">
+                                </section>
+                                <div class="ui-loading">
+                                    <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
+                                </div>
+                            </article>
+                        </section>
+                    </div>
+                </div>
+            </div>
+        </main>
+        </div>
+
+        <div id="page-prompt"></div>
+
+        % if context_course:
+        <%static:webpack entry="js/factories/context_course"/>
+        <script type="text/javascript">
+            window.course = new ContextCourse({
+            id: "${context_course.id | n, js_escaped_string}",
+            name: "${context_course.display_name_with_default | n, js_escaped_string}",
+            url_name: "${context_course.location.block_id | n, js_escaped_string}",
+            org: "${context_course.location.org | n, js_escaped_string}",
+            num: "${context_course.location.course | n, js_escaped_string}",
+            display_course_number: "${context_course.display_coursenumber | n, js_escaped_string}",
+            revision: "${context_course.location.branch | n, js_escaped_string}",
+            self_paced: ${ context_course.self_paced | n, dump_js_escaped_json },
+            is_custom_relative_dates_active: ${CUSTOM_RELATIVE_DATES.is_enabled(context_course.id) | n, dump_js_escaped_json},
+            start: ${context_course.start | n, dump_js_escaped_json},
+            discussions_settings: ${context_course.discussions_settings | n, dump_js_escaped_json}
+            });
+        </script>
+        % endif
+        <script type="text/javascript">
+        require(['js/factories/base'], function () {});
+        </script>
+
+        <%static:webpack entry="js/factories/container">
+            ContainerFactory(
+                ${component_templates | n, dump_js_escaped_json},
+                ${xblock_info | n, dump_js_escaped_json},
+                "${action | n, js_escaped_string}",
+                {
+                    isUnitPage: ${is_unit_page | n, dump_js_escaped_json},
+                    canEdit: true,
+                    outlineURL: "${outline_url | n, js_escaped_string}",
+                    clipboardData: ${user_clipboard | n, dump_js_escaped_json},
+                    isIframeEmbed: true,
+                }
+            );
+        </%static:webpack>
+    </body>
+
+    ## Initialize MutationObserver and ResizeObserver to update the iframe size.
+    ## These are used to provide resize events for the Authoring MFE.
+    <script type="text/javascript">
+    (function() {
+        // If this view is rendered in an iframe within the authoring microfrontend app
+        // it will report the height of its contents to the parent window when the
+        // document loads, window resizes, or DOM mutates.
+        if (window !== window.parent) {
+            var lastHeight = window.parent[0].offsetHeight;
+            var lastWidth = window.parent[0].offsetWidth;
+            var contentElement = document.getElementById('content');
+
+            function dispatchResizeMessage(event) {
+                // Note: event is actually an Array of MutationRecord objects when fired from the MutationObserver
+                var isLoadEvent = event.type === 'load';
+                var newHeight = contentElement.offsetHeight;
+                var newWidth = contentElement.offsetWidth;
+
+                // Monitor for messages and checks if the message contains an id. If
+                // there is an id, then the location of the selected focus element
+                // is sent through its offset attribute. The offset will allow the
+                // page to scroll to the location of the focus element so that it is
+                // at the top of the page. Unique ids and names are required for
+                // proper scrolling.
+                window.addEventListener('message', function (event) {
+                    if (event.data.hashName) {
+                        var targetId = event.data.hashName;
+                        var targetName = event.data.hashName.slice(1);
+                        // Checks if the target uses an id or name to focus and gets offset.
+                        var targetOffset = $(targetId).offset() || $(document.getElementsByName(targetName)[0]).offset();
+                        window.parent.postMessage({ 'offset': targetOffset.top }, document.referrer);
+                    }
+                })
+
+                window.parent.postMessage(
+                    {
+                        type: 'plugin.resize',
+                        payload: {
+                            width: newWidth,
+                            height: newHeight,
+                        }
+                    }, document.referrer
+                );
+
+                lastHeight = newHeight;
+                lastWidth = newWidth;
+
+                // Within the authoring microfrontend the iframe resizes to match the
+                // height of this document and it should never scroll. It does scroll
+                // ocassionally when javascript is used to focus elements on the page
+                // before the parent iframe has been resized to match the content
+                // height. This window.scrollTo is an attempt to keep the content at the
+                // top of the page.
+                window.scrollTo(0, 0);
+            }
+
+            // Create an observer instance linked to the callback function
+            const observer = new MutationObserver(dispatchResizeMessage);
+
+            // Start observing the target node for configured mutations
+            observer.observe(document.body, { attributes: true, childList: true, subtree: true });
+
+            window.addEventListener('load', dispatchResizeMessage);
+
+            const resizeObserver = new ResizeObserver(dispatchResizeMessage);
+            resizeObserver.observe(document.body);
+        }
+    }());
+    </script>
+</html>
diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html
index 16d9ccbd4ca5..61f524123b48 100644
--- a/cms/templates/course_outline.html
+++ b/cms/templates/course_outline.html
@@ -76,14 +76,18 @@ <h2 class="title title-3">${_("This course was created as a re-run. Some manual
                 ${_("This course run is using an upgraded version of edx discussion forum. In order to display the discussions sidebar, discussions xBlocks will no longer be visible to learners.")}
             </div>
             <div style="margin-left:auto; width:fit-content;">
+              %if settings.DISCUSSIONS_INCONTEXT_LEARNMORE_URL:
                 <span>
                     <a href="${settings.DISCUSSIONS_INCONTEXT_LEARNMORE_URL}" target="_blank" rel="noreferrer noopener">${_(" Learn more")}</a>
                     <i class="fa fa-share-square-o" aria-hidden="true"></i>
                 </span>
+              %endif
+              %if settings.DISCUSSIONS_INCONTEXT_FEEDBACK_URL:
                 <span style="margin-left: 1rem">
                     <a href="${settings.DISCUSSIONS_INCONTEXT_FEEDBACK_URL}" target="_blank" rel="noreferrer noopener">${_("Share feedback")}</a>
                     <i class="fa fa-share-square-o" aria-hidden="true"></i>
                 </span>
+              %endif
             </div>
         </div>
       </div>
@@ -162,7 +166,7 @@ <h2 class="title title-3">${_("This course has proctored exam settings that are
             % if mfe_proctored_exam_settings_url:
               <% url_encoded_course_id = quote(str(context_course.id).encode('utf-8'), safe='') %>
               ${Text(_("To update these settings go to the {link_start}Proctored Exam Settings page{link_end}.")).format(
-                link_start=HTML('<a href="${mfe_proctored_exam_settings_url}">').format(
+                link_start=HTML('<a href="{mfe_proctored_exam_settings_url}">').format(
                         mfe_proctored_exam_settings_url=mfe_proctored_exam_settings_url
                 ),
                 link_end=HTML("</a>")
diff --git a/cms/templates/emails/course_creator_admin_user_pending.txt b/cms/templates/emails/course_creator_admin_user_pending.txt
index 7a7d41744dc8..b8eed75e20da 100644
--- a/cms/templates/emails/course_creator_admin_user_pending.txt
+++ b/cms/templates/emails/course_creator_admin_user_pending.txt
@@ -1,5 +1,5 @@
 <%! from django.utils.translation import gettext as _ %>
-${_("User '{user}' with e-mail {email} has requested {studio_name} course creator privileges on edge.").format(
+${_("User '{user}' with e-mail {email} has requested {studio_name} course creator privileges.").format(
     user=user_name, email=user_email, studio_name=settings.STUDIO_SHORT_NAME,
 )}
 ${_("To grant or deny this request, use the course creator admin table.")}
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 766d68da780c..e55859730729 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -348,9 +348,6 @@ <h3 class="course-title">${course_info['display_name']}</h3>
         % endif
 
         % if libraries_enabled:
-            % if redirect_to_library_authoring_mfe:
-            <li><a href="${library_authoring_mfe_url}">${_("Libraries")}</a></li>
-            %else:
              <li class="libraries-tab ${ 'active' if active_tab == 'libraries' else ''}">
                 % if split_studio_home:
                   <a href="${reverse('home_library')}">${_("Libraries")}</a>
@@ -358,7 +355,6 @@ <h3 class="course-title">${course_info['display_name']}</h3>
                   <a href="#" >${_("Libraries")}</a>
                 % endif
              </li>
-            % endif
         % endif
         % if taxonomies_enabled:
             <li><a href="${taxonomy_list_mfe_url}">${_("Taxonomies")}</li>
diff --git a/cms/templates/js/add-xblock-component-button.underscore b/cms/templates/js/add-xblock-component-button.underscore
index cf2e0b6aadd5..df100d6dfcd1 100644
--- a/cms/templates/js/add-xblock-component-button.underscore
+++ b/cms/templates/js/add-xblock-component-button.underscore
@@ -6,4 +6,7 @@
   <span class="large-template-icon large-<%- type %>-icon"></span>
   <span class="sr"> <%- gettext("Add Component:") %></span>
   <span class="name"><%- display_name %></span>
+  <% if (beta) { %>
+  <span class="beta"><%- gettext("Beta") %></span>
+  <% } %>
 </button>
diff --git a/cms/templates/js/basic-modal.underscore b/cms/templates/js/basic-modal.underscore
index 4273fe4f9956..8f4d4a32bbb9 100644
--- a/cms/templates/js/basic-modal.underscore
+++ b/cms/templates/js/basic-modal.underscore
@@ -4,20 +4,22 @@
     <div class="modal-window-overlay"></div>
     <div class="modal-window <%- viewSpecificClasses %> modal-<%- size %> modal-type-<%- type %>" tabindex="-1" aria-labelledby="modal-window-title">
         <div class="<%- name %>-modal">
-            <div class="modal-header">
-                <h2 id="modal-window-title" class="title modal-window-title">
-                    <%- title %>
-                    <% if (modalSRTitle) { %>
-                        <span class="sr modal-sr-title">
-                            <%- modalSRTitle %>
-                        </span>
+            <% if (title || modalSRTitle || showEditorModeButtons) { %>
+                <div class="modal-header">
+                    <h2 id="modal-window-title" class="title modal-window-title">
+                        <%- title %>
+                        <% if (modalSRTitle) { %>
+                            <span class="sr modal-sr-title">
+                                <%- modalSRTitle %>
+                            </span>
+                        <% } %>
+                    </h2>
+                    <% if (showEditorModeButtons) { %>
+                        <ul class="editor-modes action-list action-modes">
+                        </ul>
                     <% } %>
-                </h2>
-                <% if (showEditorModeButtons) { %>
-                    <ul class="editor-modes action-list action-modes">
-                    </ul>
-                <% } %>
-            </div>
+                </div>
+            <% } %>
             <div class="modal-content">
             </div>
             <div class="modal-actions">
diff --git a/cms/templates/js/edit-upstream-alert.underscore b/cms/templates/js/edit-upstream-alert.underscore
new file mode 100644
index 000000000000..d791fdb5d381
--- /dev/null
+++ b/cms/templates/js/edit-upstream-alert.underscore
@@ -0,0 +1,18 @@
+<div class="modal-alert warning" role="alert">
+    <span class="fa fa-lg fa-warning" aria-hidden="true"/><span class="sr"><%- gettext("Warning") %></span>
+    <div class="message-content">
+        <strong><%- gettext("You are editing content from a Library.") %></strong>
+        <p>
+        <%- gettext("Edits made here will only be reflected in this course. These edits may be overridden later if updates are accepted.") %>
+        </p>
+    </div>
+    <a
+        href="<%- upstreamLink %>"
+        target="_blank"
+        class="btn action-btn"
+    >
+        <%- gettext('View in Library') %>
+        <span class="fa fa-external-link" aria-hidden="true" />
+    </a>
+</div>
+
diff --git a/cms/templates/maintenance/_announcement_delete.html b/cms/templates/maintenance/_announcement_delete.html
deleted file mode 100644
index 0397ef5a0bf8..000000000000
--- a/cms/templates/maintenance/_announcement_delete.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from openedx.core.djangolib.markup import HTML, Text
-%>
-<%block name="title">${_('Delete Announcement')}</%block>
-<%block name="viewtitle">
-<h3 class="info-course">
-    <span>${_('Delete Announcement')}</span>
-</h3>
-</%block>
-
-<%block name="viewcontent">
-<section class="container maintenance-content">
-    <div id="delete-announcement-form" class="studio-view maintenance-form">
-        <div class="container-message wrapper-message">
-          <div class="message has-warnings" aria-hidden="true">
-                <p class="warning">
-                    <span class="icon fa fa-warning"></span>
-                    ${_('Are you sure you want to delete this Announcement?')}
-                </p>
-            </div>
-        </div>
-        <form action="" method="post" class="form-create announcement-container">
-            <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-            <div class="announcement-item">
-                <div class="announcement-content">
-                    ## xss-lint: disable=mako-invalid-html-filter
-                    ${object.content | n}
-                </div>
-            </div>
-            <div class="actions">
-                <button type="submit" class="action action-primary" value="Confirm">${_('Confirm')}</button>
-            </div>
-        </form>
-    </div>
-</section>
-</%block>
diff --git a/cms/templates/maintenance/_announcement_edit.html b/cms/templates/maintenance/_announcement_edit.html
deleted file mode 100644
index a9bee1c6fce2..000000000000
--- a/cms/templates/maintenance/_announcement_edit.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from openedx.core.djangolib.markup import HTML, Text
-%>
-<%block name="title">${_('Edit Announcement')}</%block>
-<%block name="viewtitle">
-<h3 class="info-course">
-    <span>${_('Edit Announcement')}</span>
-</h3>
-</%block>
-
-<%block name="viewcontent">
-<section class="container maintenance-content">
-    <div class="container studio-view maintenance-form">
-        <form class="form-create" method="post" action="${action_url}">
-            <div class="wrapper-form announcement-container">
-                <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-                <div class="announcement-item">
-                  ## xss-lint: disable=mako-invalid-html-filter
-                  ${form.as_p() | n}
-                </div>
-                <div class="actions">
-                    <button type="submit" class="action action-primary">${_('Save')}</button>
-                </div>
-            </div>
-        </form>
-    </div>
-</section>
-</%block>
-
-<%block name="header_extras">
-  <script src="${STATIC_URL}js/vendor/tinymce/js/tinymce/tinymce.full.min.js"></script>
-  <script type="text/javascript">
-      tinymce.init({
-          selector: "#id_content",
-          height: 450,
-          skin: "studio-tmce5",
-          branding: false,
-          plugins: [
-              "advlist autolink lists link image charmap print anchor",
-              "searchreplace visualblocks code",
-              "insertdatetime media table contextmenu paste"
-          ],
-          toolbar: "undo redo styleselect bold italic alignleft aligncenter alignright alignjustify bullist numlist outdent indent link image"
-      });
-  </script>
-</%block>
diff --git a/cms/templates/maintenance/_announcement_index.html b/cms/templates/maintenance/_announcement_index.html
deleted file mode 100644
index 68713c9986cc..000000000000
--- a/cms/templates/maintenance/_announcement_index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<%page expression_filter="h"/>
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.urls import reverse
-from django.utils.translation import gettext as _
-
-from openedx.core.djangolib.markup import HTML, Text
-
-%>
-<div class="studio-view maintenance-form">
-    <div class="form-create">
-        <div class="announcement-container">
-            % for announcement in announcement_list:
-                <div class="announcement-item">
-                    <div class="announcement-content">
-                        ## xss-lint: disable=mako-invalid-html-filter
-                        ${announcement.content | n}
-                    </div>
-
-                    <div class="actions-list">
-                        <span>
-                          % if announcement.active:
-                            Active <span class="icon fa fa-check-square-o" aria-hidden="true" />
-                          % else:
-                            Inactive <span class="icon fa fa-square-o" aria-hidden="true" />
-                          % endif
-                        </span>
-                        <a class="action-item announcement-edit"
-                          href="${ reverse('maintenance:announcement_edit', kwargs={'pk': announcement.pk}) }">
-                            <button class="btn-default">Edit</button>
-                        </a>
-                        <a class="action-item announcement-delete"
-                          href="${ reverse('maintenance:announcement_delete', kwargs={'pk': announcement.pk}) }">
-                            <button class="btn-default">Delete</button>
-                        </a>
-                    </div>
-                </div>
-            % endfor
-        </div>
-        <div class="actions">
-            <a href="${ reverse('maintenance:announcement_create') }">
-                <button class="action action-primary">${_('Create New')}</button>
-            </a>
-            % if is_paginated:
-                  % if page_obj.has_previous():
-                  <a href="${ reverse('maintenance:announcement_index', kwargs={'page': page_obj.previous_page_number()}) }">
-                    <button class="action action-secondary">${_('previous')}</button>
-                  </a>
-                  % endif
-
-                  % if page_obj.has_next():
-                  <a href="${ reverse('maintenance:announcement_index', kwargs={'page':  page_obj.next_page_number()}) }">
-                    <button class="action action-secondary">${_('next')}</button>
-                  </a>
-                  % endif
-            % endif
-        </div>
-    </div>
-</div>
diff --git a/cms/templates/maintenance/_force_publish_course.html b/cms/templates/maintenance/_force_publish_course.html
deleted file mode 100644
index 31cc1e8887dc..000000000000
--- a/cms/templates/maintenance/_force_publish_course.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<%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
-%>
-<div id="force-published-form" class="wrap-instructor-info studio-view maintenance-form">
-    <form id="force_publish" class="form-create" method="post">
-        <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-        <div class="wrapper-form">
-            <fieldset>
-                <legend class="sr">${_("Required data to force publish course.")}</legend>
-                <div class="list-input">
-                    <div id="course-id-container" class="field text required">
-                        <label for="course-id">${_('Course ID')}</label>
-                        <input id="course-id" type="text" name="course-id" aria-describedby="course-id-desc" required />
-                        <div id="course-id-desc" class="tip tip-stacked">${_('course-v1:edX+DemoX+Demo_Course')}</div>
-                        <div class="wrapper-error"></div>
-                    </div>
-                </div>
-            </fieldset>
-        </div>
-        <div class="actions">
-            <button type="submit" id="submit_force_publish" class="action action-primary">${_('Force Publish Course')}
-            </button>
-            <button id="reset-button" class="action action-secondary action-cancel"
-               aria-describedby="reset-values-desc">${_('Reset')}</button>
-            <span id="reset-values-desc" class="is-hidden">${_('Reset values')}</span>
-        </div>
-    </form>
-    <div id="result-error"><div class="wrapper-error"></div></div>
-    <div id="result-container" class="result-container"></div>
-</div>
diff --git a/cms/templates/maintenance/base.html b/cms/templates/maintenance/base.html
deleted file mode 100644
index 6979797a629c..000000000000
--- a/cms/templates/maintenance/base.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="../base.html" />
-<%def name='online_help_token()'><% return 'maintenance' %></%def>
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.urls import reverse
-from django.utils.translation import gettext as _
-%>
-<%block name="content">
-<div class="wrapper-content wrapper">
-    <div class="maintenance-header">
-        <h2>
-            <a href="${reverse('maintenance:maintenance_index')}">
-                <span>${_('Maintenance Dashboard')}</span>
-            </a>
-        </h2>
-        <%block name="viewtitle">
-    </%block>
-</div>
-<%block name="viewcontent"></%block>
-</%block>
diff --git a/cms/templates/maintenance/container.html b/cms/templates/maintenance/container.html
deleted file mode 100644
index 417471a1bd66..000000000000
--- a/cms/templates/maintenance/container.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.urls import reverse
-from openedx.core.djangolib.js_utils import js_escaped_string
-%>
-<%block name="title">${view['name']}</%block>
-<%block name="viewtitle">
-<h3 class="info-course">
-    <span>${view['name']}</span>
-</h3>
-</%block>
-
-<%block name="viewcontent">
-<section class="container maintenance-content">
-    <%include file="_${view['slug']}.html"/>
-</section>
-</%block>
-
-<%block name="header_extras">
-% for template_name in ["force-published-course-response"]:
-<script type="text/template" id="${template_name}-tpl">
-    <%static:include path="js/maintenance/${template_name}.underscore" />
-</script>
-% endfor
-</%block>
-
-<%block name="requirejs">
-  require(["js/maintenance/${view['slug'] | n, js_escaped_string}"], function(MaintenanceFactory) {
-      MaintenanceFactory("${reverse(view['url']) | n, js_escaped_string}");
-  });
-</%block>
diff --git a/cms/templates/maintenance/index.html b/cms/templates/maintenance/index.html
deleted file mode 100644
index 293cb90b4a9c..000000000000
--- a/cms/templates/maintenance/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from django.urls import reverse
-%>
-<%block name="title">${_('Maintenance Dashboard')}</%block>
-<%block name="viewcontent">
-<div class="container maintenance-content">
-    <ul class="maintenance-list">
-        % for view in views.values():
-        <li class="view-list-container">
-            <a class="view-name" href='${reverse(view["url"])}'>${view['name']}</a>
-            <span class="view-desc">${view['description']}</span>
-        </li>
-        % endfor
-    </ul>
-</div>
-</%block>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 15d259b8b7e6..df64bcc39361 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -43,7 +43,6 @@
             ${show_min_grade_warning | n, dump_js_escaped_json},
             ${can_show_certificate_available_date_field(context_course) | n, dump_js_escaped_json},
             "${upgrade_deadline | n, js_escaped_string}",
-            ${settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS") | n, dump_js_escaped_json}
         );
     });
 </%block>
@@ -251,58 +250,45 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
             </li>
           </ol>
 
-          <%
-            use_v2_cert_display_settings = settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False)
-          %>
           % if can_show_certificate_available_date_field(context_course):
           <ol class="list-input">
             <li class="field-group field-group-certificate-available" id="certificate-available">
               <div class="field date" id="field-certificates-display-behavior">
                 <label for="certificates-display-behavior">${_("Certificates Display Behavior")}</label>
-                % if use_v2_cert_display_settings:
-                  <select id="certificates-display-behavior">
-                    <option value="early_no_info">${_("Immediately upon passing")}</option>
-                    <option value="end">${_("End date of course")}</option>
-                    <option value="end_with_date">${_("A date after the course end date")}</option>
-                  </select>
-                % else:
-                  <input id="certificates-display-behavior" type="text">
-                % endif
+                <select id="certificates-display-behavior">
+                  <option value="early_no_info">${_("Immediately upon passing")}</option>
+                  <option value="end">${_("End date of course")}</option>
+                  <option value="end_with_date">${_("A date after the course end date")}</option>
+                </select>
                 <span class="tip tip-stacked">${_("Certificates are awarded at the end of a course run")}</span>
 
-                % if use_v2_cert_display_settings:
-                  <!-- Collapsible -->
-                  <div class="collapsible">
-                    <div id="certificate-display-behavior-collapsible-trigger" class="collapsible-trigger" role="button" tabindex="0" aria-expanded="false">
-                      <span>
-                        <span class="icon icon-inline fa fa-info-circle" aria-hidden="true"></span>
-                        ${_("Read more about this setting")}
-                      </span>
+                <!-- Collapsible -->
+                <div class="collapsible">
+                  <div id="certificate-display-behavior-collapsible-trigger" class="collapsible-trigger" role="button" tabindex="0" aria-expanded="false">
+                    <span>
+                      <span class="icon icon-inline fa fa-info-circle" aria-hidden="true"></span>
+                      ${_("Read more about this setting")}
+                    </span>
+                  </div>
+                  <div id="certificate-display-behavior-collapsible-content" class="collapsible-content collapsed">
+                    <p>${_("In all configurations of this setting, certificates are generated for learners as soon as they achieve the passing threshold in the course (which can occur before a final assignment based on course design)")}</p>
+                    <div>
+                      <div class="collapsible-description-heading">${_("Immediately upon passing")}</div>
+                      <div class="collapsible-description-description">${_("Learners can access their certificate as soon as they achieve a passing grade above the course grade threshold. Note: learners can achieve a passing grade before encountering all assignments in some course configurations.")}</div>
                     </div>
-                    <div id="certificate-display-behavior-collapsible-content" class="collapsible-content collapsed">
-                      <p>${_("In all configurations of this setting, certificates are generated for learners as soon as they achieve the passing threshold in the course (which can occur before a final assignment based on course design)")}</p>
-                      <div>
-                        <div class="collapsible-description-heading">${_("Immediately upon passing")}</div>
-                        <div class="collapsible-description-description">${_("Learners can access their certificate as soon as they achieve a passing grade above the course grade threshold. Note: learners can achieve a passing grade before encountering all assignments in some course configurations.")}</div>
-                      </div>
-                      <div>
-                        <div class="collapsible-description-heading">${_("On course end date")}</div>
-                        <div class="collapsible-description-description">${_("Learners with passing grades can access their certificate once the end date of the course has elapsed.")}</div>
-                      </div>
-                      <div>
-                        <div class="collapsible-description-heading">${_("A date after the course end date")}</div>
-                        <div class="collapsible-description-description">${_("Learners with passing grades can access their certificate after the date that you set has elapsed.")}</div>
-                      </div>
+                    <div>
+                      <div class="collapsible-description-heading">${_("On course end date")}</div>
+                      <div class="collapsible-description-description">${_("Learners with passing grades can access their certificate once the end date of the course has elapsed.")}</div>
+                    </div>
+                    <div>
+                      <div class="collapsible-description-heading">${_("A date after the course end date")}</div>
+                      <div class="collapsible-description-description">${_("Learners with passing grades can access their certificate after the date that you set has elapsed.")}</div>
                     </div>
                   </div>
-                % endif
+                </div>
               </div>
 
-              % if use_v2_cert_display_settings:
-                <div class="field date hidden" id="field-certificate-available-date" >
-              % else:
-                <div class="field date" id="field-certificate-available-date" >
-              % endif
+              <div class="field date hidden" id="field-certificate-available-date" >
                 <label for="certificate-available-date">${_("Certificates Available Date")}</label>
                 <input type="text" class="certificate-available-date date start datepicker" id="certificate-available-date" placeholder="MM/DD/YYYY" autocomplete="off" />
                 <span class="icon icon-inline fa fa-calendar-check-o datepicker-icon" aria-hidden="true"></span>
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 282629456633..41555410236a 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -8,6 +8,7 @@
     dump_js_escaped_json, js_escaped_string
 )
 from cms.djangoapps.contentstore.toggles import use_new_text_editor, use_new_problem_editor, use_new_video_editor, use_video_gallery_flow
+from cms.lib.xblock.upstream_sync import UpstreamLink
 from openedx.core.djangoapps.content_tagging.toggles import is_tagging_feature_disabled
 %>
 <%
@@ -23,6 +24,8 @@
 messages = xblock.validate().to_json()
 has_not_configured_message = messages.get('summary',{}).get('type', None) == 'not-configured'
 block_is_unit = is_unit(xblock)
+
+upstream_info = UpstreamLink.try_get_for_block(xblock)
 %>
 
 <%namespace name='static' file='static_content.html'/>
@@ -86,6 +89,10 @@
     authoring_MFE_base_url = ${get_editor_page_base_url(xblock.location.course_key)}
     data-block-type = ${xblock.scope_ids.block_type}
     data-usage-id = ${xblock.scope_ids.usage_id}
+    % if upstream_info.upstream_ref:
+        data-upstream-ref = ${upstream_info.upstream_ref}
+        data-version-synced = ${upstream_info.version_synced}
+    %endif
     >
         <div class="header-details">
             % if show_inline:
@@ -103,7 +110,22 @@
                     ${label}
                 </label>
                 % else:
-                <span class="xblock-display-name">${label}</span>
+                    % if upstream_info.upstream_ref:
+                        % if upstream_info.error_message:
+                            <!-- "broken link" icon from https://fonts.google.com/icons?selected=Material+Symbols+Outlined:link_off:FILL@0;wght@400;GRAD@0;opsz@24&icon.size=24&icon.color=%235f6368&icon.query=link -->
+                            <svg role="img" data-tooltip="${_("Sourced from a library - but the upstream link is broken/invalid.")}" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 -960 960 960" style="vertical-align: middle; padding-bottom: 4px;">
+                                <path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/>
+                            </svg>
+                            <span class="sr-only">${_("Sourced from a library - but the upstream link is broken/invalid.")}</span>
+                        % else:
+                            <!-- "library" icon from https://fonts.google.com/icons?selected=Material+Symbols+Outlined:newsstand:FILL@0;wght@400;GRAD@0;opsz@24&icon.size=24 -->
+                            <svg role="img" data-tooltip="${_("Sourced from a library.")}" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 -960 960 960" fill="currentColor" style="vertical-align: middle; padding-bottom: 4px;">
+                                <path d="M80-160v-80h800v80H80Zm80-160v-320h80v320h-80Zm160 0v-480h80v480h-80Zm160 0v-480h80v480h-80Zm280 0L600-600l70-40 160 280-70 40Z"/>
+                            </svg>
+                            <span class="sr-only">${_("Sourced from a library.")}</span>
+                        % endif
+                    % endif
+                    <span class="xblock-display-name">${label}</span>
                 % endif
                 % if selected_groups_label:
                 <p class="xblock-group-visibility-label">${selected_groups_label}</p>
@@ -114,6 +136,17 @@
             <ul class="actions-list nav-dd ui-right">
                 % if not is_root:
                     % if can_edit:
+                        % if upstream_info.ready_to_sync:
+                            <li class="action-item">
+                                <button
+                                    class="btn-default library-sync-button action-button"
+                                    data-tooltip="${_("Update available - click to sync")}"
+                                >
+                                    <span class="icon fa fa-refresh" aria-hidden="true"></span>
+                                    <span class="action-button-text">${_("Update available")}</span>
+                                </button>
+                            </li>
+                        % endif
                         % if use_tagging:
                             <li class="action-item tag-count" data-locator="${xblock.location}"></li>
                         % endif
@@ -164,8 +197,7 @@
                                             </li>
                                         % endif
                                     % endif
-                                    % if can_add:
-                                        <!-- If we can add, we can delete. -->
+                                    % if can_delete:
                                         <li class="nav-item">
                                             <a class="delete-button" href="#" role="button">${_("Delete")}</a>
                                         </li>
diff --git a/cms/templates/widgets/user_dropdown.html b/cms/templates/widgets/user_dropdown.html
index 0ec00257ffe1..3fc0934b0db7 100644
--- a/cms/templates/widgets/user_dropdown.html
+++ b/cms/templates/widgets/user_dropdown.html
@@ -21,11 +21,6 @@ <h3 class="title">
       <li class="nav-item nav-account-dashboard">
         <a href="/">${_("{studio_name} Home").format(studio_name=settings.STUDIO_SHORT_NAME)}</a>
       </li>
-      % if GlobalStaff().has_user(user):
-      <li class="nav-item">
-        <a href="${reverse('maintenance:maintenance_index')}">${_("Maintenance")}</a>
-      </li>
-      % endif
       <li class="nav-item nav-account-signout">
         <a class="action action-signout" href="${settings.FRONTEND_LOGOUT_URL}">${_("Sign Out")}</a>
       </li>
diff --git a/cms/urls.py b/cms/urls.py
index 1c5f191b2728..2e64d4bbeb79 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -123,6 +123,8 @@
             name='course_rerun_handler'),
     re_path(fr'^container/{settings.USAGE_KEY_PATTERN}$', contentstore_views.container_handler,
             name='container_handler'),
+    re_path(fr'^container_embed/{settings.USAGE_KEY_PATTERN}$', contentstore_views.container_embed_handler,
+            name='container_embed_handler'),
     re_path(fr'^orphan/{settings.COURSE_KEY_PATTERN}$', contentstore_views.orphan_handler,
             name='orphan_handler'),
     re_path(fr'^assets/{settings.COURSE_KEY_PATTERN}/{settings.ASSET_KEY_PATTERN}?$',
@@ -220,7 +222,7 @@
     path('openassessment/fileupload/', include('openassessment.fileupload.urls')),
 ]
 
-if settings.FEATURES.get('ENABLE_CONTENT_LIBRARIES'):
+if toggles.ENABLE_CONTENT_LIBRARIES:
     urlpatterns += [
         re_path(fr'^library/{LIBRARY_KEY_PATTERN}?$',
                 contentstore_views.library_handler, name='library_handler'),
@@ -274,8 +276,6 @@
                 certificates_list_handler, name='certificates_list_handler')
     ]
 
-# Maintenance Dashboard
-urlpatterns.append(path('maintenance/', include('cms.djangoapps.maintenance.urls', namespace='maintenance')))
 
 if settings.DEBUG:
     try:
diff --git a/common/djangoapps/course_modes/tests/test_views.py b/common/djangoapps/course_modes/tests/test_views.py
index f49d1bc23b7b..d7b069865317 100644
--- a/common/djangoapps/course_modes/tests/test_views.py
+++ b/common/djangoapps/course_modes/tests/test_views.py
@@ -149,50 +149,6 @@ def test_no_id_redirect_otto(self):
         self.assertRedirects(response, '/test_basket/add/?sku=TEST', fetch_redirect_response=False)
         ecomm_test_utils.update_commerce_config(enabled=False)
 
-    def test_verified_mode_response_contains_course_run_key(self):
-        # Create only the verified mode and enroll the user
-        CourseModeFactory.create(
-            mode_slug='verified',
-            course_id=self.course_that_started.id,
-            min_price=149,
-            sku="dummy"
-        )
-        CourseEnrollmentFactory(
-            is_active=True,
-            course_id=self.course_that_started.id,
-            user=self.user
-        )
-
-        # Value Prop TODO (REV-2378): remove waffle flag from tests once the new Track Selection template is rolled out.
-        with override_waffle_flag(VALUE_PROP_TRACK_SELECTION_FLAG, active=True):
-            with patch(GATING_METHOD_NAME, return_value=True):
-                with patch(CDL_METHOD_NAME, return_value=True):
-                    with patch("common.djangoapps.course_modes.views.EcommerceService.is_enabled", return_value=True):
-                        url = reverse('course_modes_choose', args=[str(self.course_that_started.id)])
-                        response = self.client.get(url)
-                        self.assertContains(response, "&course_run_key=")
-                        self.assertContains(response, self.course_that_started.id)
-
-    def test_response_without_verified_sku_does_not_contain_course_run_key(self):
-        CourseModeFactory.create(
-            mode_slug='verified',
-            course_id=self.course_that_started.id,
-        )
-        CourseEnrollmentFactory(
-            is_active=True,
-            course_id=self.course_that_started.id,
-            user=self.user
-        )
-
-        # Value Prop TODO (REV-2378): remove waffle flag from tests once the new Track Selection template is rolled out.
-        with override_waffle_flag(VALUE_PROP_TRACK_SELECTION_FLAG, active=True):
-            with patch(GATING_METHOD_NAME, return_value=True):
-                with patch(CDL_METHOD_NAME, return_value=True):
-                    with patch("common.djangoapps.course_modes.views.EcommerceService.is_enabled", return_value=True):
-                        url = reverse('course_modes_choose', args=[str(self.course_that_started.id)])
-                        response = self.client.get(url)
-                        self.assertNotContains(response, "&course_run_key=")
-
     @httpretty.activate
     @ddt.data(
         '',
diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index 269961424d04..759073a13583 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -126,9 +126,13 @@ def get(self, request, course_id, error=None):  # lint-amnesty, pylint: disable=
             if ecommerce_service.is_enabled(request.user):
                 professional_mode = modes.get(CourseMode.NO_ID_PROFESSIONAL_MODE) or modes.get(CourseMode.PROFESSIONAL)
                 if purchase_workflow == "single" and professional_mode.sku:
-                    redirect_url = ecommerce_service.get_checkout_page_url(professional_mode.sku)
+                    redirect_url = ecommerce_service.get_checkout_page_url(
+                        professional_mode.sku, course_run_keys=[course_id]
+                    )
                 if purchase_workflow == "bulk" and professional_mode.bulk_sku:
-                    redirect_url = ecommerce_service.get_checkout_page_url(professional_mode.bulk_sku)
+                    redirect_url = ecommerce_service.get_checkout_page_url(
+                        professional_mode.bulk_sku, course_run_keys=[course_id]
+                    )
             return redirect(redirect_url)
         course = modulestore().get_course(course_key)
 
@@ -237,7 +241,7 @@ def get(self, request, course_id, error=None):  # lint-amnesty, pylint: disable=
 
             if verified_mode.sku:
                 context["use_ecommerce_payment_flow"] = ecommerce_service.is_enabled(request.user)
-                context["ecommerce_payment_page"] = ecommerce_service.get_add_to_basket_url()
+                context["ecommerce_payment_page"] = ecommerce_service.payment_page_url()
                 context["sku"] = verified_mode.sku
                 context["bulk_sku"] = verified_mode.bulk_sku
 
diff --git a/common/djangoapps/static_replace/__init__.py b/common/djangoapps/static_replace/__init__.py
index 310ad8343242..cfab4dde8375 100644
--- a/common/djangoapps/static_replace/__init__.py
+++ b/common/djangoapps/static_replace/__init__.py
@@ -11,7 +11,7 @@
 from xmodule.contentstore.content import StaticContent
 
 log = logging.getLogger(__name__)
-XBLOCK_STATIC_RESOURCE_PREFIX = '/static/xblock'
+XBLOCK_STATIC_RESOURCE_PREFIX = '/static/xblock/'
 
 
 def _url_replace_regex(prefix):
diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py
index 1bdb770cad31..c71f8fa15c6a 100644
--- a/common/djangoapps/static_replace/test/test_static_replace.py
+++ b/common/djangoapps/static_replace/test/test_static_replace.py
@@ -86,6 +86,16 @@ def processor(__, prefix, quote, rest):  # pylint: disable=redefined-outer-name
     assert process_static_urls(STATIC_SOURCE, processor) == '"test/static/file.png"'
 
 
+def test_process_url_no_match_starts_with_xblock():
+    def processor(original, prefix, quote, rest):  # pylint: disable=unused-argument, redefined-outer-name
+        return quote + 'test' + prefix + rest + quote
+    assert process_static_urls(
+        '"/static/xblock-file.png"',
+        processor,
+        data_dir=DATA_DIRECTORY
+    ) == '"test/static/xblock-file.png"'
+
+
 @patch('django.http.HttpRequest', autospec=True)
 def test_static_urls(mock_request):
     mock_request.build_absolute_uri = lambda url: 'http://' + url
diff --git a/common/djangoapps/student/auth.py b/common/djangoapps/student/auth.py
index d3dc51616c75..e199142fe377 100644
--- a/common/djangoapps/student/auth.py
+++ b/common/djangoapps/student/auth.py
@@ -73,11 +73,17 @@ def user_has_role(user, role):
     return False
 
 
-def get_user_permissions(user, course_key, org=None):
+def get_user_permissions(user, course_key, org=None, service_variant=None):
     """
     Get the bitmask of permissions that this user has in the given course context.
     Can also set course_key=None and pass in an org to get the user's
     permissions for that organization as a whole.
+
+    :param user: a user
+    :param course_key: a CourseKey or None
+    :param org: an organization name or None
+    :param service_variant: the variant of the service (lms or cms). Permissions may differ between the two,
+        see the HACK comment in the function for more details.
     """
     if org is None:
         org = course_key.org
@@ -103,7 +109,7 @@ def get_user_permissions(user, course_key, org=None):
     #  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)):
-        if settings.SERVICE_VARIANT == 'lms':
+        if (service_variant or settings.SERVICE_VARIANT) == 'lms':
             return STUDIO_EDIT_CONTENT
         else:
             return STUDIO_NO_PERMISSIONS
@@ -119,7 +125,7 @@ def get_user_permissions(user, course_key, org=None):
     return STUDIO_NO_PERMISSIONS
 
 
-def has_studio_write_access(user, course_key):
+def has_studio_write_access(user, course_key, service_variant=None):
     """
     Return True if user has studio write access to the given course.
     Note that the CMS permissions model is with respect to courses.
@@ -131,15 +137,17 @@ def has_studio_write_access(user, course_key):
 
     :param user:
     :param course_key: a CourseKey
+    :param service_variant: the variant of the service (lms or cms). Permissions may differ between the two,
+        see the comment in get_user_permissions for more details.
     """
-    return bool(STUDIO_EDIT_CONTENT & get_user_permissions(user, course_key))
+    return bool(STUDIO_EDIT_CONTENT & get_user_permissions(user, course_key, service_variant=service_variant))
 
 
-def has_course_author_access(user, course_key):
+def has_course_author_access(user, course_key, service_variant=None):
     """
     Old name for has_studio_write_access
     """
-    return has_studio_write_access(user, course_key)
+    return has_studio_write_access(user, course_key, service_variant=service_variant)
 
 
 def has_studio_advanced_settings_access(user):
diff --git a/common/djangoapps/student/helpers.py b/common/djangoapps/student/helpers.py
index fb0a7236c0b5..b5d46949b506 100644
--- a/common/djangoapps/student/helpers.py
+++ b/common/djangoapps/student/helpers.py
@@ -646,21 +646,14 @@ def _is_certificate_earned_but_not_available(course_overview, status):
         (bool): True if the user earned the certificate but it's hidden due to display behavior, else False
 
     """
-    if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
-        return (
-            not certificates_viewable_for_course(course_overview)
-            and CertificateStatuses.is_passing_status(status)
-            and course_overview.certificates_display_behavior in (
-                CertificatesDisplayBehaviors.END_WITH_DATE,
-                CertificatesDisplayBehaviors.END
-            )
-        )
-    else:
-        return (
-            not certificates_viewable_for_course(course_overview) and
-            CertificateStatuses.is_passing_status(status) and
-            course_overview.certificate_available_date
+    return (
+        not certificates_viewable_for_course(course_overview)
+        and CertificateStatuses.is_passing_status(status)
+        and course_overview.certificates_display_behavior in (
+            CertificatesDisplayBehaviors.END_WITH_DATE,
+            CertificatesDisplayBehaviors.END
         )
+    )
 
 
 def process_survey_link(survey_link, user):
diff --git a/common/djangoapps/student/models/course_enrollment.py b/common/djangoapps/student/models/course_enrollment.py
index 09862916e321..6d32ffca4149 100644
--- a/common/djangoapps/student/models/course_enrollment.py
+++ b/common/djangoapps/student/models/course_enrollment.py
@@ -717,6 +717,8 @@ def enroll(cls, user, course_key, mode=None, check_access=False, can_upgrade=Fal
         Also emits relevant events for analytics purposes.
         """
         try:
+            # .. filter_implemented_name: CourseEnrollmentStarted
+            # .. filter_type: org.openedx.learning.course.enrollment.started.v1
             user, course_key, mode = CourseEnrollmentStarted.run_filter(
                 user=user, course_key=course_key, mode=mode,
             )
@@ -1750,7 +1752,7 @@ def refund_window(self, refund_window):
 
 class BulkUnenrollConfiguration(ConfigurationModel):  # lint-amnesty, pylint: disable=empty-docstring
     """
-
+    .. no_pii:
     """
     csv_file = models.FileField(
         validators=[FileExtensionValidator(allowed_extensions=['csv'])],
@@ -1763,6 +1765,8 @@ class BulkUnenrollConfiguration(ConfigurationModel):  # lint-amnesty, pylint: di
 class BulkChangeEnrollmentConfiguration(ConfigurationModel):
     """
     config model for the bulk_change_enrollment_csv command
+
+    .. no_pii:
     """
     csv_file = models.FileField(
         validators=[FileExtensionValidator(allowed_extensions=['csv'])],
diff --git a/common/djangoapps/student/models/user.py b/common/djangoapps/student/models/user.py
index aa3de546ef2b..9d979beb19cb 100644
--- a/common/djangoapps/student/models/user.py
+++ b/common/djangoapps/student/models/user.py
@@ -1685,6 +1685,8 @@ class AllowedAuthUser(TimeStampedModel):
 class AccountRecoveryConfiguration(ConfigurationModel):
     """
     configuration model for recover account management command
+
+    .. no_pii:
     """
     csv_file = models.FileField(
         validators=[FileExtensionValidator(allowed_extensions=['csv'])],
@@ -1824,6 +1826,8 @@ def perform_streak_updates(cls, user, course_key, browser_timezone=None):
 class UserPasswordToggleHistory(TimeStampedModel):
     """
     Keeps track of user password disable/enable history
+
+    .. no_pii:
     """
     user = models.ForeignKey(User, related_name='password_toggle_history', on_delete=models.CASCADE)
     comment = models.CharField(max_length=255, help_text=_("Add a reason"), blank=True, null=True)
diff --git a/common/djangoapps/student/tests/test_linkedin.py b/common/djangoapps/student/tests/test_linkedin.py
index 50dd921f25a9..a5de21595bb6 100644
--- a/common/djangoapps/student/tests/test_linkedin.py
+++ b/common/djangoapps/student/tests/test_linkedin.py
@@ -38,28 +38,20 @@ class LinkedInAddToProfileUrlTests(TestCase):
     def test_linked_in_url(self, cert_mode, expected_cert_name):
         config = LinkedInAddToProfileConfigurationFactory()
 
-        # We can switch to this once edx-platform reaches Python 3.8
-        # expected_url = (
-        #     'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&'
-        #     'name={platform}+{cert_name}&certUrl={cert_url}&'
-        #     'organizationId={company_identifier}'
-        # ).format(
-        #     platform=quote(settings.PLATFORM_NAME.encode('utf-8')),
-        #     cert_name=expected_cert_name,
-        #     cert_url=quote(self.CERT_URL, safe=''),
-        #     company_identifier=config.company_identifier,
-        # )
+        expected_url = (
+            'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&'
+            'name={platform}+{cert_name}&certUrl={cert_url}&'
+            'organizationId={company_identifier}'
+        ).format(
+            platform=quote(settings.PLATFORM_NAME.encode('utf-8')),
+            cert_name=expected_cert_name,
+            cert_url=quote(self.CERT_URL, safe=''),
+            company_identifier=config.company_identifier,
+        )
 
         actual_url = config.add_to_profile_url(self.COURSE_NAME, cert_mode, self.CERT_URL)
 
-        # We can switch to this instead of the assertIn once edx-platform reaches Python 3.8
-        # There was a problem with dict ordering in the add_to_profile_url function that will go away then.
-        # self.assertEqual(actual_url, expected_url)
-
-        assert 'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME' in actual_url
-        assert f'&name={quote(settings.PLATFORM_NAME.encode("utf-8"))}+{expected_cert_name}' in actual_url
-        assert '&certUrl={cert_url}'.format(cert_url=quote(self.CERT_URL, safe='')) in actual_url
-        assert f'&organizationId={config.company_identifier}' in actual_url
+        self.assertEqual(actual_url, expected_url)
 
     @ddt.data(
         ('honor', 'Honor+Code+Credential+for+Test+Course+%E2%98%83'),
@@ -72,26 +64,18 @@ def test_linked_in_url(self, cert_mode, expected_cert_name):
     def test_linked_in_url_with_cert_name_override(self, cert_mode, expected_cert_name):
         config = LinkedInAddToProfileConfigurationFactory()
 
-        # We can switch to this once edx-platform reaches Python 3.8
-        # expected_url = (
-        #     'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&'
-        #     'name={platform}+{cert_name}&certUrl={cert_url}&'
-        #     'organizationId={company_identifier}'
-        # ).format(
-        #     platform=quote(settings.PLATFORM_NAME.encode('utf-8')),
-        #     cert_name=expected_cert_name,
-        #     cert_url=quote(self.CERT_URL, safe=''),
-        #     company_identifier=config.company_identifier,
-        # )
+        expected_url = (
+            'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&'
+            'name={platform}+{cert_name}&certUrl={cert_url}&'
+            'organizationId={company_identifier}'
+        ).format(
+            platform=quote(settings.PLATFORM_NAME.encode('utf-8')),
+            cert_name=expected_cert_name,
+            cert_url=quote(self.CERT_URL, safe=''),
+            company_identifier=config.company_identifier,
+        )
 
         with with_site_configuration_context(configuration=self.SITE_CONFIGURATION):
             actual_url = config.add_to_profile_url(self.COURSE_NAME, cert_mode, self.CERT_URL)
 
-            # We can switch to this instead of the assertIn once edx-platform reaches Python 3.8
-            # There was a problem with dict ordering in the add_to_profile_url function that will go away then.
-            # self.assertEqual(actual_url, expected_url)
-
-            assert 'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME' in actual_url
-            assert f'&name={quote(settings.PLATFORM_NAME.encode("utf-8"))}+{expected_cert_name}' in actual_url
-            assert '&certUrl={cert_url}'.format(cert_url=quote(self.CERT_URL, safe='')) in actual_url
-            assert f'&organizationId={config.company_identifier}' in actual_url
+        self.assertEqual(actual_url, expected_url)
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index 9e61095260b6..c640462acf10 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -440,28 +440,19 @@ def test_linked_in_add_to_profile_btn_with_certificate(self):
         assert response.status_code == 200
         self.assertContains(response, 'Add Certificate to LinkedIn')
 
-        # We can switch to this and the commented out assertContains once edx-platform reaches Python 3.8
-        # expected_url = (
-        #     'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&'
-        #     'name={platform}+Honor+Code+Certificate+for+Omega&certUrl={cert_url}&'
-        #     'organizationId={company_identifier}'
-        # ).format(
-        #     platform=quote(settings.PLATFORM_NAME.encode('utf-8')),
-        #     cert_url=quote(cert.download_url, safe=''),
-        #     company_identifier=linkedin_config.company_identifier,
-        # )
-
-        # self.assertContains(response, escape(expected_url))
-
-        # These can be removed (in favor of the above) once we are on Python 3.8. Fails in 3.5 because of dict ordering
-        self.assertContains(response, escape('https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME'))
-        self.assertContains(response, escape('&name={platform}+Honor+Code+Certificate+for+Omega'.format(
-            platform=quote(settings.PLATFORM_NAME.encode('utf-8'))
-        )))
-        self.assertContains(response, escape('&certUrl={cert_url}'.format(cert_url=quote(cert.download_url, safe=''))))
-        self.assertContains(response, escape('&organizationId={company_identifier}'.format(
+        expected_url = (
+            'https://www.linkedin.com/profile/add?startTask=CERTIFICATION_NAME&'
+            'name={platform}+Honor+Code+Certificate+for+Omega&'
+            'certUrl={cert_url}&'
+            'organizationId={company_identifier}'
+        ).format(
+            platform=quote(settings.PLATFORM_NAME.encode('utf-8')),
+            cert_url=quote(cert.download_url, safe=''),
             company_identifier=linkedin_config.company_identifier
-        )))
+        )
+
+        # Single assertion for the expected LinkedIn URL
+        self.assertContains(response, escape(expected_url))
 
     @skip_unless_lms
     def test_dashboard_metadata_caching(self):
diff --git a/common/djangoapps/student/views/management.py b/common/djangoapps/student/views/management.py
index b06cac7b7e50..02940da78f3b 100644
--- a/common/djangoapps/student/views/management.py
+++ b/common/djangoapps/student/views/management.py
@@ -70,6 +70,7 @@
 from common.djangoapps.student.models import (  # lint-amnesty, pylint: disable=unused-import
     AccountRecovery,
     CourseEnrollment,
+    EnrollmentNotAllowed,
     PendingEmailChange,  # unimport:skip
     PendingSecondaryEmailChange,
     Registration,
@@ -422,6 +423,8 @@ def change_enrollment(request, check_access=True):
                 enroll_mode = CourseMode.auto_enroll_mode(course_id, available_modes)
                 if enroll_mode:
                     CourseEnrollment.enroll(user, course_id, check_access=check_access, mode=enroll_mode)
+            except EnrollmentNotAllowed as exc:
+                return HttpResponseBadRequest(str(exc))
             except Exception:  # pylint: disable=broad-except
                 return HttpResponseBadRequest(_("Could not enroll"))
 
diff --git a/common/djangoapps/third_party_auth/README.rst b/common/djangoapps/third_party_auth/README.rst
new file mode 100644
index 000000000000..d2e1089eca5d
--- /dev/null
+++ b/common/djangoapps/third_party_auth/README.rst
@@ -0,0 +1,11 @@
+Third Party Auth
+----------------
+
+This djangoapp provides the views and workflows for authenticating into edx-platform with third-party applications, including both OAuth and SAML workflows.
+
+We make use of the `social-auth-app-django`_ as our backend library for this djangoapp.
+
+To enable this feature, check out the `third party authentication documentation`.
+
+.. _social-auth-app-django: https://github.com/python-social-auth/social-app-django
+.. _third party authentication documentation: https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/index.html
diff --git a/common/djangoapps/third_party_auth/admin.py b/common/djangoapps/third_party_auth/admin.py
index 284c50fcf884..d44da6248ee2 100644
--- a/common/djangoapps/third_party_auth/admin.py
+++ b/common/djangoapps/third_party_auth/admin.py
@@ -53,13 +53,15 @@ class SAMLProviderConfigForm(forms.ModelForm):
 class SAMLProviderConfigAdmin(KeyedConfigurationModelAdmin):
     """ Django Admin class for SAMLProviderConfig """
     form = SAMLProviderConfigForm
+    search_fields = ['display_name']
 
     def get_queryset(self, request):
         """
-        Filter the queryset to exclude the archived records.
+        Filter the queryset to exclude the archived records unless it's the /change/ view.
         """
-        queryset = super().get_queryset(request).exclude(archived=True)
-        return queryset
+        if request.path.endswith('/change/'):
+            return self.model.objects.all()
+        return super().get_queryset(request).exclude(archived=True)
 
     def archive_provider_configuration(self, request, queryset):
         """
@@ -99,7 +101,15 @@ def name_with_update_link(self, instance):
         Record name with link for the change view.
         """
         if not instance.is_active:
-            return instance.name
+            update_url = reverse(
+                f'admin:{self.model._meta.app_label}_{self.model._meta.model_name}_change',
+                args=[instance.pk]
+            )
+            return format_html(
+                '<a href="{}" style="color: #999999;">{}</a>',
+                update_url,
+                f'{instance.name}'
+            )
 
         update_url = reverse(f'admin:{self.model._meta.app_label}_{self.model._meta.model_name}_add')
         update_url += f'?source={instance.pk}'
@@ -167,11 +177,11 @@ def upload_csv(self, request, slug):
         # Always redirect back to the SAMLProviderConfig listing page
         return HttpResponseRedirect(reverse('admin:third_party_auth_samlproviderconfig_changelist'))
 
-    def change_view(self, request, object_slug, form_url='', extra_context=None):
+    def change_view(self, request, object_id, form_url='', extra_context=None):
         """ Extend the change view to include CSV upload. """
         extra_context = extra_context or {}
         extra_context['show_csv_upload'] = True
-        return super().change_view(request, object_slug, form_url, extra_context)
+        return super().change_view(request, object_id, form_url, extra_context)
 
     def csv_uuid_update_button(self, obj):
         """ Add CSV upload button to the form. """
diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 8e688208af19..ef1e6f887c36 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -715,8 +715,18 @@ def login_analytics(strategy, auth_entry, current_partial=None, *args, **kwargs)
     """ Sends login info to Segment """
 
     event_name = None
+    anonymous_id = ""
+    additional_params = {}
+
+    try:
+        request = kwargs['request']
+        anonymous_id = request.COOKIES.get('ajs_anonymous_id', "")
+    except:  # pylint: disable=bare-except
+        pass
+
     if auth_entry == AUTH_ENTRY_LOGIN:
         event_name = 'edx.bi.user.account.authenticated'
+        additional_params['anonymous_id'] = anonymous_id
     elif auth_entry in [AUTH_ENTRY_ACCOUNT_SETTINGS]:
         event_name = 'edx.bi.user.account.linked'
 
@@ -724,7 +734,8 @@ def login_analytics(strategy, auth_entry, current_partial=None, *args, **kwargs)
         segment.track(kwargs['user'].id, event_name, {
             'category': "conversion",
             'label': None,
-            'provider': kwargs['backend'].name
+            'provider': kwargs['backend'].name,
+            **additional_params
         })
 
 
diff --git a/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py b/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
index 7b26cb041a0a..c19b0b8d96aa 100644
--- a/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
+++ b/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
@@ -583,7 +583,7 @@ def test_verification_signal(self):
         """
         Verification signal is sent upon approval.
         """
-        with mock.patch('openedx.core.djangoapps.signals.signals.LEARNER_NOW_VERIFIED.send_robust') as mock_signal:
+        with mock.patch('openedx.core.djangoapps.signals.signals.LEARNER_SSO_VERIFIED.send_robust') as mock_signal:
             # Begin the pipeline.
             pipeline.set_id_verification_status(
                 auth_entry=pipeline.AUTH_ENTRY_LOGIN,
diff --git a/common/djangoapps/util/cache.py b/common/djangoapps/util/cache.py
index ca2ee2050eae..3ec99efc636d 100644
--- a/common/djangoapps/util/cache.py
+++ b/common/djangoapps/util/cache.py
@@ -53,13 +53,11 @@ def wrapper(request, *args, **kwargs):
             # specifically the branding index, to do authentication.
             # If that page is cached the authentication doesn't
             # happen, so we disable the cache when that feature is enabled.
-            if (
-                not request.user.is_authenticated
-            ):
+            if not request.user.is_authenticated:
                 # Use the cache. The same view accessed through different domain names may
                 # return different things, so include the domain name in the key.
-                domain = str(request.META.get('HTTP_HOST')) + '.'
-                cache_key = domain + "cache_if_anonymous." + get_language() + '.' + request.path
+                domain = request.META.get('HTTP_HOST', '') + '.'
+                cache_key = f"{domain}cache_if_anonymous.{get_language()}.{request.path}"
 
                 # Include the values of GET parameters in the cache key.
                 for get_parameter in get_parameters:
@@ -67,24 +65,20 @@ def wrapper(request, *args, **kwargs):
                     if parameter_value is not None:
                         # urlencode expects data to be of type str, and doesn't deal well with Unicode data
                         # since it doesn't provide a way to specify an encoding.
-                        cache_key = cache_key + '.' + urlencode({
-                            get_parameter: str(parameter_value).encode('utf-8')
-                        })
+                        cache_key += '.' + urlencode({get_parameter: str(parameter_value).encode('utf-8')})
 
                 response = cache.get(cache_key)
-
                 if response:
-                    # A hack to ensure that the response data is a valid text type for both Python 2 and 3.
-                    response_content = list(response._container)  # lint-amnesty, pylint: disable=bad-option-value, protected-access, protected-member
-                    response.content = b''
-                    for item in response_content:
-                        response.write(item)
+                    # Ensure that response content is properly handled for caching
+                    response.content = (
+                        # pylint: disable=protected-access
+                        b''.join(response._container) if hasattr(response, '_container') else response.content
+                    )
                 else:
                     response = view_func(request, *args, **kwargs)
                     cache.set(cache_key, response, 60 * 3)
 
                 return response
-
             else:
                 # Don't use the cache.
                 return view_func(request, *args, **kwargs)
diff --git a/common/djangoapps/util/course.py b/common/djangoapps/util/course.py
index 721410ff6976..fa82f9c4aaeb 100644
--- a/common/djangoapps/util/course.py
+++ b/common/djangoapps/util/course.py
@@ -10,6 +10,7 @@
 from opaque_keys.edx.keys import CourseKey, UsageKey
 
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx_filters.learning.filters import CourseAboutPageURLRequested
 
 log = logging.getLogger(__name__)
 
@@ -59,6 +60,13 @@ def get_link_for_about_page(course):
             course_key=str(course.id),
         )
 
+        ## .. filter_implemented_name: CourseAboutPageURLRequested
+        ## .. filter_type: org.openedx.learning.course_about.page.url.requested.v1
+        course_about_url, _ = CourseAboutPageURLRequested.run_filter(
+            url=course_about_url,
+            org=course.id.org,
+        )
+
     return course_about_url
 
 
diff --git a/common/djangoapps/util/memcache.py b/common/djangoapps/util/memcache.py
index 2f7e6dc623a0..ce8c70219e2c 100644
--- a/common/djangoapps/util/memcache.py
+++ b/common/djangoapps/util/memcache.py
@@ -7,7 +7,6 @@
 import hashlib
 from urllib.parse import quote_plus
 
-from django.conf import settings
 from django.utils.encoding import smart_str
 
 
@@ -15,10 +14,7 @@ def fasthash(string):
     """
     Hashes `string` into a string representation of a 128-bit digest.
     """
-    if settings.FEATURES.get("ENABLE_BLAKE2B_HASHING", False):
-        hash_obj = hashlib.new("blake2b", digest_size=16)
-    else:
-        hash_obj = hashlib.new("md4")
+    hash_obj = hashlib.new("blake2b", digest_size=16)
     hash_obj.update(string.encode('utf-8'))
     return hash_obj.hexdigest()
 
diff --git a/common/djangoapps/util/tests/test_filters.py b/common/djangoapps/util/tests/test_filters.py
new file mode 100644
index 000000000000..9e8d6d5fdffa
--- /dev/null
+++ b/common/djangoapps/util/tests/test_filters.py
@@ -0,0 +1,77 @@
+"""
+Test that various filters are fired for models/views in the student app.
+"""
+from django.test import override_settings
+from common.djangoapps.util import course
+from openedx_filters import PipelineStep
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+from openedx.core.djangolib.testing.utils import skip_unless_lms
+
+
+class TestPageURLRequestedPipelineStep(PipelineStep):
+    """
+    Utility class used when getting steps for pipeline.
+    """
+
+    def run_filter(self, url, org):  # pylint: disable=arguments-differ
+        """Pipeline step that modifies lms url requested."""
+        url = "https://lms-url-creation"
+        org = "org"
+        return {
+            "url": url,
+            "org": org,
+        }
+
+
+@skip_unless_lms
+class CourseAboutPageURLRequestedFiltersTest(ModuleStoreTestCase):
+    """
+    Tests for the Open edX Filters associated with the course about page url requested.
+    This class guarantees that the following filters are triggered during the microsite render:
+    - CourseAboutPageURLRequested
+    """
+
+    def setUp(self):  # pylint: disable=arguments-differ
+        super().setUp()
+        self.course = CourseFactory.create()
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.course_about.page.url.requested.v1": {
+                "pipeline": [
+                    "common.djangoapps.util.tests.test_filters.TestPageURLRequestedPipelineStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_course_about_page_url_requested_filter_executed(self):
+        """
+        Test that filter get new course about URL based
+        on the course organization settings for org.
+        Expected result:
+            - CourseAboutPageURLRequested is triggered and executes TestPageURLRequestedPipelineStep.
+            - The arguments that the receiver gets are the arguments used by the filter.
+        """
+        course_about_url = course.get_link_for_about_page(self.course)
+
+        self.assertEqual("https://lms-url-creation", course_about_url)
+
+    @override_settings(OPEN_EDX_FILTERS_CONFIG={}, LMS_ROOT_URL="https://lms-base")
+    def test_course_about_page_url_requested_without_filter_configuration(self):
+        """
+        Test that filter get new course about URL based
+        on the LMS_ROOT_URL settings because OPEN_EDX_FILTERS_CONFIG is not set.
+        Expected result:
+            - Returns the course about URL with domain base LMS_ROOT_URL.
+            - The get process ends successfully.
+        """
+        course_about_url = course.get_link_for_about_page(self.course)
+
+        expected_course_about = '{about_base_url}/courses/{course_key}/about'.format(
+            about_base_url='https://lms-base',
+            course_key=str(self.course.id),
+        )
+
+        self.assertEqual(expected_course_about, course_about_url)
diff --git a/common/djangoapps/util/tests/test_memcache.py b/common/djangoapps/util/tests/test_memcache.py
index 13f67f386a00..0047e9fa66cf 100644
--- a/common/djangoapps/util/tests/test_memcache.py
+++ b/common/djangoapps/util/tests/test_memcache.py
@@ -3,15 +3,11 @@
 """
 
 
-from django.conf import settings
 from django.core.cache import caches
-from django.test import TestCase, override_settings
+from django.test import TestCase
 
 from common.djangoapps.util.memcache import safe_key
 
-BLAKE2B_ENABLED_FEATURES = settings.FEATURES.copy()
-BLAKE2B_ENABLED_FEATURES["ENABLE_BLAKE2B_HASHING"] = True
-
 
 class MemcacheTest(TestCase):
     """
@@ -55,20 +51,6 @@ def test_safe_key_long(self):
             # The key should now be valid
             assert self._is_valid_key(key), f'Failed for key length {length}'
 
-    @override_settings(FEATURES=BLAKE2B_ENABLED_FEATURES)
-    def test_safe_key_long_with_blake2b_enabled(self):
-        # Choose lengths close to memcached's cutoff (250)
-        for length in [248, 249, 250, 251, 252]:
-
-            # Generate a key of that length
-            key = 'a' * length
-
-            # Make the key safe
-            key = safe_key(key, '', '')
-
-            # The key should now be valid
-            assert self._is_valid_key(key), f'Failed for key length {length}'
-
     def test_long_key_prefix_version(self):
 
         # Long key
@@ -83,34 +65,6 @@ def test_long_key_prefix_version(self):
         key = safe_key('key', 'prefix', 'a' * 300)
         assert self._is_valid_key(key)
 
-    @override_settings(FEATURES=BLAKE2B_ENABLED_FEATURES)
-    def test_long_key_prefix_version_with_blake2b_enabled(self):
-
-        # Long key
-        key = safe_key('a' * 300, 'prefix', 'version')
-        assert self._is_valid_key(key)
-
-        # Long prefix
-        key = safe_key('key', 'a' * 300, 'version')
-        assert self._is_valid_key(key)
-
-        # Long version
-        key = safe_key('key', 'prefix', 'a' * 300)
-        assert self._is_valid_key(key)
-
-    def test_safe_key_unicode(self):
-
-        for unicode_char in self.UNICODE_CHAR_CODES:
-
-            # Generate a key with that character
-            key = chr(unicode_char)
-
-            # Make the key safe
-            key = safe_key(key, '', '')
-
-            # The key should now be valid
-            assert self._is_valid_key(key), f'Failed for unicode character {unicode_char}'
-
     def test_safe_key_prefix_unicode(self):
 
         for unicode_char in self.UNICODE_CHAR_CODES:
diff --git a/common/static/data/geoip/GeoLite2-Country.mmdb b/common/static/data/geoip/GeoLite2-Country.mmdb
index b4dcff0b4ab8..f32738e62173 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/static/js/src/tooltip_manager.js b/common/static/js/src/tooltip_manager.js
index d3fe0d1566e7..71db826a705d 100644
--- a/common/static/js/src/tooltip_manager.js
+++ b/common/static/js/src/tooltip_manager.js
@@ -32,9 +32,20 @@
         },
 
         getCoords: function(pageX, pageY) {
+            let left = pageX - 0.5 * this.tooltip.outerWidth();
+            const top = pageY - (this.tooltip.outerHeight() + 15);
+            // Check if the tooltip is going off the right edge of the screen
+            if (left + this.tooltip.outerWidth() > window.innerWidth) {
+                left = window.innerWidth - this.tooltip.outerWidth();
+            }
+            // Check if the tooltip is going off the left edge of the screen
+            if (left < 0) {
+                left = 0;
+            }
+
             return {
-                left: pageX - 0.5 * this.tooltip.outerWidth(),
-                top: pageY - (this.tooltip.outerHeight() + 15)
+                left,
+                top,
             };
         },
 
diff --git a/common/static/sass/_builtin-block-variables.scss b/common/static/sass/_builtin-block-variables.scss
index 2c567c6fb1f4..e232cb57d575 100644
--- a/common/static/sass/_builtin-block-variables.scss
+++ b/common/static/sass/_builtin-block-variables.scss
@@ -16,7 +16,6 @@
 
 :root {
     --action-primary-active-bg: $action-primary-active-bg;
-    --all-text-inputs: $all-text-inputs;
     --base-font-size: $base-font-size;
     --base-line-height: $base-line-height;
     --baseline: $baseline;
@@ -26,6 +25,7 @@
     --blue-d1: $blue-d1;
     --blue-d2: $blue-d2;
     --blue-d4: $blue-d4;
+    --blue-s1: $blue-s1;
     --body-color: $body-color;
     --border-color: $border-color;
     --bp-screen-lg: $bp-screen-lg;
@@ -34,6 +34,8 @@
     --danger: $danger;
     --darkGrey: $darkGrey;
     --error-color: $error-color;
+    --error-color-dark: darken($error-color, 11%);
+    --error-color-light: lighten($error-color, 25%);
     --font-bold: $font-bold;
     --font-family-sans-serif: $font-family-sans-serif;
     --general-color-accent: $general-color-accent;
@@ -44,6 +46,12 @@
     --gray-l3: $gray-l3;
     --gray-l4: $gray-l4;
     --gray-l6: $gray-l6;
+    --icon-correct: url($static-path + '/images/correct-icon.png');
+    --icon-incorrect: url($static-path + '/images/incorrect-icon.png');
+    --icon-info: url($static-path + '/images/info-icon.png');
+    --icon-partially-correct: url($static-path + '/images/partially-correct-icon.png');
+    --icon-spinner: url($static-path + '/images/spinner.gif');
+    --icon-unanswered: url($static-path + '/images/unanswered-icon.png');
     --incorrect: $incorrect;
     --lightGrey: $lightGrey;
     --lighter-base-font-color: $lighter-base-font-color;
diff --git a/cms/templates/content_libraries/xblock_iframe.html b/common/templates/xblock_v2/xblock_iframe.html
similarity index 97%
rename from cms/templates/content_libraries/xblock_iframe.html
rename to common/templates/xblock_v2/xblock_iframe.html
index e8eb4c96ead0..8b733373bd82 100644
--- a/cms/templates/content_libraries/xblock_iframe.html
+++ b/common/templates/xblock_v2/xblock_iframe.html
@@ -6,7 +6,12 @@
   <base target="_blank">
   <meta charset="UTF-8">
   <!-- gettext & XBlock JS i18n code -->
-  <script type="text/javascript" src="{{ lms_root_url }}/static/js/i18n/en/djangojs.js"></script>
+  {% if is_development %}
+    <!-- in development, the djangojs file isn't available so use fallback-->
+    <script type="text/javascript" src="{{ lms_root_url }}/static/js/src/gettext_fallback.js"></script>
+  {% else %}
+    <script type="text/javascript" src="{{ lms_root_url }}/static/js/i18n/en/djangojs.js"></script>
+  {% endif %}
   <!-- Most XBlocks require jQuery: -->
   <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script>
   <!-- The Video XBlock requires "ajaxWithPrefix" -->
@@ -151,7 +156,7 @@
 <!-- The default stylesheet will set the body min-height to 100% (a common strategy to allow for background
   images to fill the viewport), but this has the undesireable side-effect of causing an infinite loop via the onResize
   event listeners below, in certain situations.  Resetting it to the default "auto" skirts the problem.-->
-<body style="min-height: auto">
+<body style="min-height: auto; background-color: white;">
   <!-- fragment body -->
   {{ fragment.body_html | safe }}
   <!-- fragment foot -->
diff --git a/docs/concepts/extension_points.rst b/docs/concepts/extension_points.rst
index d4e802baec0e..3136aa8057c2 100644
--- a/docs/concepts/extension_points.rst
+++ b/docs/concepts/extension_points.rst
@@ -139,10 +139,10 @@ Here are the different integration points that python plugins can use:
      - This decorator allows overriding any function or method by pointing to an alternative implementation in settings. Read the |pluggable_override docstring|_ to learn more.
    * - Open edX Events
      - Adopt, Stable
-     - Events are part of the greater Hooks Extension Framework for open extension of edx-platform. Events are a stable way for plugin developers to react to learner or author events. They are defined by a `separate events library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `hooks guide`_.
+     - Events are part of the greater Hooks Extension Framework for open extension of edx-platform. Events are a stable way for plugin developers to react to learner or author events. They are defined by a `separate events library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `Hooks Extension Framework docs`_ or for more detailed documentation about Open edX Events, see the `Open edX Events documentation`_.
    * - Open edX Filters
      - Adopt, Stable
-     - Filters are also part of Hooks Extension Framework for open extension of edx-platform. Filters are a flexible way for plugin developers to modify learner or author application flows. They are defined by a `separate filters library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `hooks guide`_.
+     - Filters are also part of Hooks Extension Framework for open extension of edx-platform. Filters are a flexible way for plugin developers to modify learner or author application flows. They are defined by a `separate filters library`_ that developers can include in their requirements to develop and test the code without creating a dependency on this large repo. For more information see the `Hooks Extension Framework docs`_ or for more detailed documentation about Open edX Filters, see the `Open edX Filters documentation`_.
 
 .. _Application: https://docs.djangoproject.com/en/3.0/ref/applications/
 .. _Django app plugin documentation: https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/plugins/README.rst
@@ -159,7 +159,9 @@ Here are the different integration points that python plugins can use:
 .. _pluggable_override docstring: https://github.com/openedx/edx-django-utils/blob/master/edx_django_utils/plugins/pluggable_override.py
 .. _separate events library: https://github.com/eduNEXT/openedx-events/
 .. _separate filters library: https://github.com/eduNEXT/openedx-filters/
-.. _hooks guide: https://github.com/openedx/edx-platform/blob/master/docs/guides/hooks/index.rst
+.. _Hooks Extension Framework docs: https://docs.openedx.org/en/latest/developers/concepts/hooks_extension_framework.html
+.. _Open edX Events documentation: https://docs.openedx.org/projects/openedx-events/en/latest/
+.. _Open edX Filters documentation: https://docs.openedx.org/projects/openedx-filters/en/latest/
 
 Platform Look & Feel
 ====================
diff --git a/docs/concepts/testing/testing.rst b/docs/concepts/testing/testing.rst
index 9d448afd5bdc..d8a79b9d6619 100644
--- a/docs/concepts/testing/testing.rst
+++ b/docs/concepts/testing/testing.rst
@@ -1,4 +1,3 @@
-#######
 Testing
 #######
 
@@ -7,7 +6,7 @@ Testing
    :depth: 3
 
 Overview
-========
+********
 
 We maintain two kinds of tests: unit tests and integration tests.
 
@@ -26,10 +25,10 @@ tests. Most of our tests are unit tests or
 integration tests.
 
 Test Types
-----------
+==========
 
 Unit Tests
-~~~~~~~~~~
+----------
 
 -  Each test case should be concise: setup, execute, check, and
    teardown. If you find yourself writing tests with many steps,
@@ -38,18 +37,18 @@ Unit Tests
 
 -  As a rule of thumb, your unit tests should cover every code branch.
 
--  Mock or patch external dependencies. We use the voidspace `Mock Library`_.
+-  Mock or patch external dependencies using `unittest.mock`_ functions.
 
 -  We unit test Python code (using `unittest`_) and Javascript (using
    `Jasmine`_)
 
-.. _Mock Library: http://www.voidspace.org.uk/python/mock/
+.. _unittest.mock: https://docs.python.org/3/library/unittest.mock.html
 .. _unittest: http://docs.python.org/2/library/unittest.html
 .. _Jasmine: http://jasmine.github.io/
 
 
 Integration Tests
-~~~~~~~~~~~~~~~~~
+-----------------
 
 -  Test several units at the same time. Note that you can still mock or patch
    dependencies that are not under test! For example, you might test that
@@ -67,7 +66,7 @@ Integration Tests
 .. _Django test client: https://docs.djangoproject.com/en/dev/topics/testing/overview/
 
 Test Locations
---------------
+==============
 
 -  Python unit and integration tests: Located in subpackages called
    ``tests``. For example, the tests for the ``capa`` package are
@@ -80,14 +79,29 @@ Test Locations
    the test for ``src/views/module.js`` should be written in
    ``spec/views/module_spec.js``.
 
-Running Tests
-=============
+Factories
+=========
 
-**Unless otherwise mentioned, all the following commands should be run from inside the lms docker container.**
+Many tests delegate set-up to a "factory" class. For example, there are
+factories for creating courses, problems, and users. This encapsulates
+set-up logic from tests.
 
+Factories are often implemented using `FactoryBoy`_.
+
+In general, factories should be located close to the code they use. For
+example, the factory for creating problem XML definitions is located in
+``xmodule/capa/tests/response_xml_factory.py`` because the
+``capa`` package handles problem XML.
+
+.. _FactoryBoy: https://readthedocs.org/projects/factoryboy/
 
 Running Python Unit tests
--------------------------
+*************************
+
+The following commands need to be run within a Python environment in
+which requirements/edx/testing.txt has been installed. If you are using a
+Docker-based Open edX distribution, then you probably will want to run these
+commands within the LMS and/or CMS Docker containers.
 
 We use `pytest`_ to run Python tests. Pytest is a testing framework for python and should be your goto for local Python unit testing.
 
@@ -97,16 +111,16 @@ Pytest (and all of the plugins we use with it) has a lot of options. Use `pytest
 
 
 Running Python Test Subsets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+===========================
 
 When developing tests, it is often helpful to be able to really just run one single test without the overhead of PIP installs, UX builds, etc.
 
 Various ways to run tests using pytest::
 
-    pytest path/test_m­odule.py                          # Run all tests in a module.
-    pytest path/test_m­odule.p­y:­:te­st_func               # Run a specific test within a module.
-    pytest path/test_m­odule.p­y:­:Te­stC­las­s               # Run all tests in a class
-    pytest path/test_m­odule.p­y:­:Te­stC­las­s::­tes­t_m­ethod  # Run a specific method of a class.
+    pytest path/test_module.py                          # Run all tests in a module.
+    pytest path/test_module.py::test_func               # Run a specific test within a module.
+    pytest path/test_module.py::TestClass               # Run all tests in a class
+    pytest path/test_module.py::TestClass::test_method  # Run a specific method of a class.
     pytest path/testing/                                # Run all tests in a directory.
 
 For example, this command runs a single python unit test file::
@@ -114,7 +128,7 @@ 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 Github Actions. 
+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::
 
@@ -139,7 +153,7 @@ Various tools like ddt create tests with very complex names, rather than figurin
     pytest xmodule/tests/test_stringify.py --collectonly
 
 Testing with migrations
-***********************
+=======================
 
 For the sake of speed, by default the python unit test database tables
 are created directly from apps' models. If you want to run the tests
@@ -149,7 +163,7 @@ against a database created by applying the migrations instead, use the
     pytest test --create-db --migrations
 
 Debugging a test
-~~~~~~~~~~~~~~~~
+================
 
 There are various ways to debug tests in Python and more specifically with pytest:
 
@@ -173,7 +187,7 @@ There are various ways to debug tests in Python and more specifically with pytes
 
 
 How to output coverage locally
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==============================
 
 These are examples of how to run a single test and get coverage::
 
@@ -220,234 +234,84 @@ run one of these commands::
 .. _YouTube stub server: https://github.com/openedx/edx-platform/blob/master/common/djangoapps/terrain/stubs/tests/test_youtube_stub.py
 
 
-Debugging Unittest Flakiness
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-As we move over to running our unittests with Jenkins Pipelines and pytest-xdist,
-there are new ways for tests to flake, which can sometimes be difficult to debug.
-If you run into flakiness, check (and feel free to contribute to) this
-`confluence document <https://openedx.atlassian.net/wiki/spaces/TE/pages/884998163/Debugging+test+failures+with+pytest-xdist>`__ for help.
-
-Running Javascript Unit Tests
------------------------------
-
-Before running Javascript unit tests, you will need to be running Firefox or Chrome in a place visible to edx-platform. If running this in devstack, you can run ``make dev.up.firefox`` or ``make dev.up.chrome``. Firefox is the default browser for the tests, so if you decide to use Chrome, you will need to prefix the test command with ``SELENIUM_BROWSER=chrome SELENIUM_HOST=edx.devstack.chrome`` (if using devstack).
-
-We use Jasmine to run JavaScript unit tests. To run all the JavaScript
-tests::
-
-    paver test_js
-
-To run a specific set of JavaScript tests and print the results to the
-console, run these commands::
-
-    paver test_js_run -s lms
-    paver test_js_run -s cms
-    paver test_js_run -s cms-squire
-    paver test_js_run -s xmodule
-    paver test_js_run -s xmodule-webpack
-    paver test_js_run -s common
-    paver test_js_run -s common-requirejs
-
-To run JavaScript tests in a browser, run these commands::
-
-    paver test_js_dev -s lms
-    paver test_js_dev -s cms
-    paver test_js_dev -s cms-squire
-    paver test_js_dev -s xmodule
-    paver test_js_dev -s xmodule-webpack
-    paver test_js_dev -s common
-    paver test_js_dev -s common-requirejs
-
-Debugging Specific Javascript Tests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The best way to debug individual tests is to run the test suite in the browser and
-use your browser's Javascript debugger. The debug page will allow you to select
-an individual test and only view the results of that test.
-
-
-Debugging Tests in a Browser
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To debug these tests on devstack in a local browser:
-
-* first run the appropriate test_js_dev command from above
-* open http://localhost:19876/debug.html in your host system's browser of choice
-* this will run all the tests and show you the results including details of any failures
-* you can click on an individually failing test and/or suite to re-run it by itself
-* you can now use the browser's developer tools to debug as you would any other JavaScript code
-
-Note: the port is also output to the console that you ran the tests from if you find that easier.
-
-These paver commands call through to Karma. For more
-info, see `karma-runner.github.io <https://karma-runner.github.io/>`__.
-
-Testing internationalization with dummy translations
-----------------------------------------------------
-
-Any text you add to the platform should be internationalized. To generate translations for your new strings, run the following command::
-
-    paver i18n_dummy
-
-This command generates dummy translations for each dummy language in the
-platform and puts the dummy strings in the appropriate language files.
-You can then preview the dummy languages on your local machine and also in your sandbox, if and when you create one.
-
-The dummy language files that are generated during this process can be
-found in the following locations::
-
-    conf/locale/{LANG_CODE}
-
-There are a few JavaScript files that are generated from this process. You can find those in the following locations::
-
-    lms/static/js/i18n/{LANG_CODE}
-    cms/static/js/i18n/{LANG_CODE}
-
-Do not commit the ``.po``, ``.mo``, ``.js`` files that are generated
-in the above locations during the dummy translation process!
+Handling flaky unit tests
+=========================
 
-Test Coverage and Quality
--------------------------
+See this `confluence document <https://openedx.atlassian.net/wiki/spaces/AC/pages/4306337795/Flaky+Test+Process>`_.
 
-Viewing Test Coverage
-~~~~~~~~~~~~~~~~~~~~~
 
-We currently collect test coverage information for Python
-unit/integration tests.
+Running JavaScript Unit Tests
+*****************************
 
-To view test coverage:
+Before running Javascript unit tests, you will need to be running Firefox or Chrome in a place visible to edx-platform.
+If you are using Tutor Dev to run edx-platform, then you can do so by installing and enabling the
+``test-legacy-js`` plugin from `openedx-tutor-plugins`_, and then rebuilding
+the ``openedx-dev`` image::
 
-1. Run the test suite with this command::
+    tutor plugins install https://github.com/openedx/openedx-tutor-plugins/tree/main/plugins/tutor-contrib-test-legacy-js
+    tutor plugins enable test-legacy-js
+    tutor images build openedx-dev
 
-       paver test
+.. _openedx-tutor-plugins: https://github.com/openedx/openedx-tutor-plugins/
 
-2. Generate reports with this command::
+We use Jasmine (via Karma) to run most JavaScript unit tests. We use Jest to
+run a small handful of additional JS unit tests. You can use the ``npm run
+test*`` commands to run them::
 
-       paver coverage
+    npm run test-karma  # Run all Jasmine+Karma tests.
+    npm run test-jest   # Run all Jest tests.
+    npm run test        # Run both of the above.
 
-3. Reports are located in the ``reports`` folder. The command generates
-   HTML and XML (Cobertura format) reports.
+The Karma tests are further broken down into three types depending on how the
+JavaScript it is testing is built::
 
-Python Code Style Quality
-~~~~~~~~~~~~~~~~~~~~~~~~~
+    npm run test-karma-vanilla  # Our very oldest JS, which doesn't even use RequireJS
+    npm run test-karma-require  # Old JS that uses RequireJS
+    npm run test-karma-webpack  # Slightly "newer" JS which is built with Webpack
 
-To view Python code style quality (including PEP 8 and pylint violations) run this command::
+Unfortunately, at the time of writing, the build for the ``test-karma-webpack``
+tests is broken. The tests are excluded from ``npm run test-karma`` as to not
+fail CI. We `may fix this one day`_.
 
-    paver run_quality
+.. _may fix this one day: https://github.com/openedx/edx-platform/issues/35956
 
-More specific options are below.
+To run all Karma+Jasmine tests for a particular top-level edx-platform folder,
+you can run::
 
--  These commands run a particular quality report::
+    npm run test-cms
+    npm run test-lms
+    npm run test-xmodule
+    npm run test-common
 
-       paver run_pep8
-       paver run_pylint
-
--  This command runs a report, and sets it to fail if it exceeds a given number
-   of violations::
-
-       paver run_pep8 --limit=800
-
--  The ``run_quality`` uses the underlying diff-quality tool (which is packaged
-   with `diff-cover`_). With that, the command can be set to fail if a certain
-   diff threshold is not met. For example, to cause the process to fail if
-   quality expectations are less than 100% when compared to master (or in other
-   words, if style quality is worse than what is already on master)::
-
-       paver run_quality --percentage=100
-
--  Note that 'fixme' violations are not counted with run\_quality. To
-   see all 'TODO' lines, use this command::
-
-       paver find_fixme --system=lms
-
-   ``system`` is an optional argument here. It defaults to
-   ``cms,lms,common``.
-
-.. _diff-cover: https://github.com/Bachmann1234/diff-cover
-
-
-JavaScript Code Style Quality
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To view JavaScript code style quality run this command::
-
-    paver run_eslint
-
--  This command also comes with a ``--limit`` switch, this is an example of that switch::
-
-    paver run_eslint --limit=50000
-
-
-Code Complexity Tools
-=====================
-
-Tool(s) available for evaluating complexity of edx-platform code:
-
-
-- `plato <https://github.com/es-analysis/plato>`__ for JavaScript code
-  complexity. Several options are available on the command line; see
-  documentation.  Below, the following command will produce an HTML report in a
-  subdirectory called "jscomplexity"::
-
-       plato -q -x common/static/js/vendor/ -t common -e .eslintrc.json -r -d jscomplexity common/static/js/
-
-Other Testing Tips
-==================
-
-Connecting to Browser
----------------------
-
-If you want to see the browser being automated for JavaScript,
-you can connect to the container running it via VNC.
-
-+------------------------+----------------------+
-| Browser                | VNC connection       |
-+========================+======================+
-| Firefox (Default)      | vnc://0.0.0.0:25900  |
-+------------------------+----------------------+
-| Chrome (via Selenium)  | vnc://0.0.0.0:15900  |
-+------------------------+----------------------+
-
-On macOS, enter the VNC connection string in Safari to connect via VNC. The VNC
-passwords for both browsers are randomly generated and logged at container
-startup, and can be found by running ``make vnc-passwords``.
-
-Most tests are run in Firefox by default.  To use Chrome for tests that normally
-use Firefox instead, prefix the test command with
-``SELENIUM_BROWSER=chrome SELENIUM_HOST=edx.devstack.chrome``
-
-Factories
----------
-
-Many tests delegate set-up to a "factory" class. For example, there are
-factories for creating courses, problems, and users. This encapsulates
-set-up logic from tests.
-
-Factories are often implemented using `FactoryBoy`_.
-
-In general, factories should be located close to the code they use. For
-example, the factory for creating problem XML definitions is located in
-``xmodule/capa/tests/response_xml_factory.py`` because the
-``capa`` package handles problem XML.
-
-.. _FactoryBoy: https://readthedocs.org/projects/factoryboy/
+Finally, if you want to pass any options to the underlying ``node`` invocation
+for Karma+Jasmine tests, you can run one of these specific commands, and put
+your arguments after the ``--`` separator::
 
-Running Tests on Paver Scripts
-------------------------------
+    npm run test-cms-vanilla -- --your --args --here
+    npm run test-cms-require -- --your --args --here
+    npm run test-cms-webpack -- --your --args --here
+    npm run test-lms-webpack -- --your --args --here
+    npm run test-xmodule-vanilla -- --your --args --here
+    npm run test-xmodule-webpack -- --your --args --here
+    npm run test-common-vanilla -- --your --args --here
+    npm run test-common-require -- --your --args --here
 
-To run tests on the scripts that power the various Paver commands, use the following command::
 
-  pytest pavelib
+Code Quality
+************
 
-Testing using queue servers
----------------------------
+We use several tools to analyze code quality. The full set of them is::
 
-When testing problems that use a queue server on AWS (e.g.
-sandbox-xqueue.edx.org), you'll need to run your server on your public IP, like so::
+    mypy $PATHS...
+    pycodestyle $PATHS...
+    pylint $PATHS...
+    lint-imports
+    scripts/verify-dunder-init.sh
+    make xsslint
+    make pii_check
+    make check_keywords
+    npm run lint
 
-    ./manage.py lms runserver 0.0.0.0:8000
+Where ``$PATHS...`` is a list of folders and files to analyze, or nothing if
+you would like to analyze the entire codebase (which can take a while).
 
-When you connect to the LMS, you need to use the public ip. Use
-``ifconfig`` to figure out the number, and connect e.g. to
-``http://18.3.4.5:8000/``
diff --git a/docs/conf.py b/docs/conf.py
index f37fc32f6160..ec416f1c19e6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,7 +55,6 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
     'sphinx.ext.coverage',
     'sphinx.ext.doctest',
     'sphinx.ext.graphviz',
@@ -68,8 +67,23 @@
     'sphinx_design',
     'code_annotations.contrib.sphinx.extensions.featuretoggles',
     'code_annotations.contrib.sphinx.extensions.settings',
+    # 'autoapi.extension',  # Temporarily disabled
+    'sphinx_reredirects',
 ]
 
+# Temporarily disabling autoapi_dirs and the AutoAPI extension due to performance issues.
+# This will unblock ReadTheDocs builds and will be revisited for optimization.
+# autoapi_type = 'python'
+# autoapi_dirs = ['../lms/djangoapps', '../openedx/core/djangoapps', "../openedx/features"]
+#
+# autoapi_ignore = [
+#     '*/migrations/*',
+#     '*/tests/*',
+#     '*.pyc',
+#     '__init__.py',
+#     '**/xblock_serializer/data.py',
+# ]
+
 # Rediraffe related settings.
 rediraffe_redirects = "redirects.txt"
 rediraffe_branch = 'origin/master'
@@ -83,11 +97,11 @@
 except git.InvalidGitRepositoryError:
     edx_platform_version = "master"
 
-featuretoggles_source_path = edxplatform_source_path
+featuretoggles_source_path = str(edxplatform_source_path)
 featuretoggles_repo_url = edxplatform_repo_url
 featuretoggles_repo_version = edx_platform_version
 
-settings_source_path = edxplatform_source_path
+settings_source_path = str(edxplatform_source_path)
 settings_repo_url = edxplatform_repo_url
 settings_repo_version = edx_platform_version
 
@@ -108,7 +122,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -170,7 +184,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -258,23 +272,25 @@
 epub_exclude_files = ['search.html']
 
 
+# -- Read the Docs Specific Configuration
+# Define the canonical URL if you are using a custom domain on Read the Docs
+html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")
+
+# Tell Jinja2 templates the build is running on Read the Docs
+if os.environ.get("READTHEDOCS", "") == "True":
+    if "html_context" not in globals():
+        html_context = {}
+    html_context["READTHEDOCS"] = True
+
 # -- Extension configuration -------------------------------------------------
 
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'https://docs.python.org/2.7': None,
-    'django': ('https://docs.djangoproject.com/en/1.11/', 'https://docs.djangoproject.com/en/1.11/_objects/'),
+    'django': ('https://docs.djangoproject.com/en/4.2/', 'https://docs.djangoproject.com/en/4.2/_objects/'),
 }
 
-# Mock out these external modules during code import to avoid errors
-autodoc_mock_imports = [
-    'MySQLdb',
-    'django_mysql',
-    'pymongo',
-]
-
 # Start building a map of the directories relative to the repository root to
 # run sphinx-apidoc against and the directories under "docs" in which to store
 # the generated *.rst files
@@ -289,6 +305,16 @@
     # 'xmodule': 'references/docstrings/xmodule',
 }
 
+# Mapping permanently moved pages to appropriate new location outside of edx-platform
+# with by sphinx-reredirects extension redirects.
+# More information: https://documatt.com/sphinx-reredirects/usage.html
+
+redirects = {
+    'hooks/events': 'https://docs.openedx.org/projects/openedx-events/en/latest/',
+    'hooks/filters': 'https://docs.openedx.org/projects/openedx-filters/en/latest/',
+    'hooks/index': 'https://docs.openedx.org/en/latest/developers/concepts/hooks_extension_framework.html',
+}
+
 
 def update_settings_module(service='lms'):
     """
diff --git a/docs/concepts/frontend/static_assets.rst b/docs/decisions/0000-static-asset-plan.rst
similarity index 90%
rename from docs/concepts/frontend/static_assets.rst
rename to docs/decisions/0000-static-asset-plan.rst
index 89e7a64f4455..00fcc0726ad7 100644
--- a/docs/concepts/frontend/static_assets.rst
+++ b/docs/decisions/0000-static-asset-plan.rst
@@ -1,6 +1,22 @@
-#######################################
-edx-platform Static Asset Pipeline Plan
-#######################################
+0. edx-platform Static Asset Pipeline Plan
+##########################################
+
+Status
+******
+
+Accepted ~2017
+Partially adopted 2017-2024
+
+This was an old plan for modernizing Open edX's frontend assets. We've
+retroactively turned it into an ADR because it has some valuable insights.
+Although most of these improvements weren't applied as written, these ideas
+(particularly, separating Python concerns from frontend tooling concerns) were
+applied to both legacy edx-platform assets as well as the Micro-Frontend
+framework that was developed 2017-2019.
+
+Context, Decision, Consequences
+*******************************
+
 
 Static asset handling in edx-platform has evolved in a messy way over the years.
 This has led to a lot of complexity and inconsistencies. This is a proposal for
@@ -9,20 +25,9 @@ this is not a detailed guide for how to write React or Bootstrap code. This is
 instead going to talk about conventions for how we arrange, extract, and compile
 static assets.
 
-Big Open Questions (TODO)
-*************************
-
-This document is a work in progress, as the design for some of this is still in
-flux, particularly around extensibility.
-
-* Pluggable third party apps and Webpack packaging.
-* Keep the Django i18n mechanism?
-* Stance on HTTP/2 and bundling granularity.
-* Optimizing theme assets.
-* Tests
 
 Requirements
-************
+============
 
 Any proposed solution must support:
 
@@ -35,7 +40,7 @@ Any proposed solution must support:
 * Other kinds of pluggability???
 
 Assumptions
-***********
+===========
 
 Some assumptions/opinions that this proposal is based on:
 
@@ -54,8 +59,8 @@ Some assumptions/opinions that this proposal is based on:
 * It should be possible to pre-build static assets and deploy them onto S3 or
   similar.
 
-Where We Are Today
-******************
+Where We Are Today (2017)
+=========================
 
 We have a static asset pipeline that is mostly driven by Django's built-in
 staticfiles finders and the collectstatic process. We use the popular
@@ -95,9 +100,9 @@ places (typically ``/edx/var/edxapp/staticfiles`` for LMS and
 ``/edx/var/edxapp/staticfiles/studio`` for Studio) and can be collected
 separately. However in practice they're always run together because we deploy
 them from the same commits and to the same servers.
- 
+
 Django vs. Webpack Conventions
-******************************
+==============================
 
 The Django convention for having an app with bundled assets is to namespace them
 locally with the app name so that they get their own directories when they are
@@ -112,7 +117,7 @@ the root of edx-platform, which would specify all bundles in the project.
 TODO: The big, "pluggable Webpack components" question.
 
 Proposed Repo Structure
-***********************
+=======================
 
 All assets that are in common spaces like ``common/static``, ``lms/static``,
 and ``cms/static`` would be moved to be under the Django apps that they are a
@@ -122,7 +127,7 @@ part of and follow the Django naming convention (e.g.
 any client-side templates will be put in ``static/{appname}/templates``.
 
 Proposed Compiled Structure
-***************************
+===========================
 
 This is meant to be a sample of the different types of things we'd have, not a
 full list:
@@ -150,14 +155,14 @@ full list:
   /theming/themes/open-edx
                  /red-theme
                  /edx.org
-  
+
   # XBlocks still collect their assets into a common space (/xmodule goes away)
   # We consider this to be the XBlock Runtime's app, and it collects static
   # assets from installed XBlocks.
   /xblock
 
 Django vs. Webpack Roles
-************************
+========================
 
 Rule of thumb: Django/Python still serves static assets, Webpack processes and
 optimizes them.
diff --git a/docs/decisions/0020-upstream-downstream.rst b/docs/decisions/0020-upstream-downstream.rst
new file mode 100644
index 000000000000..3f6bbacfb839
--- /dev/null
+++ b/docs/decisions/0020-upstream-downstream.rst
@@ -0,0 +1,407 @@
+4. Upstream and downstream content
+##################################
+
+Status
+******
+
+Accepted.
+
+Implementation in progress as of 2024-09-03.
+
+Context
+*******
+
+We are replacing the existing Legacy ("V1") Content Libraries system, based on
+ModuleStore, with a Relaunched ("V2") Content Libraries  system, based on
+Learning Core. V1 and V2 libraries will coexist for at least one release to
+allow for migration; eventually, V1 libraries will be removed entirely.
+
+Content from V1 libraries can only be included into courses using the
+LibraryContentBlock (called "Randomized Content Module" in Studio), which works
+like this:
+
+* Course authors add a LibraryContentBlock to a Unit and configure it with a
+  library key and a count of N library blocks to select (or `-1` for "all
+  blocks").
+
+* For each block in the chosen library, its *content definition* is copied into
+  the course as a child of the LibraryContentBlock, whereas its *settings* are
+  copied into a special "default" settings dictionary in the course's structure
+  document--this distinction will matter later. The usage key of each copied
+  block is derived from a hash of the original library block's usage key plus
+  the LibraryContentBlock's own usage key--this will also matter
+  later.
+
+* The course author is free to override the content and settings of the
+  course-local copies of each library block.
+
+* When any update is made to the library, the course author is prompted to
+  update the LibraryContentBlock. This involves re-copying the library blocks'
+  content definitions and default settings, which clobbers any overrides they
+  have made to content, but preserves any overrides they have made to settings.
+  Furthermore, any blocks that were added to the library are newly copied into
+  the course, and any blocks that were removed from the library are deleted
+  from the course. For all blocks, usage keys are recalculated using the same
+  hash derivation described above; for existing blocks, it is important that
+  this recalculation yields the same usage key so that student state is not
+  lost.
+
+* Over in the LMS, when a learner loads LibraryContentBlock, they are shown a
+  list of N randomly-picked blocks from the library. Subsequent visits show
+  them the same list, *unless* children were added, children were removed, or N
+  changed. In those cases, the LibraryContentBlock tries to make the smallest
+  possible adjustment to their personal list of blocks while respecting N and
+  the updated list of children.
+
+This system has several issues:
+
+#. **Missing defaults after import:** When a course with a LibraryContentBlock
+   is imported into an Open edX instance *without* the referenced library, the
+   blocks' *content* will remain intact as will course-local *settings
+   overrides*. However, any *default settings* defined in the library will be
+   missing. This can result in content that is completely broken, especially
+   since critical fields like video URLs and LTI URLs are considered
+   "settings". For a detailed scenario, see `LibraryContentBlock Curveball 1`_.
+
+#. **Strange behavior when duplicating content:** Typically, when a
+   block is duplicated or copy-pasted, the new block's usage key and its
+   children's usage keys are randomly generated. However, recall that when a
+   LibraryContentBlock is updated, its children's usage keys are rederived
+   using a hash function. That would cause the children's usage keys to change,
+   thus destroying any student state. So, we must work around this with a hack:
+   upon duplicating or pasting a LibraryContentBlock, we immediately update the
+   LibraryContentBlock, thus discarding the problematic randomly-generated keys
+   in favor of hash-derived keys. This works, but:
+
+   * it involves weird code hacks,
+   * it unexpectedly discards any content overrides the course author made to
+     the copied LibraryContentBlock's children,
+   * it unexpectedly uses the latest version of library content, regardless of
+     which version the copied LibraryContentBlock was using, and
+   * it fails if the library does not exist on the Open edX instance, which
+     can happen if the course was imported from another instance.
+
+#. **Conflation of reference and randomization:** The LibraryContentBlock does
+   two things: it connects courses to library content, and it shows users a
+   random subset of content. There is no reason that those two features need to
+   be coupled together. A course author may want to randomize course-defined
+   content, or they may want to randomize content from multiple different
+   libraries. Or, they may want to use content from libraries without
+   randomizing it at all. While it is feasible to support all these things in a
+   single XBlock, trying to do so led to a `very complicated XBlock concept`_
+   which difficult to explain to product managers and other engineers.
+
+#. **Unpredictable preservation of overrides:** Recall that *content
+   definitions* and *settings* are handled differently. This distinction is
+   defined in the code: every authorable XBlock field is either defined with
+   `Scope.content` or `Scope.settings`. In theory, XBlock developers would use
+   the content scope for fields that are core to the meaning of piece of
+   content, and they would only use the settings scope for fields that would be
+   reasonable to configure in a local copy of the piece of content. In
+   practice, though, XBlock developers almost always use `Scope.settings`. The
+   result of this is that customizations to blocks *almost always* survive
+   through library updates, except when they don't. Course authors have no way
+   to know (or even guess) when their customizations they will and won't
+   survive updates.
+
+#. **General pain and suffering:** The relationship between courses and V1
+   libraries is confusing to content authors, site admins, and developers
+   alike. The behaviors above toe the line between "quirks" and "known bugs",
+   and they are not all documented. Past attempts to improve the system have
+   `triggered series of bugs`_, some of which led to permanent loss of learner
+   state. In other cases, past Content Libraries improvement efforts have
+   slowed or completely stalled out in code review due to the overwhelming
+   amount of context and edge cases that must be understood to safely make any
+   changes.
+
+.. _LibraryContentBlock Curveball 1: https://openedx.atlassian.net/wiki/spaces/COMM/pages/3966795804/Fun+with+LibraryContentBlock+export+import+and+duplication#Curveball-1%3A-Import%2FExport
+.. _LibraryContentBlock Curveball 2: https://openedx.atlassian.net/wiki/spaces/COMM/pages/3966795804/Fun+with+LibraryContentBlock+export+import+and+duplication#Curveball-2:-Duplication
+.. _very complicated XBlock concept: https://github.com/openedx/edx-platform/blob/master/xmodule/docs/decisions/0003-library-content-block-schema.rst
+.. _triggered series of bugs: https://openedx.atlassian.net/wiki/spaces/COMM/pages/3858661405/Bugs+from+Content+Libraries+V1
+
+We are keen to use the Library Relaunch project to address all of these
+problems. So, V2 libraries will interop with courses using a completely
+different data model.
+
+
+Decision
+********
+
+We will create a framework where a *downstream* piece of content (e.g. a course
+block) can be *linked* to an *upstream* piece of content (e.g., a library
+block) with the following properties:
+
+* **Portable:** Links can refer to certain content on the current Open edX
+  instance, and in the future they may be able to refer to content on other
+  Open edX instances or sites. Links will never include information that is
+  internal to a particular Open edX instance, such as foreign keys.
+
+* **Flat:** The *link* is a not a wrapper (like the LibraryContentBlock),
+  but simply a piece of metadata directly on the downstream content which
+  points to the upstream content. We will no longer rely on precarious
+  hash-derived usage keys to establish connection to upstream blocks;
+  like any other block, an upstream-linked blocks can be granted whatever block
+  ID that the authoring environment assigns it, whether random or
+  human-readable.
+
+* **Forwards-compatible:** If downstream content is created in a course on
+  an Open edX site that supports upstream and downstreams (e.g., a Teak
+  instance), and then it is exported and imported into a site that doesn't
+  (e.g., a Quince instance), the downstream content will simply act like
+  regular course content.
+
+* **Independent:** Upstream content and downstream content exist separately
+  from one another:
+
+  * Modifying upstream content does not affect any downstream content (unless a
+    sync happens, more on that later).
+  * Deleting upstream content does not impact its downstream content. By
+    corollary, pieces of downstream content can completely and correctly render
+    on Open edX instances that are missing their linked upstream content.
+  * (Preserving a positive feature of the V1 LibraryContentBlock) The link
+    persists through export-import and copy-paste, regardless of whether the
+    upstream content actually exists. A "broken" link to upstream content is
+    seamlessly "repaired" if the upstream content becomes available again.
+
+* **Customizable:** On an OLX level, authors can still override the value
+  of any field for a piece of downstream content. However, we will empower
+  Studio to be more prescriptive about what authors *can* override versus what
+  they *should* override:
+
+  * We define a set of *customizable* fields, with platform-level defaults
+    like display_name and a max_attempts, plus the ability for external
+    XBlocks to opt their own fields into customizability.
+  * Studio may use this list to provide an interface for customizing
+    downstream blocks, separate from the usual "Edit" interface that would
+    permit them to make unsafe overrides.
+  * Furthermore, downstream content will record which fields the user has
+    customized...
+
+    * even if the customization is to simply clear the value of the fields...
+    * and even if the customization is made redundant in a future version of
+      the upstream content. For example, if max_attempts is customized from 3
+      to 5 in the downstream content, but the next version of the upstream
+      content also changes max_attempts to 5, the downstream would still
+      consider max_attempts to be customized. If the following version of the
+      upstream content again changed max_attempts to 6, the downstream would
+      retain max_attempts to be 5.
+
+  * Finally, the downstream content will locally save the upstream value of
+    customizable fields, allowing the author to *revert* back to them
+    regardless of whether the upstream content is actually available.
+
+* **Synchronizable, without surprises:** Downstream content can be *synced*
+  with updates that have been made to its linked upstream. This means that the
+  latest available upstream content field values will entirely replace all of
+  the downstream field values, *except* those which were customized, as
+  described in the previous item.
+
+* **Concrete, but flexible:** The internal implementation of upstream-downstream
+  syncing will assume that:
+
+  * upstream content belongs to a V2 content library,
+  * downstream content belongs to a course on the same instance, and
+  * the link is the stringified usage key of the upstream library content.
+
+  This will allow us to keep the implementation straightforward. However, we
+  will *not* expose these assumptions in the Python APIs, the HTTP APIs, or in
+  the persisted fields, allowing us in the future to generalize to other
+  upstreams (such as externally-hosted libraries) and other downstreams (such
+  as a standalone enrollable sequence without a course).
+
+  If any of these assumptions are violated, we will raise an exception or log a
+  warning, as appropriate. Particularly, if these assumptions are violated at
+  the OLX level via a course import, then we will probably show a warning at
+  import time and refuse to sync from the unsupported upstream; however, we
+  will *not* fail the entire import or mangle the value of upstream link, since
+  we want to remain forwards-compatible with potential future forms of syncing.
+  As a concrete example: if a course block has *another course block's usage
+  key* as an upstream, then we will faithfully keep that value through the
+  import and export process, but we will not prompt the user to sync updates
+  for that block.
+
+* **Decoupled:** Upstream-downstream linking is not tied up with any other
+  courseware feature; in particular, it is unrelated to content randomization.
+  Randomized library content will be supported, but it will be a *synthesis* of
+  two features: (1) a RandomizationBlock that randomly selects a subset of its
+  children, where (2) some or all of those children are linked to upstream
+  blocks.
+
+Consequences
+************
+
+To support the Libraries Relaunch in Sumac:
+
+* For every XBlock in CMS, we will use XBlock fields to persist the upstream
+  link, its versions, its customizable fields, and its set of downstream
+  overrides.
+
+  * We will avoid exposing these fields to LMS code.
+
+  * We will define an initial set of customizable fields for Problem, Text, and
+    Video blocks.
+
+* We will define method(s) for syncing update on the XBlock runtime so that
+  they are available in the SplitModuleStore's XBlock Runtime
+  (CachingDescriptorSystem).
+
+  * Either in the initial implementation or in a later implementation, it may
+    make sense to declare abstract versions of the syncing method(s) higher up
+    in XBlock Runtime inheritance hierarchy.
+
+* We will expose a CMS HTTP API for syncing updates to blocks from their
+  upstreams.
+
+  * We will avoid exposing this API from the LMS.
+
+For reference, here are some excerpts of a potential implementation. This may
+change through development and code review.
+
+(UPDATE: When implementing, we ended up factoring this code differently.
+Particularly, we opted to use regular functions rather than add new
+XBlock Runtime methods, allowing us to avoid mucking with the complicated
+inheritance hierarchy of CachingDescriptorSystem and SplitModuleStoreRuntime.)
+
+.. code-block:: python
+
+    ###########################################################################
+    # cms/lib/xblock/upstream_sync.py
+    ###########################################################################
+
+    class UpstreamSyncMixin(XBlockMixin):
+        """
+        Allows an XBlock in the CMS to be associated & synced with an upstream.
+        Mixed into CMS's XBLOCK_MIXINS, but not LMS's.
+        """
+
+        # Metadata related to upstream synchronization
+        upstream = String(
+            help=("""
+                The usage key of a block (generally within a content library)
+                which serves as a source of upstream updates for this block,
+                or None if there is no such upstream. Please note: It is valid
+                for this field to hold a usage key for an upstream block
+                that does not exist (or does not *yet* exist) on this instance,
+                particularly if this downstream block was imported from a
+                different instance.
+            """),
+            default=None, scope=Scope.settings, hidden=True, enforce_type=True
+        )
+        upstream_version = Integer(
+            help=("""
+                Record of the upstream block's version number at the time this
+                block was created from it. If upstream_version is smaller
+                than the upstream block's latest version, then the user will be
+                able to sync updates into this downstream block.
+            """),
+            default=None, scope=Scope.settings, hidden=True, enforce_type=True,
+        )
+        downstream_customized = Set(
+            help=("""
+                Names of the fields which have values set on the upstream
+                block yet have been explicitly overridden on this downstream
+                block. Unless explicitly cleared by the user, these
+                customizations will persist even when updates are synced from
+                the upstream.
+            """),
+            default=[], scope=Scope.settings, hidden=True, enforce_type=True,
+        )
+
+        # Store upstream defaults for customizable fields.
+        upstream_display_name = String(...)
+        upstream_max_attempts = List(...)
+        ...  # We will probably want to pre-define several more of these.
+
+        def get_upstream_field_names(cls) -> dict[str, str]:
+            """
+            Mapping from each customizable field to field which stores its upstream default.
+            XBlocks outside of edx-platform can override this in order to set
+            up their own customizable fields.
+            """
+            return {
+                "display_name": "upstream_display_name",
+                "max_attempts": "upstream_max_attempts",
+            }
+
+        def save(self, *args, **kwargs):
+            """
+            Update `downstream_customized` when a customizable field is modified.
+            Uses `get_upstream_field_names` keys as the list of fields that are
+            customizable.
+            """
+            ...
+
+    @dataclass(frozen=True)
+    class UpstreamInfo:
+        """
+        Metadata about a block's relationship with an upstream.
+        """
+        usage_key: UsageKey
+        current_version: int
+        latest_version: int | None
+        sync_url: str
+        error: str | None
+
+        @property
+        def sync_available(self) -> bool:
+            """
+            Should the user be prompted to sync this block with upstream?
+            """
+            return (
+                self.latest_version
+                and self.current_version < self.latest_version
+                and not self.error
+            )
+
+
+    ###########################################################################
+    # xmodule/modulestore/split_mongo/caching_descriptor_system.py
+    ###########################################################################
+
+    class CachingDescriptorSystem(...):
+
+        def validate_upstream_key(self, usage_key: UsageKey | str) -> UsageKey:
+            """
+            Raise an error if the provided key is not a valid upstream reference.
+            Instead of explicitly checking whether a key is a LibraryLocatorV2,
+            callers should validate using this function, and use an `except` clause
+            to handle the case where the key is not a valid upstream.
+            Raises: InvalidKeyError, UnsupportedUpstreamKeyType
+            """
+            ...
+
+        def sync_from_upstream(self, *, downstream_key: UsageKey, apply_updates: bool) -> None:
+            """
+            Python API for loading updates from upstream block.
+            Can choose whether or not to actually apply those updates...
+                apply_updates=False: Think "get fetch".
+                                     Use case: course import.
+                apply_updates=True:  Think "git pull".
+                                     Use case: sync_updates handler.
+            Raises: InvalidKeyError, UnsupportedUpstreamKeyType, XBlockNotFoundError
+            """
+            ...
+
+        def get_upstream_info(self, downstream_key: UsageKey) -> UpstreamInfo | None:
+            """
+            Python API for upstream metadata, or None.
+            Raises: InvalidKeyError, XBlockNotFoundError
+            """
+            ...
+
+Finally, here is what the OLX for a library-sourced Problem XBlock in a course
+might look like:
+
+.. code-block:: xml
+
+   <problem
+     display_name="A title that has been customized in the course"
+     max_attempts="2"
+     upstream="lb:myorg:mylib:problem:p1"
+     upstream_version="12"
+     downstream_customized="[&quot;display_name&quot;,&quot;max_attempts&quot;]"
+     upstream_display_name="The title that was defined in the library block"
+     upstream_max_attempts="3"
+   >
+     <!-- problem content would go here -->
+   </problem>
diff --git a/docs/decisions/0021-fixing-quality-and-js-checks.rst b/docs/decisions/0021-fixing-quality-and-js-checks.rst
new file mode 100644
index 000000000000..7d80039a8cb0
--- /dev/null
+++ b/docs/decisions/0021-fixing-quality-and-js-checks.rst
@@ -0,0 +1,143 @@
+Fixing the Quality and JS checks
+################################
+
+Status
+******
+
+Accepted
+
+Implemented by https://github.com/openedx/edx-platform/pull/35159
+
+Context
+*******
+
+edx-platform PRs need to pass a series of CI checks before merging, including
+but not limited to: a CLA check, various unit tests, and various code quality
+tests. Of these checks, two checks were implemented using the "Paver" Python
+package, a scripting library `which we have been trying to move off of`_. These
+two checks and their steps were:
+
+* **Check: Quality others**
+
+  * **pii_check**: Ensure that Django models have PII annotations as
+    described in `OEP-30`_, with a minimum threshold of **94.5%** of models
+    annotated.
+  * **stylelint**: Statically check sass stylesheets for common errors.
+  * **pep8**: Run pycodestyle against Python code.
+  * **eslint**: Statically check javascript code for common errors.
+  * **xsslint**: Check python & javascript for xss vulnerabilities.
+  * **check_keywords**: Compare Django model field names against a denylist of
+    reserved keywords.
+
+* **Check: JS**
+
+  * **test-js**: Run javascript unit tests.
+  * **coverage-js**: Check that javascript test coverage has not dropped.
+
+As we worked to reimplement these checks without Paver, we unfortunately
+noticed that four of those steps had bugs in their implementations, and thus
+had not been enforcing what they promised to:
+
+* **pii_check**: Instead of just checking the result of the underlying
+  code_annotations command, this check wrote an annotations report to a file,
+  and then used regex to parse the report and determine whether the check
+  should pass. However, the check failed to validate that the generation of the
+  report itself was successful. So, when malformed annotations were introduced
+  to the edx-proctoring repository, which edx-platform installs, the check
+  began silently passing.
+
+* **stylelint**: At some point, the `stylelint` binary stopped being available
+  on the runner's `$PATH`. Rather than causing the Quality Others check to
+  fail, the Paver code quietly ignored the shell error, and considered the
+  empty stylelint report file to indicate that there were not linting
+  violations.
+
+* **test-js**: There are eight suites within test-js. Six of them work fine.
+  But three of them--specifically the suites that test code built by Webpack--
+  have not been running for some unknown amount of time. The Webpack test build
+  has been failing without signalling that the test suite should fail,
+  both preventing the tests from runnning and preventing anyone from noticing
+  that the tests weren't running.
+
+* **coverage-js**: This check tried to use `diff-cover` in order to compare the
+  coverage report on the current branch with the coverage report on the master
+  branch. However, the coverage report does not exist on the master branch, and
+  it's not clear when it ever did. The coverage-js step failed to validate that
+  `diff-cover` ran successfully, and instead of raising an error, it allowed
+  the JS check to pass.
+
+Decision & Consequences
+***********************
+
+pii_check
+=========
+
+We `fixed the malformed annotations`_ in edx-proctoring, allowing the pii_check
+to once again check model coverage. We have ensured that any future failure of
+the code_annotations command (due to, for example, future malformed
+annotations) will cause the pii_check step and the overall Quality Others check
+to fail. We have stopped trying to parse the result of the annotations report
+in CI, as this was and is completely unneccessary.
+
+In order to keep "Quality others" passing on the edx-platform master branch, we
+lowered the PII annotation coverage threshold to reflect the percentage of
+then-annotated models: **71.6%**. After a timeboxed effort to add missing
+annotations and expand the annotation allowlist as appropriate, we have managed
+to raise the threshold to **85.3%**. It is not clear whether we will put in
+further effort to raise the annotation threshold back to 95%.
+
+This was all already `announced on the forums`_.
+
+stylelint
+=========
+
+We have removed the **stylelint** step entirely from the "Quality Others"
+check. Sass code in the edx-platform repository will no longer be subject to
+any static analysis.
+
+test-js
+=======
+
+We have stopped running these Webpack-based suites in CI:
+
+* ``npm run test-lms-webpack``
+* ``npm run test-cms-webpack``
+* ``npm run test-xmodule-webpack``
+
+We have created a new edx-platform backlog issue for
+`fixing and re-enabling these suites`_.
+It is not clear whether we will prioritize that issue, or instead prioritize
+deprecation and removal of the code that those suites were supposed to be
+testing.
+
+coverage-js
+===========
+
+We will remove the **coverage-js** step entirely from the "JS" check.
+JavaScript code in the edx-platform repository will no longer be subject to any
+unit test coverage checking.
+
+Rejected Alternatives
+*********************
+
+* While it would be ideal to raise the pii_check threshold to 94.5% or even
+  100%, we do not have the resources to promise this.
+
+* It would also be nice to institute a "racheting" mechanism for the PII
+  annotation coverage threshold. That is, every commit to master could save the
+  coverage percentage to a persisted artifact, allowing subsequent PRs to
+  ensure that the pii_check never returns lower than the current threshold. We
+  will put this in the Aximprovements backlog, but we cannot commit to
+  implementing it right now.
+
+* We will not fix or apply amnestly in order to re-enable stlylint or
+  coverage-js. That could take significant effort, which we believe would be
+  better spent completing the migration off of this legacy Sass and JS and onto
+  our modern React frontends.
+
+
+.. _fixing and re-enabling these suites: https://github.com/openedx/edx-platform/issues/35956
+.. _which we have been trying to move off of: https://github.com/openedx/edx-platform/issues/34467
+.. _announced on the forums: https://discuss.openedx.org/t/checking-pii-annotations-with-a-lower-coverage-threshold/14254
+.. _OEP-30: https://docs.openedx.org/projects/openedx-proposals/en/latest/architectural-decisions/oep-0030-arch-pii-markup-and-auditing.html
+.. _fix the malformed annotations: https://github.com/openedx/edx-proctoring/issues/1241
diff --git a/docs/docs_settings.py b/docs/docs_settings.py
index 5bc9b1594697..d5164edfa1e1 100644
--- a/docs/docs_settings.py
+++ b/docs/docs_settings.py
@@ -4,7 +4,7 @@
 import all the Studio code.
 """
 
-
+from textwrap import dedent
 import os
 
 from openedx.core.lib.derived import derive_settings
@@ -14,7 +14,6 @@
     ADVANCED_PROBLEM_TYPES,
     COURSE_IMPORT_EXPORT_STORAGE,
     GIT_EXPORT_DEFAULT_IDENT,
-    LIBRARY_AUTHORING_MICROFRONTEND_URL,
     SCRAPE_YOUTUBE_THUMBNAILS_JOB_QUEUE,
     VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE,
     UPDATE_SEARCH_INDEX_JOB_QUEUE,
@@ -28,18 +27,72 @@
         FEATURES[key] = True
 
 # Settings that will fail if we enable them, and we don't need them for docs anyway.
-FEATURES['RUN_AS_ANALYTICS_SERVER_ENABLED'] = False
-FEATURES['ENABLE_SOFTWARE_SECURE_FAKE'] = False
-FEATURES['ENABLE_MKTG_SITE'] = False
+FEATURES["RUN_AS_ANALYTICS_SERVER_ENABLED"] = False
+FEATURES["ENABLE_SOFTWARE_SECURE_FAKE"] = False
+FEATURES["ENABLE_MKTG_SITE"] = False
+
+INSTALLED_APPS.extend(
+    [
+        "cms.djangoapps.contentstore.apps.ContentstoreConfig",
+        "cms.djangoapps.course_creators",
+        "cms.djangoapps.xblock_config.apps.XBlockConfig",
+        "lms.djangoapps.lti_provider",
+        "openedx.core.djangoapps.content.search",
+    ]
+)
+
+# Swagger generation details
+openapi_security_info_basic = (
+    "Obtain with a `POST` request to `/user/v1/account/login_session/`.  "
+    "If needed, copy the cookies from the response to your new call."
+)
+openapi_security_info_jwt = dedent(
+    """
+    Obtain by making a `POST` request to `/oauth2/v1/access_token`.
+
+    You will need to be logged in and have a client ID and secret already created.
 
-INSTALLED_APPS.extend([
-    'cms.djangoapps.contentstore.apps.ContentstoreConfig',
-    'cms.djangoapps.course_creators',
-    'cms.djangoapps.xblock_config.apps.XBlockConfig',
-    'lms.djangoapps.lti_provider',
-])
+    Your request should have the headers
+
+    ```
+    'Content-Type': 'application/x-www-form-urlencoded'
+    ```
+
+    Your request should have the data payload
+
+    ```
+    'grant_type': 'client_credentials'
+    'client_id': [your client ID]
+    'client_secret':  [your client secret]
+    'token_type': 'jwt'
+    ```
+
+    Your JWT will be returned in the response as `access_token`. Prefix with `JWT ` in your header.
+    """
+)
+openapi_security_info_csrf = (
+    "Obtain by making a `GET` request to `/csrf/api/v1/token`. The token will be in the response cookie `csrftoken`."
+)
+SWAGGER_SETTINGS["SECURITY_DEFINITIONS"] = {
+    "Basic": {
+        "type": "basic",
+        "description": openapi_security_info_basic,
+    },
+    "jwt": {
+        "type": "apiKey",
+        "name": "Authorization",
+        "in": "header",
+        "description": openapi_security_info_jwt,
+    },
+    "csrf": {
+        "type": "apiKey",
+        "name": "X-CSRFToken",
+        "in": "header",
+        "description": openapi_security_info_csrf,
+    },
+}
 
 
-COMMON_TEST_DATA_ROOT = ''
+COMMON_TEST_DATA_ROOT = ""
 
 derive_settings(__name__)
diff --git a/docs/hooks/events.rst b/docs/hooks/events.rst
deleted file mode 100644
index 7f9584c9e8e1..000000000000
--- a/docs/hooks/events.rst
+++ /dev/null
@@ -1,249 +0,0 @@
-Open edX Events
-===============
-
-How to use
-----------
-
-Using openedx-events in your code is very straight forward. We can consider the
-two possible cases, sending or receiving an event.
-
-
-Receiving events
-^^^^^^^^^^^^^^^^
-
-This is one of the most common use cases for plugins. The edx-platform will send
-an event and you want to react to it in your plugin.
-
-For this you need to:
-
-1. Include openedx-events in your dependencies.
-2. Connect your receiver functions to the signals being sent.
-
-Connecting signals can be done using regular django syntax:
-
-.. code-block:: python
-
-    from openedx_events.learning.signals import SESSION_LOGIN_COMPLETED
-
-    @receiver(SESSION_LOGIN_COMPLETED)
-    # your receiver function here
-
-
-Or at the apps.py
-
-.. code-block:: python
-
-    "signals_config": {
-        "lms.djangoapp": {
-            "relative_path": "your_module_name",
-            "receivers": [
-                {
-                    "receiver_func_name": "your_receiver_function",
-                    "signal_path": "openedx_events.learning.signals.SESSION_LOGIN_COMPLETED",
-                },
-            ],
-        }
-    },
-
-In case you are listening to an event in the edx-platform repo, you can directly
-use the django syntax since the apps.py method will not be available without the
-plugin.
-
-
-Sending events
-^^^^^^^^^^^^^^
-
-Sending events requires you to import both the event definition as well as the
-attr data classes that encapsulate the event data.
-
-.. code-block:: python
-
-    from openedx_events.learning.data import UserData, UserPersonalData
-    from openedx_events.learning.signals import STUDENT_REGISTRATION_COMPLETED
-
-    STUDENT_REGISTRATION_COMPLETED.send_event(
-        user=UserData(
-            pii=UserPersonalData(
-                username=user.username,
-                email=user.email,
-                name=user.profile.name,
-            ),
-            id=user.id,
-            is_active=user.is_active,
-        ),
-    )
-
-You can do this both from the edx-platform code as well as from an openedx
-plugin.
-
-
-Testing events
-^^^^^^^^^^^^^^
-
-Testing your code in CI, specially for plugins is now possible without having to
-import the complete edx-platform as a dependency.
-
-To test your functions you need to include the openedx-events library in your
-testing dependencies and make the signal connection in your test case.
-
-.. code-block:: python
-
-    from openedx_events.learning.signals import STUDENT_REGISTRATION_COMPLETED
-
-    def test_your_receiver(self):
-        STUDENT_REGISTRATION_COMPLETED.connect(your_function)
-        STUDENT_REGISTRATION_COMPLETED.send_event(
-            user=UserData(
-                pii=UserPersonalData(
-                    username='test_username',
-                    email='test_email@example.com',
-                    name='test_name',
-                ),
-                id=1,
-                is_active=True,
-            ),
-        )
-
-        # run your assertions
-
-
-Changes in the openedx-events library that are not compatible with your code
-should break this kind of test in CI and let you know you need to upgrade your
-code.
-
-
-Live example
-^^^^^^^^^^^^
-
-For a complete and detailed example you can see the `openedx-events-2-zapier`_
-plugin. This is a fully functional plugin that connects to
-``STUDENT_REGISTRATION_COMPLETED`` and ``COURSE_ENROLLMENT_CREATED`` and sends
-the relevant information to zapier.com using a webhook.
-
-.. _openedx-events-2-zapier: https://github.com/eduNEXT/openedx-events-2-zapier
-
-
-Index of Events
------------------
-
-This list contains the events currently being sent by edx-platform. The provided
-links target both the definition of the event in the openedx-events library as
-well as the trigger location in this same repository.
-
-
-Learning Events
-^^^^^^^^^^^^^^^
-
-.. list-table::
-   :widths: 35 50 20
-
-   * - *Name*
-     - *Type*
-     - *Date added*
-
-   * - `STUDENT_REGISTRATION_COMPLETED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L24>`_
-     - org.openedx.learning.student.registration.completed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/user_authn/views/register.py#L262>`_
-
-   * - `SESSION_LOGIN_COMPLETED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L36>`_
-     - org.openedx.learning.auth.session.login.completed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/user_authn/views/login.py#L320>`_
-
-   * - `COURSE_ENROLLMENT_CREATED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L48>`_
-     - org.openedx.learning.course.enrollment.created.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/common/djangoapps/student/models.py#L1671>`_
-
-   * - `COURSE_ENROLLMENT_CHANGED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L60>`_
-     - org.openedx.learning.course.enrollment.changed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/common/djangoapps/student/models.py#L1430>`_
-
-   * - `COURSE_UNENROLLMENT_COMPLETED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L72>`_
-     - org.openedx.learning.course.unenrollment.completed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/common/djangoapps/student/models.py#L1457>`_
-
-   * - `CERTIFICATE_CREATED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L84>`_
-     - org.openedx.learning.certificate.created.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/lms/djangoapps/certificates/models.py#L514>`_
-
-   * - `CERTIFICATE_CHANGED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L94>`_
-     - org.openedx.learning.certificate.changed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/lms/djangoapps/certificates/models.py#L482>`_
-
-   * - `CERTIFICATE_REVOKED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L108>`_
-     - org.openedx.learning.certificate.revoked.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/lms/djangoapps/certificates/models.py#L402>`_
-
-   * - `COHORT_MEMBERSHIP_CHANGED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L120>`_
-     - org.openedx.learning.cohort_membership.changed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/course_groups/models.py#L166>`_
-
-   * - `COURSE_DISCUSSIONS_CHANGED <https://github.com/eduNEXT/openedx-events/blob/main/openedx_events/learning/signals.py#L132>`_
-     - org.openedx.learning.discussions.configuration.changed.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/discussions/tasks.py#L30>`_
-
-
-Content Authoring Events
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. list-table::
-   :widths: 35 50 20
-
-   * - *Name*
-     - *Type*
-     - *Date added*
-
-   * - `COURSE_CATALOG_INFO_CHANGED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L25>`_
-     - org.openedx.content_authoring.course.catalog_info.changed.v1
-     - `2022-08-24 <https://github.com/openedx/edx-platform/blob/a8598fa1fac5e26ac212aa588e8527e727581742/cms/djangoapps/contentstore/signals/handlers.py#L111>`_
-
-   * - `XBLOCK_PUBLISHED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L63>`_
-     - org.openedx.content_authoring.xblock.published.v1
-     - `2022-12-06 <https://github.com/openedx/edx-platform/blob/master/xmodule/modulestore/mixed.py#L926>`_
-
-   * - `XBLOCK_DELETED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L75>`_
-     - org.openedx.content_authoring.xblock.deleted.v1
-     - `2022-12-06 <https://github.com/openedx/edx-platform/blob/master/xmodule/modulestore/mixed.py#L804>`_
-
-   * - `XBLOCK_DUPLICATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L87>`_
-     - org.openedx.content_authoring.xblock.duplicated.v1
-     - `2022-12-06 <https://github.com/openedx/edx-platform/blob/master/cms/djangoapps/contentstore/views/item.py#L965>`_
-
-   * - `XBLOCK_CREATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L36>`_
-     - org.openedx.content_authoring.xblock.created.v1
-     - 2023-07-20
-
-   * - `XBLOCK_UPDATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L47>`_
-     - org.openedx.content_authoring.xblock.updated.v1
-     - 2023-07-20
-
-   * - `COURSE_CREATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L123>`_
-     - org.openedx.content_authoring.course.created.v1
-     - 2023-07-20
-
-   * - `CONTENT_LIBRARY_CREATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L134>`_
-     - org.openedx.content_authoring.content_library.created.v1
-     - 2023-07-20
-
-   * - `CONTENT_LIBRARY_UPDATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L145>`_
-     - org.openedx.content_authoring.content_library.updated.v1
-     - 2023-07-20
-
-   * - `CONTENT_LIBRARY_DELETED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L156>`_
-     - org.openedx.content_authoring.content_library.deleted.v1
-     - 2023-07-20
-
-   * - `LIBRARY_BLOCK_CREATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L167>`_
-     - org.openedx.content_authoring.content_library.created.v1
-     - 2023-07-20
-
-   * - `LIBRARY_BLOCK_UPDATED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L178>`_
-     - org.openedx.content_authoring.content_library.updated.v1
-     - 2023-07-20
-
-   * - `LIBRARY_BLOCK_DELETED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L189>`_
-     - org.openedx.content_authoring.content_library.deleted.v1
-     - 2023-07-20
-
-   * - `CONTENT_OBJECT_TAGS_CHANGED <https://github.com/openedx/openedx-events/blob/c0eb4ba1a3d7d066d58e5c87920b8ccb0645f769/openedx_events/content_authoring/signals.py#L207>`_
-     - org.openedx.content_authoring.content.object.tags.changed.v1
-     - 2024-03-31
diff --git a/docs/hooks/filters.rst b/docs/hooks/filters.rst
deleted file mode 100644
index b2ce68fc147d..000000000000
--- a/docs/hooks/filters.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-Open edX Filters
-================
-
-How to use
-----------
-
-Using openedx-filters in your code is very straight forward. We can consider the
-two possible cases:
-
-Configuring a filter
-^^^^^^^^^^^^^^^^^^^^
-
-Implement pipeline steps
-************************
-
-Let's say you want to consult student's information with a third party service
-before generating the students certificate. This is a common use case for filters,
-where the functions part of the filter's pipeline will perform the consulting tasks and
-decide the execution flow for the application. These functions are the pipeline steps,
-and can be implemented in an installable Python library:
-
-.. code-block:: python
-
-    # Step implementation taken from openedx-filters-samples plugin
-    from openedx_filters import PipelineStep
-    from openedx_filters.learning.filters import CertificateCreationRequested
-
-    class StopCertificateCreation(PipelineStep):
-
-        def run_filter(self, user, course_id, mode, status):
-            # Consult third party service and check if continue
-            # ...
-            # User not in third party service, denied certificate generation
-            raise CertificateCreationRequested.PreventCertificateCreation(
-                "You can't generate a certificate from this site."
-            )
-
-There's two key components to the implementation:
-
-1. The filter step must be a subclass of ``PipelineStep``.
-
-2. The ``run_filter`` signature must match the filters definition, eg.,
-the previous step matches the method's definition in CertificateCreationRequested.
-
-Attach/hook pipeline to filter
-******************************
-
-After implementing the pipeline steps, we have to tell the certificate creation
-filter to execute our pipeline.
-
-.. code-block:: python
-
-    OPEN_EDX_FILTERS_CONFIG = {
-        "org.openedx.learning.certificate.creation.requested.v1": {
-            "fail_silently": False,
-            "pipeline": [
-                "openedx_filters_samples.samples.pipeline.StopCertificateCreation"
-            ]
-        },
-    }
-
-Triggering a filter
-^^^^^^^^^^^^^^^^^^^
-
-In order to execute a filter in your own plugin/library, you must install the
-plugin where the steps are implemented and also, ``openedx-filters``.
-
-.. code-block:: python
-
-    # Code taken from lms/djangoapps/certificates/generation_handler.py
-    from openedx_filters.learning.filters import CertificateCreationRequested
-
-    try:
-        self.user, self.course_id, self.mode, self.status = CertificateCreationRequested.run_filter(
-            user=self.user, course_id=self.course_id, mode=self.mode, status=self.status,
-        )
-    except CertificateCreationRequested.PreventCertificateCreation as exc:
-        raise CertificateGenerationNotAllowed(str(exc)) from exc
-
-Testing filters' steps
-^^^^^^^^^^^^^^^^^^^^^^
-
-It's pretty straightforward to test your pipeline steps, you'll need to include the
-``openedx-filters`` library in your testing dependencies and configure them in your test case.
-
-.. code-block:: python
-
-   from openedx_filters.learning.filters import CertificateCreationRequested
-
-    @override_settings(
-        OPEN_EDX_FILTERS_CONFIG={
-            "org.openedx.learning.certificate.creation.requested.v1": {
-                "fail_silently": False,
-                "pipeline": [
-                    "openedx_filters_samples.samples.pipeline.StopCertificateCreation"
-                ]
-            }
-        }
-    )
-    def test_certificate_creation_requested_filter(self):
-        """
-        Test filter triggered before the certificate creation process starts.
-
-        Expected results:
-          - The pipeline step configured for the filter raises PreventCertificateCreation
-          when the conditions are met.
-        """
-        with self.assertRaises(CertificateCreationRequested.PreventCertificateCreation):
-            CertificateCreationRequested.run_filter(
-                user=self.user, course_key=self.course_key, mode="audit",
-            )
-
-        # run your assertions
-
-Changes in the ``openedx-filters`` library that are not compatible with your code
-should break this kind of test in CI and let you know you need to upgrade your code.
-The main limitation while testing filters' steps it's their arguments, as they are edxapp
-memory objects, but that can be solved in CI using Python mocks.
-
-Live example
-^^^^^^^^^^^^
-
-For filter steps samples you can visit the `openedx-filters-samples`_ plugin, where
-you can find minimal steps exemplifying the different ways on how to use
-``openedx-filters``.
-
-.. _openedx-filters-samples: https://github.com/eduNEXT/openedx-filters-samples
-
-
-Index of Filters
------------------
-
-This list contains the filters currently being executed by edx-platform. The provided
-links target both the definition of the filter in the openedx-filters library as
-well as the trigger location in this same repository.
-
-
-.. list-table::
-   :widths: 35 50 20
-
-   * - *Name*
-     - *Type*
-     - *Date added*
-
-   * - `StudentRegistrationRequested <https://github.com/eduNEXT/openedx-filters/blob/main/openedx_filters/learning/filters.py#L9>`_
-     - org.openedx.learning.student.registration.requested.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/user_authn/views/register.py#L261>`_
-
-   * - `StudentLoginRequested <https://github.com/eduNEXT/openedx-filters/blob/main/openedx_filters/learning/filters.py#L40>`_
-     - org.openedx.learning.student.login.requested.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/user_authn/views/login.py#L569>`_
-
-   * - `CourseEnrollmentStarted <https://github.com/eduNEXT/openedx-filters/blob/main/openedx_filters/learning/filters.py#L70>`_
-     - org.openedx.learning.course.enrollment.started.v1
-     - `2022-06-14 <https://github.com/openedx/edx-platform/blob/master/common/djangoapps/student/models.py#L1675>`_
-
-   * - `CourseUnenrollmentStarted <https://github.com/eduNEXT/openedx-filters/blob/main/openedx_filters/learning/filters.py#L98>`_
-     - org.openedx.learning.course.unenrollment.started.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/common/djangoapps/student/models.py#L1752>`_
-
-   * - `CertificateCreationRequested <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L142>`_
-     - org.openedx.learning.certificate.creation.requested.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/lms/djangoapps/certificates/generation_handler.py#L119>`_
-
-   * - `CertificateRenderStarted <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L161>`_
-     - org.openedx.learning.certificate.render.started.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/lms/djangoapps/certificates/views/webview.py#L649>`_
-
-   * - `CohortChangeRequested <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L230>`_
-     - org.openedx.learning.cohort.change.requested.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/openedx/core/djangoapps/course_groups/models.py#L138>`_
-
-   * - `CohortAssignmentRequested <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L256>`_
-     - org.openedx.learning.cohort.assignment.requested.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/openedx/core/djangoapps/course_groups/models.py#L149>`_
-
-   * - `CourseAboutRenderStarted <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L281>`_
-     - org.openedx.learning.course_about.render.started.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/lms/djangoapps/courseware/views/views.py#L1015>`_
-
-   * - `DashboardRenderStarted <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L354>`_
-     - org.openedx.learning.dashboard.render.started.v1
-     - `2022-06-14 <https://github.com/eduNEXT/edx-platform/blob/master/common/djangoapps/student/views/dashboard.py#L878>`_
-
-   * - `VerticalBlockChildRenderStarted <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L427>`_
-     - org.openedx.learning.veritical_block_child.render.started.v1
-     - `2022-08-18 <https://github.com/openedx/edx-platform/blob/master/xmodule/vertical_block.py#L170>`_
-
-   * - `VerticalBlockRenderCompleted <https://github.com/openedx/openedx-filters/blob/main/openedx_filters/learning/filters.py#L476>`_
-     - org.openedx.learning.veritical_block.render.completed.v1
-     - `2022-02-18 <https://github.com/openedx/edx-platform/blob/master/xmodule/vertical_block.py#L121>`_
diff --git a/docs/hooks/index.rst b/docs/hooks/index.rst
deleted file mode 100644
index 99cb25133cd2..000000000000
--- a/docs/hooks/index.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-Open edX Hooks Extension Framework
-==================================
-
-To sustain the growth of the Open edX ecosystem, the business rules of the
-platform must be open for extension following the open-closed principle. This
-framework allows developers to do just that without needing to fork and modify
-the main edx-platform repository.
-
-
-Context
--------
-
-Hooks are predefined places in the edx-platform core where externally defined
-functions can take place. In some cases, those functions can alter what the user
-sees or experiences in the platform. Other cases are informative only. All cases
-are meant to be extended using Open edX plugins and configuration.
-
-Hooks can be of two types, events and filters. Events are in essence signals, in
-that they are sent in specific application places and whose listeners can extend
-functionality. On the other hand Filters are passed data and can act on it
-before this data is put back in the original application flow. In order to allow
-extension developers to use the Events and Filters definitions on their plugins,
-both kinds of hooks are defined in lightweight external libraries.
-
-* openedx-filters (`guide <./filters.rst>`_, `source code <https://github.com/openedx/openedx-filters>`_)
-* openedx-events (`guide <./events.rst>`_, `source code <https://github.com/openedx/openedx-events>`_)
-
-Hooks are designed with stability in mind. The main goal is that developers can
-use them to change the functionality of the platform as needed and still be able
-to migrate to newer open releases with very little to no development effort. In
-the case of the events, this is detailed in the `versioning ADR`_ and the
-`payload ADR`_.
-
-A longer description of the framework and it's history can be found in `OEP 50`_.
-
-.. _OEP 50: https://open-edx-proposals.readthedocs.io/en/latest/oep-0050-hooks-extension-framework.html
-.. _versioning ADR: https://github.com/eduNEXT/openedx-events/blob/main/docs/decisions/0002-events-naming-and-versioning.rst
-.. _payload ADR: https://github.com/eduNEXT/openedx-events/blob/main/docs/decisions/0003-events-payload.rst
-
-On the technical side events are implemented through django signals which makes
-them run in the same python process as the lms or cms. Furthermore, events block
-the running process. Listeners of an event are encouraged to monitor the
-performance or use alternative arch patterns such as receiving the event and
-defer to launching async tasks than do the slow processing.
-
-On the other hand, filters are implemented using a pipeline mechanism, that executes
-a list of functions called ``steps`` configured through Django settings. Each
-pipeline step receives a dictionary with data, process it and returns an output. During
-this process, they can alter the application execution flow by halting the process
-or modifying their input arguments.
diff --git a/docs/index.rst b/docs/index.rst
index 782784cf07cf..190ba12db906 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,7 @@ locations.
 .. _Developer Documentation Index: https://openedx.atlassian.net/wiki/spaces/DOC/overview
 .. _Open edX Development space: https://openedx.atlassian.net/wiki/spaces/COMM/overview
 .. _Open edX ReadTheDocs: http://docs.edx.org/
+.. _Hooks Extensions Framework: https://docs.openedx.org/en/latest/developers/concepts/hooks_extension_framework.html
 
 .. toctree::
     :maxdepth: 1
@@ -32,6 +33,7 @@ locations.
     how-tos/index
     references/index
     concepts/index
+    extensions/tinymce_plugins
 
 .. grid:: 1 2 2 2
    :gutter: 3
@@ -74,6 +76,20 @@ locations.
          :outline:
          :expand:
 
+   .. grid-item-card:: Hooks and Extensions
+      :class-card: sd-shadow-md sd-p-2
+      :class-footer: sd-border-0
+
+      * `Hooks Extensions Framework`_
+      * :doc:`extensions/tinymce_plugins`
+      +++
+      .. button-link:: https://docs.openedx.org/en/latest/developers/concepts/hooks_extension_framework.html
+         :color: primary
+         :outline:
+         :expand:
+
+         Hooks Extensions Framework
+
 
 Change History
 **************
diff --git a/docs/lms-openapi.yaml b/docs/lms-openapi.yaml
index 5e9afcc6d370..ad3a4fc40db4 100644
--- a/docs/lms-openapi.yaml
+++ b/docs/lms-openapi.yaml
@@ -13,8 +13,44 @@ produces:
 securityDefinitions:
   Basic:
     type: basic
+    description: Obtain with a `POST` request to `/user/v1/account/login_session/`.  If
+      needed, copy the cookies from the response to your new call.
+  jwt:
+    type: apiKey
+    name: Authorization
+    in: header
+    description: |2
+
+      Obtain by making a `POST` request to `/oauth2/v1/access_token`.
+
+      You will need to be logged in and have a client ID and secret already created.
+
+      Your request should have the headers
+
+      ```
+      'Content-Type': 'application/x-www-form-urlencoded'
+      ```
+
+      Your request should have the data payload
+
+      ```
+      'grant_type': 'client_credentials'
+      'client_id': [your client ID]
+      'client_secret':  [your client secret]
+      'token_type': 'jwt'
+      ```
+
+      Your JWT will be returned in the response as `access_token`. Prefix with `JWT ` in your header.
+  csrf:
+    type: apiKey
+    name: X-CSRFToken
+    in: header
+    description: Obtain by making a `GET` request to `/csrf/api/v1/token`. The token
+      will be in the response cookie `csrftoken`.
 security:
 - Basic: []
+- csrf: []
+- jwt: []
 paths:
   /agreements/v1/integrity_signature/{course_id}:
     get:
@@ -3975,6 +4011,7 @@ paths:
             "profile_name": "Jon Doe"
             "verification_attempt_id": (Optional)
             "proctored_exam_attempt_id": (Optional)
+            "platform_verification_attempt_id": (Optional)
             "status": (Optional)
         }
       parameters:
@@ -4130,6 +4167,7 @@ paths:
             "profile_name": "Jon Doe"
             "verification_attempt_id": (Optional)
             "proctored_exam_attempt_id": (Optional)
+            "platform_verification_attempt_id": (Optional)
             "status": (Optional)
         }
       parameters:
@@ -5809,7 +5847,7 @@ paths:
       operationId: grades_v1_submission_history_read
       description: |-
         Get submission history details. This submission history is related to only
-        ProblemBlock and it doesn't support LibraryContentBlock or ContentLibraries
+        ProblemBlock and it doesn't support LegacyLibraryContentBlock or ContentLibraries
         as of now.
 
         **Usecases**:
@@ -6788,6 +6826,59 @@ paths:
       in: path
       required: true
       type: string
+  /mobile/{api_version}/notifications/create-token/:
+    post:
+      operationId: mobile_notifications_create-token_create
+      summary: |-
+        **Use Case**
+            This endpoint allows clients to register a device for push notifications.
+      description: |-
+        If the device is already registered, the existing registration will be updated.
+            If setting PUSH_NOTIFICATIONS_SETTINGS is not configured, the endpoint will return a 501 error.
+
+        **Example Request**
+            POST /api/mobile/{version}/notifications/create-token/
+            **POST Parameters**
+              The body of the POST request can include the following parameters.
+              * name (optional) - A name of the device.
+              * registration_id (required) - The device token of the device.
+              * device_id (optional) - ANDROID_ID / TelephonyManager.getDeviceId() (always as hex)
+              * active (optional) - Whether the device is active, default is True.
+                If False, the device will not receive notifications.
+              * cloud_message_type (required) - You should choose FCM or GCM. Currently, only FCM is supported.
+              * application_id (optional) - Opaque application identity, should be filled in for multiple
+                key/certificate access. Should be equal settings.FCM_APP_NAME.
+        **Example Response**
+            ```json
+            {
+                "id": 1,
+                "name": "My Device",
+                "registration_id": "fj3j4",
+                "device_id": 1234,
+                "active": true,
+                "date_created": "2024-04-18T07:39:37.132787Z",
+                "cloud_message_type": "FCM",
+                "application_id": "my_app_id"
+            }
+            ```
+      parameters:
+      - name: data
+        in: body
+        required: true
+        schema:
+          $ref: '#/definitions/GCMDevice'
+      responses:
+        '201':
+          description: ''
+          schema:
+            $ref: '#/definitions/GCMDevice'
+      tags:
+      - mobile
+    parameters:
+    - name: api_version
+      in: path
+      required: true
+      type: string
   /mobile/{api_version}/users/{username}:
     get:
       operationId: mobile_users_read
@@ -6956,6 +7047,25 @@ paths:
       in: path
       required: true
       type: string
+  /mobile/{api_version}/users/{username}/enrollments_status/:
+    get:
+      operationId: mobile_users_enrollments_status_list
+      description: Gets user's enrollments status.
+      parameters: []
+      responses:
+        '200':
+          description: ''
+      tags:
+      - mobile
+    parameters:
+    - name: api_version
+      in: path
+      required: true
+      type: string
+    - name: username
+      in: path
+      required: true
+      type: string
   /notifications/:
     get:
       operationId: notifications_list
@@ -8849,22 +8959,6 @@ paths:
       tags:
       - user
     parameters: []
-  /user/v1/accounts/verifications/{attempt_id}/:
-    get:
-      operationId: user_v1_accounts_verifications_read
-      description: Get IDV attempt details by attempt_id. Only accessible by global
-        staff.
-      parameters: []
-      responses:
-        '200':
-          description: ''
-      tags:
-      - user
-    parameters:
-    - name: attempt_id
-      in: path
-      required: true
-      type: string
   /user/v1/accounts/{username}:
     get:
       operationId: user_v1_accounts_read
@@ -9216,21 +9310,6 @@ paths:
       in: path
       required: true
       type: string
-  /user/v1/skill_level/{job_id}/:
-    get:
-      operationId: user_v1_skill_level_read
-      description: GET /api/user/v1/skill_level/{job_id}/
-      parameters: []
-      responses:
-        '200':
-          description: ''
-      tags:
-      - user
-    parameters:
-    - name: job_id
-      in: path
-      required: true
-      type: string
   /user/v1/user_prefs/:
     get:
       operationId: user_v1_user_prefs_list
@@ -9423,22 +9502,57 @@ paths:
       - user
     post:
       operationId: user_account_login_session_create
-      summary: Log in a user.
-      description: |-
-        See `login_user` for details.
-
-        Example Usage:
-
-            POST /api/user/v1/login_session
-            with POST params `email`, `password`.
-
-            200 {'success': true}
-      parameters: []
+      summary: POST /user/{api_version}/account/login_session/
+      description: Returns 200 on success, and a detailed error message otherwise.
+      parameters:
+      - name: data
+        in: body
+        required: true
+        schema:
+          type: object
+          properties:
+            email:
+              type: string
+            password:
+              type: string
       responses:
-        '201':
+        '200':
+          description: ''
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+              value:
+                type: string
+              error_code:
+                type: string
+        '400':
+          description: ''
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+              value:
+                type: string
+              error_code:
+                type: string
+        '403':
           description: ''
+          schema:
+            type: object
+            properties:
+              success:
+                type: boolean
+              value:
+                type: string
+              error_code:
+                type: string
       tags:
       - user
+      security:
+      - csrf: []
     parameters:
     - name: api_version
       in: path
@@ -9773,7 +9887,7 @@ paths:
       required: true
       type: string
       pattern: ^[a-zA-Z0-9\-_]*$
-  /xblock/v2/xblocks/{usage_key_str}/:
+  /xblock/v2/xblocks/{usage_key}/:
     get:
       operationId: xblock_v2_xblocks_read
       summary: Get metadata about the specified block.
@@ -9789,11 +9903,11 @@ paths:
       tags:
       - xblock
     parameters:
-    - name: usage_key_str
+    - name: usage_key
       in: path
       required: true
       type: string
-  /xblock/v2/xblocks/{usage_key_str}/fields/:
+  /xblock/v2/xblocks/{usage_key}/fields/:
     get:
       operationId: xblock_v2_xblocks_fields_list
       description: retrieves the xblock, returning display_name, data, and metadata
@@ -9814,11 +9928,11 @@ paths:
       tags:
       - xblock
     parameters:
-    - name: usage_key_str
+    - name: usage_key
       in: path
       required: true
       type: string
-  /xblock/v2/xblocks/{usage_key_str}/handler_url/{handler_name}/:
+  /xblock/v2/xblocks/{usage_key}/handler_url/{handler_name}/:
     get:
       operationId: xblock_v2_xblocks_handler_url_read
       summary: |-
@@ -9833,7 +9947,7 @@ paths:
       tags:
       - xblock
     parameters:
-    - name: usage_key_str
+    - name: usage_key
       in: path
       required: true
       type: string
@@ -9841,7 +9955,7 @@ paths:
       in: path
       required: true
       type: string
-  /xblock/v2/xblocks/{usage_key_str}/view/{view_name}/:
+  /xblock/v2/xblocks/{usage_key}/view/{view_name}/:
     get:
       operationId: xblock_v2_xblocks_view_read
       description: Get the HTML, JS, and CSS needed to render the given XBlock.
@@ -9852,7 +9966,110 @@ paths:
       tags:
       - xblock
     parameters:
-    - name: usage_key_str
+    - name: usage_key
+      in: path
+      required: true
+      type: string
+    - name: view_name
+      in: path
+      required: true
+      type: string
+  /xblock/v2/xblocks/{usage_key}@{version}/:
+    get:
+      operationId: xblock_v2_xblocks_read
+      summary: Get metadata about the specified block.
+      description: |-
+        Accepts the following query parameters:
+
+        * "include": a comma-separated list of keys to include.
+          Valid keys are "index_dictionary" and "student_view_data".
+      parameters: []
+      responses:
+        '200':
+          description: ''
+      tags:
+      - xblock
+    parameters:
+    - name: usage_key
+      in: path
+      required: true
+      type: string
+    - name: version
+      in: path
+      required: true
+      type: string
+  /xblock/v2/xblocks/{usage_key}@{version}/fields/:
+    get:
+      operationId: xblock_v2_xblocks_fields_list
+      description: retrieves the xblock, returning display_name, data, and metadata
+      parameters: []
+      responses:
+        '200':
+          description: ''
+      tags:
+      - xblock
+    post:
+      operationId: xblock_v2_xblocks_fields_create
+      description: edits the xblock, saving changes to data and metadata only (display_name
+        included in metadata)
+      parameters: []
+      responses:
+        '201':
+          description: ''
+      tags:
+      - xblock
+    parameters:
+    - name: usage_key
+      in: path
+      required: true
+      type: string
+    - name: version
+      in: path
+      required: true
+      type: string
+  /xblock/v2/xblocks/{usage_key}@{version}/handler_url/{handler_name}/:
+    get:
+      operationId: xblock_v2_xblocks_handler_url_read
+      summary: |-
+        Get an absolute URL which can be used (without any authentication) to call
+        the given XBlock handler.
+      description: The URL will expire but is guaranteed to be valid for a minimum
+        of 2 days.
+      parameters: []
+      responses:
+        '200':
+          description: ''
+      tags:
+      - xblock
+    parameters:
+    - name: usage_key
+      in: path
+      required: true
+      type: string
+    - name: version
+      in: path
+      required: true
+      type: string
+    - name: handler_name
+      in: path
+      required: true
+      type: string
+  /xblock/v2/xblocks/{usage_key}@{version}/view/{view_name}/:
+    get:
+      operationId: xblock_v2_xblocks_view_read
+      description: Get the HTML, JS, and CSS needed to render the given XBlock.
+      parameters: []
+      responses:
+        '200':
+          description: ''
+      tags:
+      - xblock
+    parameters:
+    - name: usage_key
+      in: path
+      required: true
+      type: string
+    - name: version
       in: path
       required: true
       type: string
@@ -10047,6 +10264,7 @@ definitions:
     required:
     - celebrations
     - course_access
+    - studio_access
     - course_id
     - is_enrolled
     - is_self_paced
@@ -10062,6 +10280,7 @@ definitions:
     - can_view_certificate
     - course_modes
     - is_new_discussion_sidebar_view_enabled
+    - has_course_author_access
     type: object
     properties:
       can_show_upgrade_sock:
@@ -10084,6 +10303,9 @@ definitions:
         additionalProperties:
           type: string
           x-nullable: true
+      studio_access:
+        title: Studio access
+        type: boolean
       course_id:
         title: Course id
         type: string
@@ -10138,6 +10360,9 @@ definitions:
       is_new_discussion_sidebar_view_enabled:
         title: Is new discussion sidebar view enabled
         type: boolean
+      has_course_author_access:
+        title: Has course author access
+        type: boolean
   DateSummary:
     required:
     - complete
@@ -11237,10 +11462,24 @@ definitions:
         title: Verification attempt id
         type: integer
         x-nullable: true
+      verification_attempt_status:
+        title: Verification attempt status
+        type: string
+        minLength: 1
+        x-nullable: true
       proctored_exam_attempt_id:
         title: Proctored exam attempt id
         type: integer
         x-nullable: true
+      platform_verification_attempt_id:
+        title: Platform verification attempt id
+        type: integer
+        x-nullable: true
+      platform_verification_attempt_status:
+        title: Platform verification attempt status
+        type: string
+        minLength: 1
+        x-nullable: true
       status:
         title: Status
         type: string
@@ -11277,10 +11516,24 @@ definitions:
         title: Verification attempt id
         type: integer
         x-nullable: true
+      verification_attempt_status:
+        title: Verification attempt status
+        type: string
+        minLength: 1
+        x-nullable: true
       proctored_exam_attempt_id:
         title: Proctored exam attempt id
         type: integer
         x-nullable: true
+      platform_verification_attempt_id:
+        title: Platform verification attempt id
+        type: integer
+        x-nullable: true
+      platform_verification_attempt_status:
+        title: Platform verification attempt status
+        type: string
+        minLength: 1
+        x-nullable: true
       status:
         title: Status
         type: string
@@ -11710,6 +11963,52 @@ definitions:
         title: Enddatetime
         type: string
         format: date-time
+  GCMDevice:
+    required:
+    - registration_id
+    type: object
+    properties:
+      id:
+        title: ID
+        type: integer
+      name:
+        title: Name
+        type: string
+        maxLength: 255
+        x-nullable: true
+      registration_id:
+        title: Registration ID
+        type: string
+        minLength: 1
+      device_id:
+        title: Device id
+        description: 'ANDROID_ID / TelephonyManager.getDeviceId() (e.g: 0x01)'
+        type: integer
+        x-nullable: true
+      active:
+        title: Is active
+        description: Inactive devices will not be sent notifications
+        type: boolean
+      date_created:
+        title: Creation date
+        type: string
+        format: date-time
+        readOnly: true
+        x-nullable: true
+      cloud_message_type:
+        title: Cloud Message Type
+        description: You should choose FCM, GCM is deprecated
+        type: string
+        enum:
+        - FCM
+        - GCM
+      application_id:
+        title: Application ID
+        description: Opaque application identity, should be filled in for multiple
+          key/certificate access
+        type: string
+        maxLength: 64
+        x-nullable: true
   mobile_api.User:
     required:
     - username
diff --git a/lms/djangoapps/branding/tests/test_page.py b/lms/djangoapps/branding/tests/test_page.py
index 9904f79f644f..46f10bd6923a 100644
--- a/lms/djangoapps/branding/tests/test_page.py
+++ b/lms/djangoapps/branding/tests/test_page.py
@@ -22,6 +22,7 @@
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
 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
+from xmodule.course_block import CATALOG_VISIBILITY_ABOUT, CATALOG_VISIBILITY_NONE
 
 FEATURES_WITH_STARTDATE = settings.FEATURES.copy()
 FEATURES_WITH_STARTDATE['DISABLE_START_DATES'] = False
@@ -201,6 +202,20 @@ def setUp(self):
             display_name='Tech Beta Course',
             emit_signals=True,
         )
+        self.course_with_none_visibility = CourseFactory.create(
+            org='MITx',
+            number='1003',
+            catalog_visibility=CATALOG_VISIBILITY_NONE,
+            display_name='Course with "none" catalog visibility',
+            emit_signals=True,
+        )
+        self.course_with_about_visibility = CourseFactory.create(
+            org='MITx',
+            number='1003',
+            catalog_visibility=CATALOG_VISIBILITY_ABOUT,
+            display_name='Course with "about" catalog visibility',
+            emit_signals=True,
+        )
         self.factory = RequestFactory()
 
     @patch('common.djangoapps.student.views.management.render_to_response', RENDER_MOCK)
@@ -300,6 +315,15 @@ def test_course_cards_sorted_by_start_date_disabled(self):
         assert context['courses'][1].id == self.starting_earlier.id
         assert context['courses'][2].id == self.course_with_default_start_date.id
 
+    @patch('lms.djangoapps.courseware.views.views.render_to_response', RENDER_MOCK)
+    def test_invisible_courses_are_not_displayed(self):
+        response = self.client.get(reverse('courses'))
+        ((_template, context), _) = RENDER_MOCK.call_args  # pylint: disable=unpacking-non-sequence
+
+        rendered_ids = [course.id for course in context["courses"]]
+        assert self.course_with_none_visibility.id not in rendered_ids
+        assert self.course_with_about_visibility.id not in rendered_ids
+
 
 class IndexPageProgramsTests(SiteMixin, ModuleStoreTestCase):
     """
diff --git a/lms/djangoapps/bulk_email/message_types.py b/lms/djangoapps/bulk_email/message_types.py
index 033f5423e1f7..53c7e92029a5 100644
--- a/lms/djangoapps/bulk_email/message_types.py
+++ b/lms/djangoapps/bulk_email/message_types.py
@@ -12,3 +12,4 @@ class BulkEmail(BaseMessageType):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.options['from_address'] = kwargs['context']['from_address']
+        self.options['transactional'] = True
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index 0e26ea559c20..d4f238fd9453 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/lms/djangoapps/bulk_email/models.py
@@ -146,7 +146,7 @@ def get_users(self, course_id, user_id=None):
                 User.objects.filter(
                     models.Q(courseenrollment__mode=self.coursemodetarget.track.mode_slug)
                     & enrollment_query
-                )
+                ).exclude(id__in=staff_instructor_qset)
             )
         else:
             raise ValueError(f"Unrecognized target type {self.target_type}")
diff --git a/lms/djangoapps/bulk_email/signals.py b/lms/djangoapps/bulk_email/signals.py
index 086b3636f7ef..8ada8760cdcf 100644
--- a/lms/djangoapps/bulk_email/signals.py
+++ b/lms/djangoapps/bulk_email/signals.py
@@ -1,7 +1,8 @@
 """
 Signal handlers for the bulk_email app
 """
-from django.contrib.auth import get_user_model
+import logging
+
 from django.dispatch import receiver
 from eventtracking import tracker
 
@@ -11,6 +12,8 @@
 
 from .models import Optout
 
+log = logging.getLogger(__name__)
+
 
 @receiver(USER_RETIRE_MAILINGS)
 def force_optout_all(sender, **kwargs):  # lint-amnesty, pylint: disable=unused-argument
@@ -32,28 +35,26 @@ def ace_email_sent_handler(sender, **kwargs):
     """
     When an email is sent using ACE, this method will create an event to detect ace email success status
     """
-    # Fetch the message object from kwargs, defaulting to None if not present
-    message = kwargs.get('message', None)
-
-    user_model = get_user_model()
-    try:
-        user_id = user_model.objects.get(email=message.recipient.email_address).id
-    except user_model.DoesNotExist:
-        user_id = None
-    course_email = message.context.get('course_email', None)
-    course_id = message.context.get('course_id')
+    # Fetch the message dictionary from kwargs, defaulting to {} if not present
+    message = kwargs.get('message', {})
+    recipient = message.get('recipient', {})
+    message_name = message.get('name', None)
+    context = message.get('context', {})
+    email_address = recipient.get('email', None)
+    user_id = recipient.get('user_id', None)
+    channel = message.get('channel', None)
+    course_id = context.get('course_id', None)
     if not course_id:
+        course_email = context.get('course_email', None)
         course_id = course_email.course_id if course_email else None
-    try:
-        channel = sender.__class__.__name__
-    except AttributeError:
-        channel = 'Other'
+    log.info(f'Email sent for {message_name} for course {course_id} using channel {channel}')
     tracker.emit(
         'edx.ace.message_sent',
         {
-            'message_type': message.name,
+            'message_type': message_name,
             'channel': channel,
             'course_id': course_id,
             'user_id': user_id,
+            'user_email': email_address,
         }
     )
diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py
index 0152d14ff01f..197a7c0f136e 100644
--- a/lms/djangoapps/bulk_email/tasks.py
+++ b/lms/djangoapps/bulk_email/tasks.py
@@ -457,7 +457,7 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
 
     log.info(
         f"BulkEmail ==> Task: {parent_task_id}, SubTask: {task_id}, EmailId: {email_id}, "
-        f"TotalRecipients: {total_recipients}"
+        f"TotalRecipients: {total_recipients}, ace_enabled: {is_bulk_email_edx_ace_enabled()}"
     )
 
     try:
@@ -474,6 +474,7 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
             'course_id': str(course_email.course_id),
             'to_list': [user_obj.get('email', '') for user_obj in to_list],
             'total_recipients': total_recipients,
+            'ace_enabled_for_bulk_email': is_bulk_email_edx_ace_enabled(),
         }
     )
     # Exclude optouts (if not a retry):
@@ -533,9 +534,14 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
             email_context['email'] = email
             email_context['name'] = profile_name
             email_context['user_id'] = user_id
-            email_context['course_id'] = course_email.course_id
+            email_context['course_id'] = str(course_email.course_id)
             email_context['unsubscribe_link'] = get_unsubscribed_link(current_recipient['username'],
                                                                       str(course_email.course_id))
+            email_context['unsubscribe_text'] = 'Unsubscribe from course updates for this course'
+            email_context['disclaimer'] = (
+                "You are receiving this email because you are enrolled in the "
+                f"{email_context['platform_name']} course {email_context['course_title']}"
+            )
 
             if is_bulk_email_edx_ace_enabled():
                 message = ACEEmail(site, email_context)
diff --git a/lms/djangoapps/bulk_email/tests/test_models.py b/lms/djangoapps/bulk_email/tests/test_models.py
index 1f7dc0c85641..43062492e842 100644
--- a/lms/djangoapps/bulk_email/tests/test_models.py
+++ b/lms/djangoapps/bulk_email/tests/test_models.py
@@ -15,7 +15,7 @@
 from pytz import UTC
 
 from common.djangoapps.course_modes.models import CourseMode
-from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
+from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory, StaffFactory
 from lms.djangoapps.bulk_email.api import is_bulk_email_feature_enabled
 from lms.djangoapps.bulk_email.models import (
     SEND_TO_COHORT,
@@ -25,8 +25,10 @@
     CourseAuthorization,
     CourseEmail,
     CourseEmailTemplate,
+    CourseModeTarget,
     DisabledCourse,
-    Optout
+    Optout,
+    Target,
 )
 from lms.djangoapps.bulk_email.models_api import is_bulk_email_disabled_for_course
 from lms.djangoapps.bulk_email.tests.factories import TargetFactory
@@ -366,6 +368,7 @@ def setUp(self):
             course_id=self.course.id,
             user=self.user3
         )
+        self.staff_user = StaffFactory.create(course_key=self.course.id)
         self.target = TargetFactory()
 
     @override_settings(BULK_COURSE_EMAIL_LAST_LOGIN_ELIGIBILITY_PERIOD=None)
@@ -391,3 +394,40 @@ def test_target_last_login_eligibility_set(self):
 
         assert result.count() == 1
         assert result.filter(id=self.user1.id).exists()
+
+    def test_filtering_of_recipients_target_for_audit_track(self):
+        """
+        Verifies the default behavior.
+
+        This test ensures that when the `BULK_COURSE_EMAIL_LAST_LOGIN_ELIGIBILITY_PERIOD`
+        setting is not defined, all users enrolled in the course are included in the results.
+        """
+        target = Target.objects.create(target_type=SEND_TO_TRACK)
+        course_mode = CourseMode.objects.create(
+            mode_slug=CourseMode.AUDIT,
+            mode_display_name=CourseMode.AUDIT.capitalize(),
+            course_id=self.course.id,
+        )
+        course_mode_target = CourseModeTarget.objects.create(track=course_mode)
+        target.coursemodetarget = course_mode_target
+        result = target.get_users(self.course.id)
+
+        assert result.count() == 1
+        assert result.filter(id=self.user2.id).exists()
+
+        # Ensure staff user is not included
+        assert not result.filter(id=self.staff_user.id).exists()
+
+    def test_filtering_of_recipients_target_for_staff(self):
+        """
+        Test filtering of recipients for a target of type SEND_TO_STAFF.
+
+        This test verifies that only staff users are returned for the given target.
+        It creates a target of type SEND_TO_STAFF and ensures that the correct users
+        are retrieved.
+        """
+        self.target = TargetFactory(target_type=SEND_TO_STAFF)
+        result = self.target.get_users(self.course.id)
+
+        assert result.count() == 1
+        assert result.filter(id=self.staff_user.id).exists()
diff --git a/lms/djangoapps/bulk_email/views.py b/lms/djangoapps/bulk_email/views.py
index 927699091558..f63010d13a90 100644
--- a/lms/djangoapps/bulk_email/views.py
+++ b/lms/djangoapps/bulk_email/views.py
@@ -61,12 +61,17 @@ def opt_out_email_updates(request, token, course_id):
             course_id,
         )
 
-    tracker.emit(
-        'edx.bulk_email.opt_out',
-        {
-            'course_id': course_id,
-            'user_id': user.id,
-        }
-    )
+    event_name = 'edx.bulk_email.opt_out'
+    event_data = {
+        "username": user.username,
+        "user_email": user.email,
+        "user_id": user.id,
+        "course_id": course_id,
+    }
+    with tracker.get_tracker().context(event_name, event_data):
+        tracker.emit(
+            event_name,
+            event_data
+        )
 
     return render_to_response('bulk_email/unsubscribe_success.html', context)
diff --git a/lms/djangoapps/ccx/api/v0/tests/test_views.py b/lms/djangoapps/ccx/api/v0/tests/test_views.py
index 7279b9426347..a8c9070df038 100644
--- a/lms/djangoapps/ccx/api/v0/tests/test_views.py
+++ b/lms/djangoapps/ccx/api/v0/tests/test_views.py
@@ -730,8 +730,8 @@ def make_ccx(self, max_students_allowed=200):
             course_id=ccx_course_key,
             student_email=self.coach.email,
             auto_enroll=True,
-            email_students=False,
-            email_params=email_params,
+            message_students=False,
+            message_params=email_params,
         )
         return ccx
 
diff --git a/lms/djangoapps/ccx/api/v0/views.py b/lms/djangoapps/ccx/api/v0/views.py
index b3e345a77022..8ca15e065006 100644
--- a/lms/djangoapps/ccx/api/v0/views.py
+++ b/lms/djangoapps/ccx/api/v0/views.py
@@ -505,8 +505,8 @@ def post(self, request):
                 course_id=ccx_course_key,
                 student_email=coach.email,
                 auto_enroll=True,
-                email_students=True,
-                email_params=email_params,
+                message_students=True,
+                message_params=email_params,
             )
             # assign staff role for the coach to the newly created ccx
             assign_staff_role_to_ccx(ccx_course_key, coach, master_course_object.id)
@@ -768,8 +768,8 @@ def patch(self, request, ccx_course_id=None):
                     course_id=ccx_course_key,
                     student_email=coach.email,
                     auto_enroll=True,
-                    email_students=True,
-                    email_params=email_params,
+                    message_students=True,
+                    message_params=email_params,
                 )
                 # make the new coach staff on the CCX
                 assign_staff_role_to_ccx(ccx_course_key, coach, master_course_object.id)
diff --git a/lms/djangoapps/ccx/tests/test_field_override_performance.py b/lms/djangoapps/ccx/tests/test_field_override_performance.py
index 68926a24f2dd..a7128495eb59 100644
--- a/lms/djangoapps/ccx/tests/test_field_override_performance.py
+++ b/lms/djangoapps/ccx/tests/test_field_override_performance.py
@@ -234,7 +234,7 @@ class TestFieldOverrideSplitPerformance(FieldOverridePerformanceTestCase):
     __test__ = True
 
     # TODO: decrease query count as part of REVO-28
-    QUERY_COUNT = 33
+    QUERY_COUNT = 34
 
     TEST_DATA = {
         ('no_overrides', 1, True, False): (QUERY_COUNT, 2),
diff --git a/lms/djangoapps/ccx/utils.py b/lms/djangoapps/ccx/utils.py
index 9f7c0eff3963..28ecbba34947 100644
--- a/lms/djangoapps/ccx/utils.py
+++ b/lms/djangoapps/ccx/utils.py
@@ -269,7 +269,13 @@ def ccx_students_enrolling_center(action, identifiers, email_students, course_ke
                 log.info("%s", error)
                 errors.append(error)
                 break
-            enroll_email(course_key, email, auto_enroll=True, email_students=email_students, email_params=email_params)
+            enroll_email(
+                course_key,
+                email,
+                auto_enroll=True,
+                message_students=email_students,
+                message_params=email_params
+            )
     elif action == 'Unenroll' or action == 'revoke':  # lint-amnesty, pylint: disable=consider-using-in
         for identifier in identifiers:
             try:
@@ -278,7 +284,7 @@ def ccx_students_enrolling_center(action, identifiers, email_students, course_ke
                 log.info("%s", exp)
                 errors.append(f"{exp}")
                 continue
-            unenroll_email(course_key, email, email_students=email_students, email_params=email_params)
+            unenroll_email(course_key, email, message_students=email_students, message_params=email_params)
     return errors
 
 
@@ -348,8 +354,8 @@ def add_master_course_staff_to_ccx(master_course, ccx_key, display_name, send_em
                         course_id=ccx_key,
                         student_email=staff.email,
                         auto_enroll=True,
-                        email_students=send_email,
-                        email_params=email_params,
+                        message_students=send_email,
+                        message_params=email_params,
                     )
 
                     # allow 'staff' access on ccx to staff of master course
@@ -373,8 +379,8 @@ def add_master_course_staff_to_ccx(master_course, ccx_key, display_name, send_em
                         course_id=ccx_key,
                         student_email=instructor.email,
                         auto_enroll=True,
-                        email_students=send_email,
-                        email_params=email_params,
+                        message_students=send_email,
+                        message_params=email_params,
                     )
 
                     # allow 'instructor' access on ccx to instructor of master course
@@ -417,8 +423,8 @@ def remove_master_course_staff_from_ccx(master_course, ccx_key, display_name, se
                 unenroll_email(
                     course_id=ccx_key,
                     student_email=staff.email,
-                    email_students=send_email,
-                    email_params=email_params,
+                    message_students=send_email,
+                    message_params=email_params,
                 )
 
         for instructor in list_instructor:
@@ -430,6 +436,6 @@ def remove_master_course_staff_from_ccx(master_course, ccx_key, display_name, se
                 unenroll_email(
                     course_id=ccx_key,
                     student_email=instructor.email,
-                    email_students=send_email,
-                    email_params=email_params,
+                    message_students=send_email,
+                    message_params=email_params,
                 )
diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index 3c5f3130a195..7c6a75aaf6d4 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -223,8 +223,8 @@ def create_ccx(request, course, ccx=None):
         course_id=ccx_id,
         student_email=request.user.email,
         auto_enroll=True,
-        email_students=True,
-        email_params=email_params,
+        message_students=True,
+        message_params=email_params,
     )
 
     assign_staff_role_to_ccx(ccx_id, request.user, course.id)
diff --git a/lms/djangoapps/certificates/api.py b/lms/djangoapps/certificates/api.py
index 4439eeb5f220..895822f58824 100644
--- a/lms/djangoapps/certificates/api.py
+++ b/lms/djangoapps/certificates/api.py
@@ -10,7 +10,6 @@
 import logging
 from datetime import datetime
 
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
@@ -83,6 +82,7 @@ def _format_certificate_for_user(username, cert):
                 if cert.status == CertificateStatuses.downloadable
                 else None
             ),
+            "uuid": cert.verify_uuid,
         }
 
     return None
@@ -286,12 +286,9 @@ def certificate_downloadable_status(student, course_key):
 
     course_overview = get_course_overview_or_none(course_key)
 
-    if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
-        display_behavior_is_valid = (
-            course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
-        )
-    else:
-        display_behavior_is_valid = True
+    display_behavior_is_valid = (
+        course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
+    )
 
     if (
         not certificates_viewable_for_course(course_overview)
@@ -837,10 +834,7 @@ def can_show_certificate_message(course, student, course_grade, certificates_ena
 
 def _course_uses_available_date(course):
     """Returns if the course has an certificate_available_date set and that it should be used"""
-    if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
-        display_behavior_is_valid = course.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
-    else:
-        display_behavior_is_valid = True
+    display_behavior_is_valid = course.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
 
     return (
         can_show_certificate_available_date_field(course)
diff --git a/lms/djangoapps/certificates/apis/v0/tests/test_views.py b/lms/djangoapps/certificates/apis/v0/tests/test_views.py
index efff97f54d5a..c8ef620dd2db 100644
--- a/lms/djangoapps/certificates/apis/v0/tests/test_views.py
+++ b/lms/djangoapps/certificates/apis/v0/tests/test_views.py
@@ -173,17 +173,22 @@ def get_url(self, username):
 
     def assert_success_response_for_student(self, response, download_url='www.google.com'):
         """ This method is required by AuthAndScopesTestMixin. """
-        assert response.data ==\
-               [{'username': self.student.username,
-                 'course_id': str(self.course.id),
-                 'course_display_name': self.course.display_name,
-                 'course_organization': self.course.org,
-                 'certificate_type': CourseMode.VERIFIED,
-                 'created_date': self.now,
-                 'modified_date': self.now,
-                 'status': CertificateStatuses.downloadable,
-                 'is_passing': True,
-                 'download_url': download_url, 'grade': '0.88'}]
+        assert response.data == [
+            {
+                'username': self.student.username,
+                'course_id': str(self.course.id),
+                'course_display_name': self.course.display_name,
+                'course_organization': self.course.org,
+                'certificate_type': CourseMode.VERIFIED,
+                'created_date': self.now,
+                'modified_date': self.now,
+                'status': CertificateStatuses.downloadable,
+                'is_passing': True,
+                'download_url': download_url,
+                'grade': '0.88',
+                'uuid': str(self.cert.verify_uuid)
+            }
+        ]
 
     @patch('edx_rest_framework_extensions.permissions.log')
     @ddt.data(*list(AuthType))
@@ -212,6 +217,7 @@ def test_another_user_with_certs_shared_public(self, auth_type):
 
         assert resp.status_code == status.HTTP_200_OK
         assert len(resp.data) == 1
+        assert 'uuid' in resp.data[0]
 
     def test_owner_can_access_its_certs(self):
         """
@@ -227,6 +233,7 @@ def test_owner_can_access_its_certs(self):
 
         resp = self.get_response(AuthType.session, requesting_user=self.student)
         assert resp.status_code == status.HTTP_200_OK
+        assert 'uuid' in resp.data[0]
 
         # verifies that other than owner cert list api is not accessible
         resp = self.get_response(AuthType.session, requesting_user=self.other_student)
@@ -246,12 +253,15 @@ def test_public_profile_certs_is_accessible(self):
 
         resp = self.get_response(AuthType.session, requesting_user=self.student)
         assert resp.status_code == status.HTTP_200_OK
+        assert 'uuid' in resp.data[0]
 
         resp = self.get_response(AuthType.session, requesting_user=self.other_student)
         assert resp.status_code == status.HTTP_200_OK
+        assert 'uuid' in resp.data[0]
 
         resp = self.get_response(AuthType.session, requesting_user=self.global_staff)
         assert resp.status_code == status.HTTP_200_OK
+        assert 'uuid' in resp.data[0]
 
     @ddt.data(*list(AuthType))
     def test_another_user_with_certs_shared_custom(self, auth_type):
@@ -276,6 +286,7 @@ def test_another_user_with_certs_shared_custom(self, auth_type):
 
         assert resp.status_code == status.HTTP_200_OK
         assert len(resp.data) == 1
+        assert 'uuid' in resp.data[0]
 
     @patch('edx_rest_framework_extensions.permissions.log')
     @ddt.data(*JWT_AUTH_TYPES)
@@ -290,6 +301,7 @@ def test_jwt_on_behalf_of_other_user(self, auth_type, mock_log):
         else:
             assert resp.status_code == status.HTTP_200_OK
             assert len(resp.data) == 1
+            assert 'uuid' in resp.data[0]
 
     @patch('edx_rest_framework_extensions.permissions.log')
     @ddt.data(*JWT_AUTH_TYPES)
@@ -422,3 +434,4 @@ def test_certificate_without_course(self, mock_get_course_run_details):
         assert response.status_code == status.HTTP_200_OK
         self.assertContains(response, cert_for_deleted_course.download_url)
         self.assertContains(response, expected_course_name)
+        assert 'uuid' in response.data[0]
diff --git a/lms/djangoapps/certificates/apis/v0/views.py b/lms/djangoapps/certificates/apis/v0/views.py
index 121f37fe72d0..aa6512535b84 100644
--- a/lms/djangoapps/certificates/apis/v0/views.py
+++ b/lms/djangoapps/certificates/apis/v0/views.py
@@ -244,6 +244,7 @@ def get(self, request, username):
                     'is_passing': user_cert.get('is_passing'),
                     'download_url': user_cert.get('download_url'),
                     'grade': user_cert.get('grade'),
+                    'uuid': user_cert.get('uuid'),
                 })
         return Response(user_certs)
 
diff --git a/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl b/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl
index beef611e4393..e5b66bf3b2ab 100644
--- a/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl
+++ b/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl
@@ -31,7 +31,9 @@ workspace {
         }
 
         grades_app -> signal_handlers "Emits COURSE_GRADE_NOW_PASSED signal"
-        verify_student_app -> signal_handlers "Emits LEARNER_NOW_VERIFIED signal"
+        verify_student_app -> signal_handlers "Emits IDV_ATTEMPT_APPROVED signal"
+        verify_student_app -> signal_handlers "Emits LEARNER_SSO_VERIFIED signal"
+        verify_student_app -> signal_handlers "Emits PHOTO_VERIFICATION_APPROVED signal"
         student_app -> signal_handlers "Emits ENROLLMENT_TRACK_UPDATED signal"
         allowlist -> signal_handlers "Emits APPEND_CERTIFICATE_ALLOWLIST signal"
         signal_handlers -> generation_handler "Invokes generate_allowlist_certificate()"
diff --git a/lms/djangoapps/certificates/signals.py b/lms/djangoapps/certificates/signals.py
index d8db7bbf9ce8..39042ff34164 100644
--- a/lms/djangoapps/certificates/signals.py
+++ b/lms/djangoapps/certificates/signals.py
@@ -32,9 +32,10 @@
 from openedx.core.djangoapps.signals.signals import (
     COURSE_GRADE_NOW_FAILED,
     COURSE_GRADE_NOW_PASSED,
-    LEARNER_NOW_VERIFIED
+    LEARNER_SSO_VERIFIED,
+    PHOTO_VERIFICATION_APPROVED,
 )
-from openedx_events.learning.signals import EXAM_ATTEMPT_REJECTED
+from openedx_events.learning.signals import EXAM_ATTEMPT_REJECTED, IDV_ATTEMPT_APPROVED
 
 User = get_user_model()
 
@@ -118,10 +119,9 @@ def _listen_for_failing_grade(sender, user, course_id, grade, **kwargs):  # pyli
             log.info(f'Certificate marked not passing for {user.id} : {course_id} via failing grade')
 
 
-@receiver(LEARNER_NOW_VERIFIED, dispatch_uid="learner_track_changed")
-def _listen_for_id_verification_status_changed(sender, user, **kwargs):  # pylint: disable=unused-argument
+def _handle_id_verification_approved(user):
     """
-    Listen for a signal indicating that the user's id verification status has changed.
+    Generate a certificate for the user if they are now verified
     """
     if not auto_certificate_generation_enabled():
         return
@@ -143,6 +143,25 @@ def _listen_for_id_verification_status_changed(sender, user, **kwargs):  # pylin
             )
 
 
+@receiver(LEARNER_SSO_VERIFIED, dispatch_uid="sso_learner_verified")
+@receiver(PHOTO_VERIFICATION_APPROVED, dispatch_uid="photo_verification_approved")
+def _listen_for_sso_verification_approved(sender, user, **kwargs):  # pylint: disable=unused-argument
+    """
+    Listen for a signal on SSOVerification indicating that the user has been verified.
+    """
+    _handle_id_verification_approved(user)
+
+
+@receiver(IDV_ATTEMPT_APPROVED, dispatch_uid="openedx_idv_attempt_approved")
+def _listen_for_id_verification_approved_event(sender, signal, **kwargs):  # pylint: disable=unused-argument
+    """
+    Listen for an openedx event indicating that the user's id verification status has changed.
+    """
+    event_data = kwargs.get('idv_attempt')
+    user = User.objects.get(id=event_data.user.id)
+    _handle_id_verification_approved(user)
+
+
 @receiver(ENROLLMENT_TRACK_UPDATED)
 def _listen_for_enrollment_mode_change(sender, user, course_key, mode, **kwargs):  # pylint: disable=unused-argument
     """
diff --git a/lms/djangoapps/certificates/tests/test_api.py b/lms/djangoapps/certificates/tests/test_api.py
index 21d04a7e3da6..cb11b9e00bd1 100644
--- a/lms/djangoapps/certificates/tests/test_api.py
+++ b/lms/djangoapps/certificates/tests/test_api.py
@@ -209,29 +209,6 @@ def test_with_downloadable_web_cert(self):
             "uuid": cert_status["uuid"],
         }
 
-    @ddt.data(
-        (False, timedelta(days=2), False, True),
-        (False, -timedelta(days=2), True, None),
-        (True, timedelta(days=2), True, None),
-    )
-    @ddt.unpack
-    @patch.dict(settings.FEATURES, {"CERTIFICATES_HTML_VIEW": True})
-    @patch.dict(settings.FEATURES, {"ENABLE_V2_CERT_DISPLAY_SETTINGS": False})
-    def test_cert_api_return_v1(self, self_paced, cert_avail_delta, cert_downloadable_status, earned_but_not_available):
-        """
-        Test 'downloadable status'
-        """
-        cert_avail_date = datetime.now(pytz.UTC) + cert_avail_delta
-        self.course.self_paced = self_paced
-        self.course.certificate_available_date = cert_avail_date
-        self.course.save()
-
-        self._setup_course_certificate()
-
-        downloadable_status = certificate_downloadable_status(self.student, self.course.id)
-        assert downloadable_status["is_downloadable"] == cert_downloadable_status
-        assert downloadable_status.get("earned_but_not_available") == earned_but_not_available
-
     @ddt.data(
         (True, timedelta(days=2), CertificatesDisplayBehaviors.END_WITH_DATE, True, None),
         (False, -timedelta(days=2), CertificatesDisplayBehaviors.EARLY_NO_INFO, True, None),
@@ -243,8 +220,7 @@ def test_cert_api_return_v1(self, self_paced, cert_avail_delta, cert_downloadabl
     )
     @ddt.unpack
     @patch.dict(settings.FEATURES, {"CERTIFICATES_HTML_VIEW": True})
-    @patch.dict(settings.FEATURES, {"ENABLE_V2_CERT_DISPLAY_SETTINGS": True})
-    def test_cert_api_return_v2(
+    def test_cert_api_return(
         self,
         self_paced,
         cert_avail_delta,
diff --git a/lms/djangoapps/certificates/tests/test_filters.py b/lms/djangoapps/certificates/tests/test_filters.py
index 781b77461f41..a131a1d52582 100644
--- a/lms/djangoapps/certificates/tests/test_filters.py
+++ b/lms/djangoapps/certificates/tests/test_filters.py
@@ -23,7 +23,7 @@
 from lms.djangoapps.certificates.models import GeneratedCertificate
 from lms.djangoapps.certificates.signals import (
     _listen_for_enrollment_mode_change,
-    _listen_for_id_verification_status_changed,
+    _handle_id_verification_approved,
     listen_for_passing_grade
 )
 from lms.djangoapps.certificates.tests.factories import CertificateAllowlistFactory
@@ -272,7 +272,7 @@ def test_listen_for_passing_grade(self):
         mock.Mock(return_value={"status": "approved"})
     )
     @mock.patch("lms.djangoapps.certificates.api.auto_certificate_generation_enabled", mock.Mock(return_value=True))
-    def test_listen_for_id_verification_status_changed(self):
+    def test_handle_id_verification_approved(self):
         """
         Test stop certificate generation process after the verification status changed by raising a filters exception.
 
@@ -280,7 +280,7 @@ def test_listen_for_id_verification_status_changed(self):
             - CertificateCreationRequested is triggered and executes TestStopCertificateGenerationStep.
             - The certificate is not generated.
         """
-        _listen_for_id_verification_status_changed(None, self.user)
+        _handle_id_verification_approved(self.user)
 
         self.assertFalse(
             GeneratedCertificate.objects.filter(
diff --git a/lms/djangoapps/certificates/tests/test_signals.py b/lms/djangoapps/certificates/tests/test_signals.py
index d475cffbfb66..7b5552801349 100644
--- a/lms/djangoapps/certificates/tests/test_signals.py
+++ b/lms/djangoapps/certificates/tests/test_signals.py
@@ -13,22 +13,20 @@
 from openedx_events.data import EventsMetadata
 from openedx_events.learning.data import ExamAttemptData, UserData, UserPersonalData
 from openedx_events.learning.signals import EXAM_ATTEMPT_REJECTED
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory
+from openedx_events.tests.utils import OpenEdxEventsTestMixin
 
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.certificates.api import has_self_generated_certificates_enabled
 from lms.djangoapps.certificates.config import AUTO_CERTIFICATE_GENERATION
 from lms.djangoapps.certificates.data import CertificateStatuses
-from lms.djangoapps.certificates.models import (
-    CertificateGenerationConfiguration,
-    GeneratedCertificate
-)
+from lms.djangoapps.certificates.models import CertificateGenerationConfiguration, GeneratedCertificate
 from lms.djangoapps.certificates.signals import handle_exam_attempt_rejected_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 xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
 class SelfGeneratedCertsSignalTest(ModuleStoreTestCase):
@@ -302,10 +300,17 @@ def test_failing_grade_allowlist(self):
         assert cert.status == CertificateStatuses.downloadable
 
 
-class LearnerIdVerificationTest(ModuleStoreTestCase):
+class LearnerIdVerificationTest(ModuleStoreTestCase, OpenEdxEventsTestMixin):
     """
     Tests for certificate generation task firing on learner id verification
     """
+    ENABLED_OPENEDX_EVENTS = ['org.openedx.learning.idv_attempt.approved.v1']
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.start_events_isolation()
+
     def setUp(self):
         super().setUp()
         self.course_one = CourseFactory.create(self_paced=True)
diff --git a/lms/djangoapps/certificates/tests/test_utils.py b/lms/djangoapps/certificates/tests/test_utils.py
index 00bb0bbe3ed0..298e624fdd8e 100644
--- a/lms/djangoapps/certificates/tests/test_utils.py
+++ b/lms/djangoapps/certificates/tests/test_utils.py
@@ -5,7 +5,6 @@
 from unittest.mock import patch
 
 import ddt
-from django.conf import settings
 from django.test import TestCase
 from pytz import utc
 
@@ -80,40 +79,7 @@ def test_has_html_certificates_enabled_from_course_overview_disabled(self):
         (CertificatesDisplayBehaviors.END, False, False, _LAST_MONTH, True, True),
     )
     @ddt.unpack
-    @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
-    def test_should_certificate_be_visible_v2(
-        self,
-        certificates_display_behavior,
-        certificates_show_before_end,
-        has_ended,
-        certificate_available_date,
-        self_paced,
-        expected_value
-    ):
-        """Test whether the certificate should be visible to user given multiple usecases"""
-        assert should_certificate_be_visible(
-            certificates_display_behavior,
-            certificates_show_before_end,
-            has_ended,
-            certificate_available_date,
-            self_paced
-        ) == expected_value
-
-    @ddt.data(
-        ('early_with_info', True, True, _LAST_MONTH, False, True),
-        ('early_no_info', False, False, _LAST_MONTH, False, True),
-        ('end', True, False, _LAST_MONTH, False, True),
-        ('end', False, True, _LAST_MONTH, False, True),
-        ('end', False, False, _NEXT_WEEK, False, False),
-        ('end', False, False, _LAST_WEEK, False, True),
-        ('end', False, False, None, False, False),
-        ('early_with_info', False, False, None, False, True),
-        ('end', False, False, _NEXT_WEEK, False, False),
-        ('end', False, False, _NEXT_WEEK, True, True),
-    )
-    @ddt.unpack
-    @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=False)
-    def test_should_certificate_be_visible_v1(
+    def test_should_certificate_be_visible(
         self,
         certificates_display_behavior,
         certificates_show_before_end,
diff --git a/lms/djangoapps/certificates/utils.py b/lms/djangoapps/certificates/utils.py
index 725c54ac09bc..7ff2a4c97b27 100644
--- a/lms/djangoapps/certificates/utils.py
+++ b/lms/djangoapps/certificates/utils.py
@@ -153,30 +153,19 @@ def should_certificate_be_visible(
         certificate_available_date (datetime): the date the certificate is available on for the course.
         self_paced (bool): Whether the course is self-paced.
     """
-    if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
-        show_early = (
-            certificates_display_behavior == CertificatesDisplayBehaviors.EARLY_NO_INFO
-            or certificates_show_before_end
-        )
-        past_available_date = (
-            certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
-            and certificate_available_date
-            and certificate_available_date < datetime.now(utc)
-        )
-        ended_without_available_date = (
-            certificates_display_behavior == CertificatesDisplayBehaviors.END
-            and has_ended
-        )
-    else:
-        show_early = (
-            certificates_display_behavior in ('early_with_info', 'early_no_info')
-            or certificates_show_before_end
-        )
-        past_available_date = (
-            certificate_available_date
-            and certificate_available_date < datetime.now(utc)
-        )
-        ended_without_available_date = (certificate_available_date is None) and has_ended
+    show_early = (
+        certificates_display_behavior == CertificatesDisplayBehaviors.EARLY_NO_INFO
+        or certificates_show_before_end
+    )
+    past_available_date = (
+        certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
+        and certificate_available_date
+        and certificate_available_date < datetime.now(utc)
+    )
+    ended_without_available_date = (
+        certificates_display_behavior == CertificatesDisplayBehaviors.END
+        and has_ended
+    )
 
     return any((self_paced, show_early, past_available_date, ended_without_available_date))
 
diff --git a/lms/djangoapps/certificates/views/webview.py b/lms/djangoapps/certificates/views/webview.py
index 40a1f4499305..06e4e8a55337 100644
--- a/lms/djangoapps/certificates/views/webview.py
+++ b/lms/djangoapps/certificates/views/webview.py
@@ -353,28 +353,22 @@ def _get_user_certificate(request, user, course_key, course_overview, preview_mo
     if preview_mode:
         # certificate is being previewed from studio
         if request.user.has_perm(PREVIEW_CERTIFICATES, course_overview):
-            if not settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
-                if course_overview.certificate_available_date and not course_overview.self_paced:
-                    modified_date = course_overview.certificate_available_date
-                else:
-                    modified_date = datetime.now().date()
+            if (
+                course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
+                and course_overview.certificate_available_date
+                and not course_overview.self_paced
+            ):
+                modified_date = course_overview.certificate_available_date
+            elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END:
+                modified_date = course_overview.end
             else:
-                if (
-                    course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
-                    and course_overview.certificate_available_date
-                    and not course_overview.self_paced
-                ):
-                    modified_date = course_overview.certificate_available_date
-                elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END:
-                    modified_date = course_overview.end
-                else:
-                    modified_date = datetime.now().date()
-            user_certificate = GeneratedCertificate(
-                mode=preview_mode,
-                verify_uuid=str(uuid4().hex),
-                modified_date=modified_date,
-                created_date=datetime.now().date(),
-            )
+                modified_date = datetime.now().date()
+        user_certificate = GeneratedCertificate(
+            mode=preview_mode,
+            verify_uuid=str(uuid4().hex),
+            modified_date=modified_date,
+            created_date=datetime.now().date(),
+        )
     elif certificates_viewable_for_course(course_overview):
         # certificate is being viewed by learner or public
         try:
diff --git a/lms/djangoapps/commerce/tests/test_utils.py b/lms/djangoapps/commerce/tests/test_utils.py
index 6c793433dff6..d5d0cf1f1c23 100644
--- a/lms/djangoapps/commerce/tests/test_utils.py
+++ b/lms/djangoapps/commerce/tests/test_utils.py
@@ -11,7 +11,6 @@
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
-from edx_toggles.toggles.testutils import override_waffle_flag
 from opaque_keys.edx.locator import CourseLocator
 from waffle.testutils import override_switch
 
@@ -21,7 +20,6 @@
 from common.djangoapps.student.tests.factories import TEST_PASSWORD, UserFactory
 from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.commerce.utils import EcommerceService, refund_entitlement, refund_seat
-from lms.djangoapps.commerce.waffle import ENABLE_TRANSITION_TO_COORDINATOR_CHECKOUT
 from openedx.core.djangolib.testing.utils import skip_unless_lms
 from openedx.core.lib.log_utils import audit_log
 from xmodule.modulestore.tests.django_utils import \
@@ -186,27 +184,6 @@ def test_get_checkout_page_url_with_enterprise_catalog_uuid(self, skus, enterpri
 
         assert url == expected_url
 
-    @override_settings(COMMERCE_COORDINATOR_URL_ROOT='http://coordinator_url')
-    @override_settings(ECOMMERCE_PUBLIC_URL_ROOT='http://ecommerce_url')
-    @ddt.data(
-        {'coordinator_flag_active': True},
-        {'coordinator_flag_active': False}
-    )
-    @ddt.unpack
-    def test_get_add_to_basket_url(self, coordinator_flag_active):
-        with override_waffle_flag(ENABLE_TRANSITION_TO_COORDINATOR_CHECKOUT, active=coordinator_flag_active):
-
-            ecommerce_service = EcommerceService()
-            result = ecommerce_service.get_add_to_basket_url()
-
-            if coordinator_flag_active:
-                expected_url = 'http://coordinator_url/lms/payment_page_redirect/'
-            else:
-                expected_url = 'http://ecommerce_url/test_basket/add/'
-
-            self.assertIsNotNone(result)
-            self.assertEqual(expected_url, result)
-
 
 @ddt.ddt
 @skip_unless_lms
diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py
index a37cd2ab36b2..9abcabd4a96d 100644
--- a/lms/djangoapps/commerce/utils.py
+++ b/lms/djangoapps/commerce/utils.py
@@ -13,7 +13,6 @@
 from django.utils.translation import gettext as _
 
 from common.djangoapps.course_modes.models import CourseMode
-from common.djangoapps.student.models import CourseEnrollmentAttribute
 from openedx.core.djangoapps.commerce.utils import (
     get_ecommerce_api_base_url,
     get_ecommerce_api_client,
@@ -23,10 +22,7 @@
 from openedx.core.djangoapps.theming import helpers as theming_helpers
 
 from .models import CommerceConfiguration
-from .waffle import (  # lint-amnesty, pylint: disable=invalid-django-waffle-import
-    should_redirect_to_commerce_coordinator_checkout,
-    should_redirect_to_commerce_coordinator_refunds,
-)
+from edx_django_utils.plugins import pluggable_override
 
 log = logging.getLogger(__name__)
 
@@ -56,6 +52,7 @@ def ecommerce_url_root(self):
         """ Retrieve Ecommerce service public url root. """
         return configuration_helpers.get_value('ECOMMERCE_PUBLIC_URL_ROOT', settings.ECOMMERCE_PUBLIC_URL_ROOT)
 
+    @pluggable_override('OVERRIDE_GET_ABSOLUTE_ECOMMERCE_URL')
     def get_absolute_ecommerce_url(self, ecommerce_page_url):
         """ Return the absolute URL to the ecommerce page.
 
@@ -108,22 +105,14 @@ def payment_page_url(self):
         """
         return self.get_absolute_ecommerce_url(self.config.basket_checkout_page)
 
-    def get_add_to_basket_url(self):
-        """ Return the URL for the payment page based on the waffle switch.
-
-        Example:
-            http://localhost/enabled_service_api_path
-        """
-        if should_redirect_to_commerce_coordinator_checkout():
-            return urljoin(settings.COMMERCE_COORDINATOR_URL_ROOT, settings.COORDINATOR_CHECKOUT_REDIRECT_PATH)
-        return self.payment_page_url()
-
+    @pluggable_override('OVERRIDE_GET_CHECKOUT_PAGE_URL')
     def get_checkout_page_url(self, *skus, **kwargs):
         """ Construct the URL to the ecommerce checkout page and include products.
 
         Args:
             skus (list): List of SKUs associated with products to be added to basket
             program_uuid (string): The UUID of the program, if applicable
+            course_run_keys (list): The course run keys of the products to be added to basket.
 
         Returns:
             Absolute path to the ecommerce checkout page showing basket that contains specified products.
@@ -153,10 +142,12 @@ def upgrade_url(self, user, course_key):
         """
         Returns the URL for the user to upgrade, or None if not applicable.
         """
+        course_run_key = str(course_key)
+
         verified_mode = CourseMode.verified_mode_for_course(course_key)
         if verified_mode:
             if self.is_enabled(user):
-                return self.get_checkout_page_url(verified_mode.sku)
+                return self.get_checkout_page_url(verified_mode.sku, course_run_keys=[course_run_key])
             else:
                 return reverse('dashboard')
         return None
@@ -233,6 +224,7 @@ def refund_entitlement(course_entitlement):
         return False
 
 
+@pluggable_override('OVERRIDE_REFUND_SEAT')
 def refund_seat(course_enrollment, change_mode=False):
     """
     Attempt to initiate a refund for any orders associated with the seat being unenrolled,
@@ -255,10 +247,6 @@ def refund_seat(course_enrollment, change_mode=False):
     course_key_str = str(course_enrollment.course_id)
     enrollee = course_enrollment.user
 
-    if should_redirect_to_commerce_coordinator_refunds():
-        if _refund_in_commerce_coordinator(course_enrollment, change_mode):
-            return
-
     service_user = User.objects.get(username=settings.ECOMMERCE_SERVICE_WORKER_USERNAME)
     api_client = get_ecommerce_api_client(service_user)
 
@@ -282,83 +270,14 @@ def refund_seat(course_enrollment, change_mode=False):
             user=enrollee,
         )
         if change_mode:
-            _auto_enroll(course_enrollment)
+            auto_enroll(course_enrollment)
     else:
         log.info('No refund opened for user [%s], course [%s]', enrollee.id, course_key_str)
 
     return refund_ids
 
 
-def _refund_in_commerce_coordinator(course_enrollment, change_mode):
-    """
-    Helper function to perform refund in Commerce Coordinator.
-
-    Parameters:
-        course_enrollment (CourseEnrollment): the enrollment to refund.
-        change_mode (bool): whether the enrollment should be auto-enrolled into
-            the default course mode after refund.
-
-    Returns:
-        bool: True if refund was performed. False if refund is not applicable
-            to Commerce Coordinator.
-    """
-    enrollment_source_system = course_enrollment.get_order_attribute_value("source_system")
-    course_key_str = str(course_enrollment.course_id)
-
-    # Commerce Coordinator enrollments will have an orders.source_system enrollment attribute.
-    # Redirect to Coordinator only if the source_system is safelisted as Coordinator's in settings.
-
-    if enrollment_source_system and enrollment_source_system in settings.COMMERCE_COORDINATOR_REFUND_SOURCE_SYSTEMS:
-        log.info('Redirecting refund to Commerce Coordinator for user [%s], course [%s]...',
-                 course_enrollment.user_id, course_key_str)
-
-        # Re-use Ecommerce API client factory to build an API client for Commerce Coordinator...
-        service_user = get_user_model().objects.get(
-            username=settings.COMMERCE_COORDINATOR_SERVICE_WORKER_USERNAME
-        )
-        api_client = get_ecommerce_api_client(service_user)
-        refunds_url = urljoin(
-            settings.COMMERCE_COORDINATOR_URL_ROOT,
-            settings.COMMERCE_COORDINATOR_REFUND_PATH
-        )
-
-        # Build request, raising exception if Coordinator returns non-200.
-        enrollment_attributes = CourseEnrollmentAttribute.get_enrollment_attributes(course_enrollment)
-
-        try:
-            api_client.post(
-                refunds_url,
-                json={
-                    'course_id': course_key_str,
-                    'username': course_enrollment.username,
-                    'enrollment_attributes': enrollment_attributes
-                }
-            ).raise_for_status()
-
-        except Exception as exc:  # pylint: disable=broad-except
-            # Catch any possible exceptions from the Commerce Coordinator service to ensure we fail gracefully
-            log.exception(
-                "Unexpected exception while attempting to refund user in Coordinator [%s], "
-                "course key [%s] message: [%s]",
-                course_enrollment.username,
-                course_key_str,
-                str(exc)
-            )
-
-        # Refund was successfully sent to Commerce Coordinator
-        log.info('Refund successfully sent to Commerce Coordinator for user [%s], course [%s].',
-                 course_enrollment.user_id, course_key_str)
-        if change_mode:
-            _auto_enroll(course_enrollment)
-        return True
-    else:
-        # Refund was not meant to be sent to Commerce Coordinator
-        log.info('Continuing refund without Commerce Coordinator redirect for user [%s], course [%s]...',
-                 course_enrollment.user_id, course_key_str)
-        return False
-
-
-def _auto_enroll(course_enrollment):
+def auto_enroll(course_enrollment):
     """
     Helper method to update an enrollment to a default course mode.
 
diff --git a/lms/djangoapps/commerce/waffle.py b/lms/djangoapps/commerce/waffle.py
deleted file mode 100644
index a36586a52d9b..000000000000
--- a/lms/djangoapps/commerce/waffle.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-Configuration for features of Commerce App
-"""
-from edx_toggles.toggles import WaffleFlag
-
-# Namespace for Commerce waffle flags.
-WAFFLE_FLAG_NAMESPACE = "commerce"
-
-# .. toggle_name: commerce.transition_to_coordinator.checkout
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Allows to redirect checkout to Commerce Coordinator API
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2023-11-22
-# .. toggle_target_removal_date: TBA
-# .. toggle_tickets: SONIC-99
-# .. toggle_status: supported
-ENABLE_TRANSITION_TO_COORDINATOR_CHECKOUT = WaffleFlag(
-    f"{WAFFLE_FLAG_NAMESPACE}.transition_to_coordinator.checkout",
-    __name__,
-)
-
-# .. toggle_name: commerce.transition_to_coordinator.refund
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Allows to redirect refunds to Commerce Coordinator API
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2024-03-26
-# .. toggle_target_removal_date: TBA
-# .. toggle_tickets: SONIC-382
-# .. toggle_status: supported
-ENABLE_TRANSITION_TO_COORDINATOR_REFUNDS = WaffleFlag(
-    f"{WAFFLE_FLAG_NAMESPACE}.transition_to_coordinator.refunds",
-    __name__,
-)
-
-
-def should_redirect_to_commerce_coordinator_checkout():
-    """
-    Redirect learners to Commerce Coordinator checkout.
-    """
-    return ENABLE_TRANSITION_TO_COORDINATOR_CHECKOUT.is_enabled()
-
-
-def should_redirect_to_commerce_coordinator_refunds():
-    """
-    Redirect learners to Commerce Coordinator refunds.
-    """
-    return ENABLE_TRANSITION_TO_COORDINATOR_REFUNDS.is_enabled()
diff --git a/lms/djangoapps/course_api/blocks/tests/test_api.py b/lms/djangoapps/course_api/blocks/tests/test_api.py
index e6fd74463aa9..93e400d4a804 100644
--- a/lms/djangoapps/course_api/blocks/tests/test_api.py
+++ b/lms/djangoapps/course_api/blocks/tests/test_api.py
@@ -3,16 +3,13 @@
 """
 
 
-from itertools import product
 from unittest.mock import patch
 
 import ddt
 from django.test.client import RequestFactory
-from edx_toggles.toggles.testutils import override_waffle_switch
 
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.content.block_structure.api import clear_course_from_cache
-from openedx.core.djangoapps.content.block_structure.config import STORAGE_BACKING_FOR_CACHE
 from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.tests.factories import SampleCourseFactory, check_mongo_calls  # lint-amnesty, pylint: disable=wrong-import-order
@@ -209,34 +206,25 @@ class TestGetBlocksQueryCounts(TestGetBlocksQueryCountsBase):
     Tests query counts for the get_blocks function.
     """
 
-    @ddt.data(
-        *product(
-            (ModuleStoreEnum.Type.split, ),
-            (True, False),
+    @ddt.data(ModuleStoreEnum.Type.split)
+    def test_query_counts_cached(self, store_type):
+        course = self._create_course(store_type)
+        self._get_blocks(
+            course,
+            expected_mongo_queries=0,
+            expected_sql_queries=14,
         )
-    )
-    @ddt.unpack
-    def test_query_counts_cached(self, store_type, with_storage_backing):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=with_storage_backing):
-            course = self._create_course(store_type)
-            self._get_blocks(
-                course,
-                expected_mongo_queries=0,
-                expected_sql_queries=14 if with_storage_backing else 13,
-            )
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 2, True, 24),
-        (ModuleStoreEnum.Type.split, 2, False, 14),
+        (ModuleStoreEnum.Type.split, 2, 24),
     )
     @ddt.unpack
-    def test_query_counts_uncached(self, store_type, expected_mongo_queries, with_storage_backing, num_sql_queries):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=with_storage_backing):
-            course = self._create_course(store_type)
-            clear_course_from_cache(course.id)
-
-            self._get_blocks(
-                course,
-                expected_mongo_queries,
-                expected_sql_queries=num_sql_queries,
-            )
+    def test_query_counts_uncached(self, store_type, expected_mongo_queries, num_sql_queries):
+        course = self._create_course(store_type)
+        clear_course_from_cache(course.id)
+
+        self._get_blocks(
+            course,
+            expected_mongo_queries,
+            expected_sql_queries=num_sql_queries,
+        )
diff --git a/lms/djangoapps/course_api/blocks/transformers/tests/test_milestones.py b/lms/djangoapps/course_api/blocks/transformers/tests/test_milestones.py
index e87e0e755685..5efea79c1986 100644
--- a/lms/djangoapps/course_api/blocks/transformers/tests/test_milestones.py
+++ b/lms/djangoapps/course_api/blocks/transformers/tests/test_milestones.py
@@ -13,6 +13,7 @@
 from lms.djangoapps.course_blocks.api import get_course_blocks
 from lms.djangoapps.course_blocks.transformers.tests.helpers import CourseStructureTestCase
 from lms.djangoapps.gating import api as lms_gating_api
+import openedx.core.djangoapps.content.block_structure.api as bs_api
 from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
 from openedx.core.djangoapps.course_apps.toggles import EXAMS_IDA
 from openedx.core.lib.gating import api as gating_api
@@ -166,7 +167,11 @@ def test_gated(self, gated_block_ref, gating_block_ref, expected_blocks_before_c
         self.course.enable_subsection_gating = True
         self.setup_gated_section(self.blocks[gated_block_ref], self.blocks[gating_block_ref])
 
-        with self.assertNumQueries(5):
+        # Cache the course blocks so that they don't need to be generated when we're trying to
+        # get data back.  This would happen as a part of publishing in a production system.
+        bs_api.update_course_in_cache(self.course.id)
+
+        with self.assertNumQueries(4):
             self.get_blocks_and_check_against_expected(self.user, expected_blocks_before_completion)
 
         # clear the request cache to simulate a new request
@@ -179,7 +184,7 @@ def test_gated(self, gated_block_ref, gating_block_ref, expected_blocks_before_c
             self.user,
         )
 
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(4):
             self.get_blocks_and_check_against_expected(self.user, self.ALL_BLOCKS_EXCEPT_SPECIAL)
 
     def test_staff_access(self):
diff --git a/lms/djangoapps/course_blocks/api.py b/lms/djangoapps/course_blocks/api.py
index c978f54e02d5..de4e0443fb08 100644
--- a/lms/djangoapps/course_blocks/api.py
+++ b/lms/djangoapps/course_blocks/api.py
@@ -108,4 +108,5 @@ def get_course_blocks(
         transformers,
         starting_block_usage_key,
         collected_block_structure,
+        user,
     )
diff --git a/lms/djangoapps/course_blocks/tests/test_api.py b/lms/djangoapps/course_blocks/tests/test_api.py
new file mode 100644
index 000000000000..52e9c86ec324
--- /dev/null
+++ b/lms/djangoapps/course_blocks/tests/test_api.py
@@ -0,0 +1,149 @@
+# pylint: disable=attribute-defined-outside-init
+"""
+Tests for course_blocks API
+"""
+
+from unittest.mock import Mock, patch
+
+import ddt
+from django.http.request import HttpRequest
+
+from common.djangoapps.student.tests.factories import UserFactory
+from lms.djangoapps.course_blocks.api import get_course_blocks
+from lms.djangoapps.course_blocks.transformers.tests.helpers import CourseStructureTestCase
+from lms.djangoapps.course_blocks.transformers.tests.test_user_partitions import UserPartitionTestMixin
+from lms.djangoapps.courseware.block_render import make_track_function, prepare_runtime_for_user
+from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
+from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort
+from xmodule.modulestore.django import modulestore
+
+
+def get_block_side_effect(block_locator, user_known):
+    """
+    Side effect for `CachingDescriptorSystem.get_block`
+    """
+    store = modulestore()
+    course = store.get_course(block_locator.course_key)
+    block = store.get_item(block_locator)
+    runtime = block.runtime
+    user = UserFactory.create()
+    user.known = user_known
+
+    prepare_runtime_for_user(
+        user=user,
+        student_data=Mock(),
+        runtime=runtime,
+        course_id=block_locator.course_key,
+        track_function=make_track_function(HttpRequest()),
+        request_token=Mock(),
+        course=course,
+    )
+    return block.runtime.get_block_for_descriptor(block)
+
+
+def get_block_side_effect_for_known_user(self, *args, **kwargs):
+    """
+    Side effect for known user test.
+    """
+    return get_block_side_effect(self, True)
+
+
+def get_block_side_effect_for_unknown_user(self, *args, **kwargs):
+    """
+    Side effect for unknown user test.
+    """
+    return get_block_side_effect(self, False)
+
+
+@ddt.ddt
+class TestGetCourseBlocks(UserPartitionTestMixin, CourseStructureTestCase):
+    """
+    Tests `get_course_blocks` API
+    """
+
+    def setup_partitions_and_course(self):
+        """
+        Setup course structure.
+        """
+        # Set up user partitions and groups.
+        self.setup_groups_partitions(active=True, num_groups=1)
+        self.user_partition = self.user_partitions[0]
+
+        # Build course.
+        self.course_hierarchy = self.get_course_hierarchy()
+        self.blocks = self.build_course(self.course_hierarchy)
+        self.course = self.blocks['course']
+
+        # Set up cohorts.
+        self.setup_cohorts(self.course)
+
+    def get_course_hierarchy(self):
+        """
+        Returns a course hierarchy to test with.
+        """
+        #                      course
+        #                    /          \
+        #                   /            \
+        #                 A[0]            B
+        #                                 |
+        #                                 |
+        #                                 O
+
+        return [
+            {
+                'org': 'UserPartitionTransformer',
+                'course': 'UP101F',
+                'run': 'test_run',
+                'user_partitions': [self.user_partition],
+                '#type': 'course',
+                '#ref': 'course',
+                '#children': [
+                    {
+                        '#type': 'vertical',
+                        '#ref': 'A',
+                        'metadata': {'group_access': {self.user_partition.id: [0]}},
+                    },
+                    {'#type': 'vertical', '#ref': 'B'},
+                ],
+            },
+            {
+                '#type': 'vertical',
+                '#ref': 'O',
+                '#parents': ['B'],
+            },
+        ]
+
+    @ddt.data(
+        (1, ('course', 'B', 'O'), True),
+        (1, ('course', 'A', 'B', 'O'), False),
+        (None, ('course', 'B', 'O'), True),
+        (None, ('course', 'A', 'B', 'O'), False),
+    )
+    @ddt.unpack
+    def test_get_course_blocks(self, group_id, expected_blocks, user_known):
+        """
+        Tests that `get_course_blocks` returns blocks without access checks for unknown users.
+
+        Access checks are done through the transformers and through Runtime get_block_for_descriptor. Due
+        to the runtime limitations during the tests, the Runtime access checks are not performed as
+        get_block_for_descriptor is never called and Block is returned by CachingDescriptorSystem.get_block.
+        In this test, we mock the CachingDescriptorSystem.get_block and check block access for known and unknown users.
+        For known users, it performs the Runtime access checks through get_block_for_descriptor. For unknown, it
+        skips the access checks.
+        """
+        self.setup_partitions_and_course()
+        if group_id:
+            cohort = self.partition_cohorts[self.user_partition.id - 1][group_id - 1]
+            add_user_to_cohort(cohort, self.user.username)
+
+        side_effect = get_block_side_effect_for_known_user if user_known else get_block_side_effect_for_unknown_user
+        with patch('xmodule.modulestore.split_mongo.split.CachingDescriptorSystem.get_block', side_effect=side_effect):
+            block_structure = get_course_blocks(
+                self.user,
+                self.course.location,
+                BlockStructureTransformers([]),
+            )
+        self.assertSetEqual(
+            set(block_structure.get_block_keys()),
+            self.get_block_key_set(self.blocks, *expected_blocks)
+        )
diff --git a/lms/djangoapps/course_blocks/transformers/library_content.py b/lms/djangoapps/course_blocks/transformers/library_content.py
index 616cf68f4b62..10ef8c2138b6 100644
--- a/lms/djangoapps/course_blocks/transformers/library_content.py
+++ b/lms/djangoapps/course_blocks/transformers/library_content.py
@@ -14,7 +14,7 @@
     BlockStructureTransformer,
     FilteringTransformerMixin
 )
-from xmodule.library_content_block import LibraryContentBlock  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.library_content_block import LegacyLibraryContentBlock  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 from ..utils import get_student_module_as_dict
@@ -47,7 +47,6 @@ def collect(cls, block_structure):
         Collects any information that's necessary to execute this
         transformer's transform method.
         """
-        block_structure.request_xblock_fields('mode')
         block_structure.request_xblock_fields('max_count')
         block_structure.request_xblock_fields('category')
         store = modulestore()
@@ -83,7 +82,6 @@ def transform_block_filters(self, usage_info, block_structure):
             if library_children:
                 all_library_children.update(library_children)
                 selected = []
-                mode = block_structure.get_xblock_field(block_key, 'mode')
                 max_count = block_structure.get_xblock_field(block_key, 'max_count')
                 if max_count < 0:
                     max_count = len(library_children)
@@ -100,7 +98,7 @@ def transform_block_filters(self, usage_info, block_structure):
 
                 # Update selected
                 previous_count = len(selected)
-                block_keys = LibraryContentBlock.make_selection(selected, library_children, max_count, mode)
+                block_keys = LegacyLibraryContentBlock.make_selection(selected, library_children, max_count)
                 selected = block_keys['selected']
 
                 # Save back any changes
@@ -176,7 +174,7 @@ def publish_event(event_name, result, **kwargs):
             with tracker.get_tracker().context(full_event_name, context):
                 tracker.emit(full_event_name, event_data)
 
-        LibraryContentBlock.publish_selected_children_events(
+        LegacyLibraryContentBlock.publish_selected_children_events(
             block_keys,
             format_block_keys,
             publish_event,
diff --git a/lms/djangoapps/course_blocks/transformers/tests/test_library_content.py b/lms/djangoapps/course_blocks/transformers/tests/test_library_content.py
index 7fdb58f7f612..5a4d7a0de11a 100644
--- a/lms/djangoapps/course_blocks/transformers/tests/test_library_content.py
+++ b/lms/djangoapps/course_blocks/transformers/tests/test_library_content.py
@@ -8,6 +8,7 @@
 from openedx.core.djangoapps.content.block_structure.api import clear_course_from_cache
 from openedx.core.djangoapps.content.block_structure.transformers import BlockStructureTransformers
 
+import openedx.core.djangoapps.content.block_structure.api as bs_api
 from ...api import get_course_blocks
 from ..library_content import ContentLibraryOrderTransformer, ContentLibraryTransformer
 from .helpers import CourseStructureTestCase
@@ -41,6 +42,8 @@ def setUp(self):
         self.course_hierarchy = self.get_course_hierarchy()
         self.blocks = self.build_course(self.course_hierarchy)
         self.course = self.blocks['course']
+        # Do this manually because publish signals are not fired by default in tests.
+        bs_api.update_course_in_cache(self.course.id)
         clear_course_from_cache(self.course.id)
 
         # Enroll user in course.
@@ -122,6 +125,7 @@ def test_content_library(self):
         )
         assert len(list(raw_block_structure.get_block_keys())) == len(self.blocks)
 
+        bs_api.update_course_in_cache(self.course.id)
         clear_course_from_cache(self.course.id)
         trans_block_structure = get_course_blocks(
             self.user,
@@ -175,6 +179,7 @@ def setUp(self):
         self.course_hierarchy = self.get_course_hierarchy()
         self.blocks = self.build_course(self.course_hierarchy)
         self.course = self.blocks['course']
+        bs_api.update_course_in_cache(self.course.id)
         clear_course_from_cache(self.course.id)
 
         # Enroll user in course.
diff --git a/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py b/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py
index 0f8227e3201a..af48472886bb 100644
--- a/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py
+++ b/lms/djangoapps/course_goals/management/commands/goal_reminder_email.py
@@ -1,8 +1,11 @@
 """
 Command to trigger sending reminder emails for learners to achieve their Course Goals
 """
+import time
 from datetime import date, datetime, timedelta
+from eventtracking import tracker
 import logging
+import uuid
 
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -23,7 +26,7 @@
 from openedx.core.djangoapps.user_api.preferences.api import get_user_preference
 from openedx.core.lib.celery.task_utils import emulate_http_request
 from openedx.features.course_duration_limits.access import get_user_course_expiration_date
-from openedx.features.course_experience import ENABLE_COURSE_GOALS
+from openedx.features.course_experience import ENABLE_COURSE_GOALS, ENABLE_SES_FOR_GOALREMINDER
 from openedx.features.course_experience.url_helpers import get_learning_mfe_home_url
 
 log = logging.getLogger(__name__)
@@ -32,7 +35,7 @@
 SUNDAY_WEEKDAY = 6
 
 
-def send_ace_message(goal):
+def send_ace_message(goal, session_id):
     """
     Send an email reminding users to stay on track for their learning goal in this course
 
@@ -46,6 +49,15 @@ def send_ace_message(goal):
         course = CourseOverview.get_from_id(goal.course_key)
     except CourseOverview.DoesNotExist:
         log.error(f"Goal Reminder course {goal.course_key} not found.")
+        tracker.emit(
+            'edx.course.goal.email.failed',
+            {
+                'uuid': session_id,
+                'timestamp': datetime.now(),
+                'reason': 'course not found',
+                'course_key': goal.course_key,
+            }
+        )
         return False
 
     course_name = course.display_name
@@ -86,20 +98,44 @@ def send_ace_message(goal):
         'programs_url': getattr(settings, 'ACE_EMAIL_PROGRAMS_URL', None),
     })
 
+    options = {'transactional': True}
+
+    is_ses_enabled = ENABLE_SES_FOR_GOALREMINDER.is_enabled(goal.course_key)
+
+    if is_ses_enabled:
+        options = {
+            'transactional': True,
+            'from_address': settings.LMS_COMM_DEFAULT_FROM_EMAIL,
+            'override_default_channel': 'django_email',
+        }
+
     msg = Message(
         name="goalreminder",
         app_label="course_goals",
         recipient=Recipient(user.id, user.email),
         language=language,
         context=message_context,
-        options={'transactional': True},
+        options=options,
     )
 
     with emulate_http_request(site, user):
         try:
+            start_time = time.perf_counter()
             ace.send(msg)
+            end_time = time.perf_counter()
+            log.info(f"Goal Reminder for {user.id} for course {goal.course_key} sent in {end_time - start_time} "
+                     f"using {'SES' if is_ses_enabled else 'others'}")
         except Exception as exc:  # pylint: disable=broad-except
             log.error(f"Goal Reminder for {user.id} for course {goal.course_key} could not send: {exc}")
+            tracker.emit(
+                'edx.course.goal.email.failed',
+                {
+                    'uuid': session_id,
+                    'timestamp': datetime.now(),
+                    'reason': 'ace error',
+                    'error': str(exc),
+                }
+            )
             return False
     return True
 
@@ -121,8 +157,16 @@ def handle(self, *args, **options):
 
         try:
             self._handle_all_goals()
-        except BaseException:  # pylint: disable=broad-except
+        except BaseException as exc:  # pylint: disable=broad-except
             log.exception("Error while sending course goals emails: ")
+            tracker.emit(
+                'edx.course.goal.email.failed',
+                {
+                    'timestamp': datetime.now(),
+                    'reason': 'base exception',
+                    'error': str(exc),
+                }
+            )
             for h in log.handlers:
                 h.flush()
             raise
@@ -137,6 +181,7 @@ def _handle_all_goals(self):
         today = date.today()
         sunday_date = today + timedelta(days=SUNDAY_WEEKDAY - today.weekday())
         monday_date = today - timedelta(days=today.weekday())
+        session_id = str(uuid.uuid4())
 
         # Monday is the start of when we consider user's activity towards counting towards their weekly
         # goal. As such, we use Mondays to clear out the email reminders sent from the previous week.
@@ -163,21 +208,42 @@ def _handle_all_goals(self):
         filtered_count = 0
         course_goals = course_goals.exclude(course_key__in=courses_to_exclude).select_related('user').order_by('user')
         total_goals = len(course_goals)
-        log.info(f'Processing course goals, total goal count {total_goals}')
+        tracker.emit(
+            'edx.course.goal.email.session_started',
+            {
+                'uuid': session_id,
+                'timestamp': datetime.now(),
+                'goal_count': total_goals,
+            }
+        )
+        log.info(f'Processing course goals, total goal count {total_goals},'
+                 + f'timestamp: {datetime.now()}, uuid: {session_id}')
         for goal in course_goals:
             # emulate a request for waffle's benefit
             with emulate_http_request(site=Site.objects.get_current(), user=goal.user):
-                if self.handle_goal(goal, today, sunday_date, monday_date):
+                if self.handle_goal(goal, today, sunday_date, monday_date, session_id):
                     sent_count += 1
                 else:
                     filtered_count += 1
             if (sent_count + filtered_count) % 10000 == 0:
-                log.info(f'Processing course goals: sent {sent_count} filtered {filtered_count} out of {total_goals}')
-
-        log.info(f'Processing course goals complete: sent {sent_count} emails, filtered out {filtered_count} emails')
+                log.info(f'Processing course goals: sent {sent_count} filtered {filtered_count} out of {total_goals},'
+                         + f'timestamp: {datetime.now()}, uuid: {session_id}')
+
+        tracker.emit(
+            'edx.course.goal.email.session_completed',
+            {
+                'uuid': session_id,
+                'timestamp': datetime.now(),
+                'goal_count': total_goals,
+                'emails_sent': sent_count,
+                'emails_filtered': filtered_count,
+            }
+        )
+        log.info(f'Processing course goals complete: sent {sent_count} emails, filtered out {filtered_count} emails'
+                 + f'timestamp: {datetime.now()}, uuid: {session_id}')
 
     @staticmethod
-    def handle_goal(goal, today, sunday_date, monday_date):
+    def handle_goal(goal, today, sunday_date, monday_date, session_id):
         """Sends an email reminder for a single CourseGoal, if it passes all our checks"""
         if not ENABLE_COURSE_GOALS.is_enabled(goal.course_key):
             return False
@@ -212,10 +278,20 @@ def handle_goal(goal, today, sunday_date, monday_date):
         user_timezone = get_user_timezone_or_last_seen_timezone_or_utc(goal.user)
         now_in_users_timezone = datetime.now(user_timezone)
         if not 8 <= now_in_users_timezone.hour < 18:
+            tracker.emit(
+                'edx.course.goal.email.filtered',
+                {
+                    'uuid': session_id,
+                    'timestamp': datetime.now(),
+                    'reason': 'User time zone',
+                    'user_timezone': str(user_timezone),
+                    'now_in_users_timezone': now_in_users_timezone,
+                }
+            )
             return False
 
         if required_days_left == days_left_in_week:
-            sent = send_ace_message(goal)
+            sent = send_ace_message(goal, session_id)
             if sent:
                 CourseGoalReminderStatus.objects.update_or_create(goal=goal, defaults={'email_reminder_sent': True})
                 return True
diff --git a/lms/djangoapps/course_goals/management/commands/tests/test_goal_reminder_email.py b/lms/djangoapps/course_goals/management/commands/tests/test_goal_reminder_email.py
index ad60420e0d30..5b98b202d41f 100644
--- a/lms/djangoapps/course_goals/management/commands/tests/test_goal_reminder_email.py
+++ b/lms/djangoapps/course_goals/management/commands/tests/test_goal_reminder_email.py
@@ -5,6 +5,7 @@
 from unittest import mock  # lint-amnesty, pylint: disable=wrong-import-order
 
 import ddt
+from django.conf import settings
 from django.core.management import call_command
 from django.test import TestCase
 from edx_toggles.toggles.testutils import override_waffle_flag
@@ -20,7 +21,7 @@
 from lms.djangoapps.certificates.data import CertificateStatuses
 from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
 from openedx.core.djangolib.testing.utils import skip_unless_lms
-from openedx.features.course_experience import ENABLE_COURSE_GOALS
+from openedx.features.course_experience import ENABLE_COURSE_GOALS, ENABLE_SES_FOR_GOALREMINDER
 
 # Some constants just for clarity of tests (assuming week starts on a Monday, as March 2021 used below does)
 MONDAY = 0
@@ -180,3 +181,33 @@ def test_no_days_per_week(self):
     def test_old_course(self, end):
         self.make_valid_goal(overview__end=end)
         self.call_command(expect_sent=False)
+
+    @mock.patch('lms.djangoapps.course_goals.management.commands.goal_reminder_email.ace.send')
+    def test_params_with_ses(self, mock_ace):
+        """Test that the parameters of the msg passed to ace.send() are set correctly when SES is enabled"""
+        with override_waffle_flag(ENABLE_SES_FOR_GOALREMINDER, active=None):
+            goal = self.make_valid_goal()
+            flag = get_waffle_flag_model().get(ENABLE_SES_FOR_GOALREMINDER.name)
+            flag.users.add(goal.user)
+
+            with freeze_time('2021-03-02 10:00:00'):
+                call_command('goal_reminder_email')
+
+            assert mock_ace.call_count == 1
+            msg = mock_ace.call_args[0][0]
+            assert msg.options['override_default_channel'] == 'django_email'
+            assert msg.options['from_address'] == settings.LMS_COMM_DEFAULT_FROM_EMAIL
+
+    @mock.patch('lms.djangoapps.course_goals.management.commands.goal_reminder_email.ace.send')
+    def test_params_without_ses(self, mock_ace):
+        """Test that the parameters of the msg passed to ace.send() are set correctly when SES is not enabled"""
+        self.make_valid_goal()
+
+        with freeze_time('2021-03-02 10:00:00'):
+            call_command('goal_reminder_email')
+
+        assert mock_ace.call_count == 1
+        msg = mock_ace.call_args[0][0]
+        assert msg.options['transactional'] is True
+        assert 'override_default_channel' not in msg.options
+        assert 'from_address' not in msg.options
diff --git a/lms/djangoapps/course_goals/models.py b/lms/djangoapps/course_goals/models.py
index 73d69d6bd6ce..616966600040 100644
--- a/lms/djangoapps/course_goals/models.py
+++ b/lms/djangoapps/course_goals/models.py
@@ -79,6 +79,8 @@ class CourseGoalReminderStatus(TimeStampedModel):
     Tracks whether we've sent a reminder about a particular goal this week.
 
     See the management command goal_reminder_email for more detail about how this is used.
+
+    .. no_pii:
     """
     class Meta:
         verbose_name_plural = "Course goal reminder statuses"
diff --git a/lms/djangoapps/course_home_api/course_metadata/serializers.py b/lms/djangoapps/course_home_api/course_metadata/serializers.py
index 7683a9089453..769a00605247 100644
--- a/lms/djangoapps/course_home_api/course_metadata/serializers.py
+++ b/lms/djangoapps/course_home_api/course_metadata/serializers.py
@@ -43,6 +43,7 @@ class CourseHomeMetadataSerializer(VerifiedModeSerializer):
     """
     celebrations = serializers.DictField()
     course_access = serializers.DictField()
+    studio_access = serializers.BooleanField()
     course_id = serializers.CharField()
     is_enrolled = serializers.BooleanField()
     is_self_paced = serializers.BooleanField()
@@ -58,3 +59,4 @@ class CourseHomeMetadataSerializer(VerifiedModeSerializer):
     can_view_certificate = serializers.BooleanField()
     course_modes = CourseModeSerrializer(many=True)
     is_new_discussion_sidebar_view_enabled = serializers.BooleanField()
+    has_course_author_access = serializers.BooleanField()
diff --git a/lms/djangoapps/course_home_api/course_metadata/tests/test_views.py b/lms/djangoapps/course_home_api/course_metadata/tests/test_views.py
index 23052e5e7d90..43a3974f1126 100644
--- a/lms/djangoapps/course_home_api/course_metadata/tests/test_views.py
+++ b/lms/djangoapps/course_home_api/course_metadata/tests/test_views.py
@@ -11,7 +11,12 @@
 
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.student.roles import CourseInstructorRole
+from common.djangoapps.student.roles import (
+    CourseBetaTesterRole,
+    CourseInstructorRole,
+    CourseLimitedStaffRole,
+    CourseStaffRole
+)
 from common.djangoapps.student.tests.factories import UserFactory
 from lms.djangoapps.course_home_api.tests.utils import BaseCourseHomeTests
 from lms.djangoapps.courseware.toggles import (
@@ -247,3 +252,32 @@ def test_discussion_tab_visible(self, visible):
             assert 'discussion' in tab_ids
         else:
             assert 'discussion' not in tab_ids
+
+    @ddt.data(
+        {
+            'course_team_role': None,
+            'has_course_author_access': False
+        },
+        {
+            'course_team_role': CourseBetaTesterRole,
+            'has_course_author_access': False
+        },
+        {
+            'course_team_role': CourseStaffRole,
+            'has_course_author_access': True
+        },
+        {
+            'course_team_role': CourseLimitedStaffRole,
+            'has_course_author_access': False
+        },
+    )
+    @ddt.unpack
+    def test_has_course_author_access_for_staff_roles(self, course_team_role, has_course_author_access):
+        CourseEnrollment.enroll(self.user, self.course.id, CourseMode.VERIFIED)
+
+        if course_team_role:
+            course_team_role(self.course.id).add_users(self.user)
+
+        response = self.client.get(self.url)
+        assert response.status_code == 200
+        assert response.data['has_course_author_access'] == has_course_author_access
diff --git a/lms/djangoapps/course_home_api/course_metadata/views.py b/lms/djangoapps/course_home_api/course_metadata/views.py
index 248f90389d40..ae854b888775 100644
--- a/lms/djangoapps/course_home_api/course_metadata/views.py
+++ b/lms/djangoapps/course_home_api/course_metadata/views.py
@@ -16,11 +16,12 @@
 from openedx.core.djangoapps.courseware_api.utils import get_celebrations_dict
 
 from common.djangoapps.course_modes.models import CourseMode
+from common.djangoapps.student.auth import has_course_author_access
 from common.djangoapps.student.models import CourseEnrollment
 from lms.djangoapps.course_api.api import course_detail
 from lms.djangoapps.course_goals.models import UserActivity
 from lms.djangoapps.course_home_api.course_metadata.serializers import CourseHomeMetadataSerializer
-from lms.djangoapps.courseware.access import has_access
+from lms.djangoapps.courseware.access import has_access, has_cms_access
 from lms.djangoapps.courseware.context_processor import user_timezone_locale_prefs
 from lms.djangoapps.courseware.courses import check_course_access
 from lms.djangoapps.courseware.masquerade import setup_masquerade
@@ -124,6 +125,7 @@ def get(self, request, *args, **kwargs):
         data = {
             'course_id': course.id,
             'username': username,
+            'studio_access': has_cms_access(request.user, course_key),
             'is_staff': has_access(request.user, 'staff', course_key).has_access,
             'original_user_is_staff': original_user_is_staff,
             'number': course.display_number_with_default,
@@ -139,6 +141,12 @@ def get(self, request, *args, **kwargs):
             'can_view_certificate': certificates_viewable_for_course(course),
             'course_modes': course_modes,
             'is_new_discussion_sidebar_view_enabled': new_discussion_sidebar_view_is_enabled(course_key),
+            # We check the course author access in the context of CMS here because this field is used
+            # to determine whether the user can access the course authoring tools in the CMS.
+            # This is a temporary solution until the course author role is split into "Course Author" and
+            # "Course Editor" as described in the permission matrix here:
+            # https://github.com/openedx/platform-roadmap/issues/246
+            'has_course_author_access': has_course_author_access(request.user, course_key, 'cms'),
         }
         context = self.get_serializer_context()
         context['course'] = course
diff --git a/lms/djangoapps/course_home_api/models.py b/lms/djangoapps/course_home_api/models.py
index 62d1e0fda36d..94c79b8760c8 100644
--- a/lms/djangoapps/course_home_api/models.py
+++ b/lms/djangoapps/course_home_api/models.py
@@ -11,6 +11,8 @@
 class DisableProgressPageStackedConfig(StackedConfigurationModel):
     """
     Stacked Config Model for disabling the frontend-app-learning progress page
+
+    .. no_pii:
     """
 
     STACKABLE_FIELDS = ('disabled',)
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 74f1d74f837f..436cb3514a54 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -53,7 +53,8 @@
     GlobalStaff,
     OrgInstructorRole,
     OrgStaffRole,
-    SupportStaffRole
+    SupportStaffRole,
+    CourseLimitedStaffRole,
 )
 from common.djangoapps.util import milestones_helpers as milestones_helpers  # lint-amnesty, pylint: disable=useless-import-alias
 from common.djangoapps.util.milestones_helpers import (
@@ -97,6 +98,31 @@ def has_ccx_coach_role(user, course_key):
     return False
 
 
+def has_cms_access(user, course_key):
+    """
+    Check if user has access to the CMS. When requesting from the LMS, a user with the
+    limited staff access role needs access to the CMS APIs, but not the CMS site. This
+    function accounts for this edge case when determining if a user has access to the CMS
+    site.
+
+    Arguments:
+        user (User): the user whose course access we are checking.
+        course_key: Key to course.
+
+    Returns:
+        bool: whether user has access to the CMS site.
+    """
+    has_course_author_access = auth.has_course_author_access(user, course_key)
+    is_limited_staff = auth.user_has_role(
+        user, CourseLimitedStaffRole(course_key)
+    ) and not GlobalStaff().has_user(user)
+
+    if is_limited_staff and has_course_author_access:
+        return False
+
+    return has_course_author_access
+
+
 @function_trace('has_access')
 def has_access(user, action, obj, course_key=None):
     """
diff --git a/lms/djangoapps/courseware/block_render.py b/lms/djangoapps/courseware/block_render.py
index 1bae90322487..de92692ce4fc 100644
--- a/lms/djangoapps/courseware/block_render.py
+++ b/lms/djangoapps/courseware/block_render.py
@@ -45,7 +45,7 @@
 from openedx.core.lib.xblock_services.call_to_action import CallToActionService
 from xmodule.contentstore.django import contentstore
 from xmodule.exceptions import NotFoundError, ProcessingError
-from xmodule.library_tools import LibraryToolsService
+from xmodule.library_tools import LegacyLibraryToolsService
 from xmodule.modulestore.django import XBlockI18nService, modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.partitions.partitions_service import PartitionService
@@ -626,7 +626,7 @@ def inner_get_block(block: XBlock) -> XBlock | None:
         ),
         'completion': CompletionService(user=user, context_key=course_id) if user and user.is_authenticated else None,
         'i18n': XBlockI18nService,
-        'library_tools': LibraryToolsService(store, user_id=user.id if user else None),
+        'library_tools': LegacyLibraryToolsService(store, user_id=user.id if user else None),
         'partitions': PartitionService(course_id=course_id, cache=DEFAULT_REQUEST_CACHE.data),
         'settings': SettingsService(),
         'user_tags': UserTagsService(user=user, course_id=course_id),
diff --git a/lms/djangoapps/courseware/management/commands/import.py b/lms/djangoapps/courseware/management/commands/import.py
deleted file mode 100644
index 7ebb26795112..000000000000
--- a/lms/djangoapps/courseware/management/commands/import.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""
-Script for importing courseware from XML format
-"""
-
-
-from django.core.management.base import BaseCommand
-
-from openedx.core.djangoapps.django_comment_common.utils import are_permissions_roles_seeded, seed_permissions_roles
-from xmodule.contentstore.django import contentstore  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.xml_importer import import_course_from_xml  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.util.sandboxing import DEFAULT_PYTHON_LIB_FILENAME  # lint-amnesty, pylint: disable=wrong-import-order
-
-
-class Command(BaseCommand):
-    """
-    Import the specified data directory into the default ModuleStore
-    """
-    help = 'Import the specified data directory into the default ModuleStore.'
-
-    def add_arguments(self, parser):
-        parser.add_argument('data_directory')
-        parser.add_argument('course_dirs',
-                            nargs='*',
-                            metavar='course_dir')
-        parser.add_argument('--nostatic',
-                            action='store_true',
-                            help='Skip import of static content')
-        parser.add_argument('--nopythonlib',
-                            action='store_true',
-                            help=(
-                                'Skip import of course python library if it exists '
-                                '(NOTE: If the static content import is not skipped, the python library '
-                                'will be imported and this flag will be ignored)'
-                            ))
-        parser.add_argument('--python-lib-filename',
-                            default=DEFAULT_PYTHON_LIB_FILENAME,
-                            help='Filename of the course code library (if it exists)')
-
-    def handle(self, *args, **options):
-        data_dir = options['data_directory']
-        source_dirs = options['course_dirs']
-        if not source_dirs:
-            source_dirs = None
-        do_import_static = not options.get('nostatic', False)
-        # If the static content is not skipped, the python lib should be imported regardless
-        # of the 'nopythonlib' flag.
-        do_import_python_lib = do_import_static or not options.get('nopythonlib', False)
-        python_lib_filename = options.get('python_lib_filename')
-
-        output = (
-            "Importing...\n"
-            "    data_dir={data}, source_dirs={courses}\n"
-            "    Importing static content? {import_static}\n"
-            "    Importing python lib? {import_python_lib}"
-        ).format(
-            data=data_dir,
-            courses=source_dirs,
-            import_static=do_import_static,
-            import_python_lib=do_import_python_lib
-        )
-        self.stdout.write(output)
-        mstore = modulestore()
-
-        course_items = import_course_from_xml(
-            mstore, ModuleStoreEnum.UserID.mgmt_command, data_dir, source_dirs, load_error_blocks=False,
-            static_content_store=contentstore(), verbose=True,
-            do_import_static=do_import_static, do_import_python_lib=do_import_python_lib,
-            create_if_not_present=True,
-            python_lib_filename=python_lib_filename,
-        )
-
-        for course in course_items:
-            course_id = course.id
-            if not are_permissions_roles_seeded(course_id):
-                self.stdout.write(f'Seeding forum roles for course {course_id}\n')
-                seed_permissions_roles(course_id)
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index b5cd3839c351..eacf2424de6c 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -545,6 +545,8 @@ class Meta:
 class FinancialAssistanceConfiguration(ConfigurationModel):
     """
     Manages configuration for connecting to Financial Assistance backend service and using its API.
+
+    .. no_pii:
     """
 
     api_base_url = models.URLField(
diff --git a/lms/djangoapps/courseware/plugins.py b/lms/djangoapps/courseware/plugins.py
index 10fa99957d71..f16423c7695b 100644
--- a/lms/djangoapps/courseware/plugins.py
+++ b/lms/djangoapps/courseware/plugins.py
@@ -264,12 +264,12 @@ def legacy_link(course_key: CourseKey):
 
 class ORASettingsApp(CourseApp):
     """
-    Course App config for ORA app.
+    Course App config for Flexible Peer Grading ORA app.
     """
 
     app_id = "ora_settings"
-    name = _("Open Response Assessment Settings")
-    description = _("Course level settings for Open Response Assessment.")
+    name = _("Flexible Peer Grading for ORAs")
+    description = _("Course level settings for Flexible Peer Grading Open Response Assessments.")
     documentation_links = {
         "learn_more_configuration": settings.ORA_SETTINGS_HELP_URL,
     }
@@ -287,14 +287,15 @@ def is_enabled(cls, course_key: CourseKey) -> bool:
         """
         Get open response enabled status from course overview model.
         """
-        return True
+        course = get_course_by_id(course_key)
+        return course.force_on_flexible_peer_openassessments
 
     @classmethod
     def set_enabled(cls, course_key: CourseKey, enabled: bool, user: 'User') -> bool:
         """
         Update open response enabled status in modulestore. Always enable to avoid confusion that user can disable ora.
         """
-        return True
+        raise ValueError("Flexible Peer Grading cannot be enabled/disabled via this API.")
 
     @classmethod
     def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = None) -> Dict[str, bool]:
diff --git a/lms/djangoapps/courseware/tests/test_about.py b/lms/djangoapps/courseware/tests/test_about.py
index d53d620d3e34..bd0c1854ab76 100644
--- a/lms/djangoapps/courseware/tests/test_about.py
+++ b/lms/djangoapps/courseware/tests/test_about.py
@@ -156,7 +156,10 @@ def test_pre_requisite_course(self):
         assert resp.status_code == 200
         pre_requisite_courses = get_prerequisite_courses_display(course)
         pre_requisite_course_about_url = reverse('about_course', args=[str(pre_requisite_courses[0]['key'])])
-        assert '<span class="important-dates-item-text pre-requisite"><a href="{}">{}</a></span>'.format(pre_requisite_course_about_url, pre_requisite_courses[0]['display']) in resp.content.decode(resp.charset).strip('\n')  # pylint: disable=line-too-long
+        assert (
+            f'You must successfully complete <a href="{pre_requisite_course_about_url}">'
+            f'{pre_requisite_courses[0]["display"]}</a> before you begin this course.'
+        ) in resp.content.decode(resp.charset).strip('\n')
 
     @patch.dict(settings.FEATURES, {'ENABLE_PREREQUISITE_COURSES': True})
     def test_about_page_unfulfilled_prereqs(self):
@@ -190,7 +193,10 @@ def test_about_page_unfulfilled_prereqs(self):
         assert resp.status_code == 200
         pre_requisite_courses = get_prerequisite_courses_display(course)
         pre_requisite_course_about_url = reverse('about_course', args=[str(pre_requisite_courses[0]['key'])])
-        assert '<span class="important-dates-item-text pre-requisite"><a href="{}">{}</a></span>'.format(pre_requisite_course_about_url, pre_requisite_courses[0]['display']) in resp.content.decode(resp.charset).strip('\n')  # pylint: disable=line-too-long
+        assert (
+            f'You must successfully complete <a href="{pre_requisite_course_about_url}">'
+            f'{pre_requisite_courses[0]["display"]}</a> before you begin this course.'
+        ) in resp.content.decode(resp.charset).strip('\n')
 
         url = reverse('about_course', args=[str(pre_requisite_course.id)])
         resp = self.client.get(url)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index cde0e8a34ec2..cdc59e48c0e6 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -132,38 +132,6 @@ class TestJumpTo(ModuleStoreTestCase):
     """
     Check the jumpto link for a course.
     """
-    @ddt.data(
-        (True, False),  # preview -> Legacy experience
-        (False, True),  # no preview -> MFE experience
-    )
-    @ddt.unpack
-    def test_jump_to_legacy_vs_mfe(self, preview_mode, expect_mfe):
-        """
-        Test that jump_to and jump_to_id correctly choose which courseware frontend to redirect to.
-
-        Can be removed when the MFE supports a preview mode.
-        """
-        course = CourseFactory.create()
-        chapter = BlockFactory.create(category='chapter', parent_location=course.location)
-        if expect_mfe:
-            expected_url = f'http://learning-mfe/course/{course.id}/{chapter.location}'
-        else:
-            expected_url = f'/courses/{course.id}/courseware/{chapter.url_name}/'
-
-        jumpto_url = f'/courses/{course.id}/jump_to/{chapter.location}'
-        with set_preview_mode(preview_mode):
-            response = self.client.get(jumpto_url)
-        assert response.status_code == 302
-        # Check the response URL, but chop off the querystring; we don't care here.
-        assert response.url.split('?')[0] == expected_url
-
-        jumpto_id_url = f'/courses/{course.id}/jump_to_id/{chapter.url_name}'
-        with set_preview_mode(preview_mode):
-            response = self.client.get(jumpto_id_url)
-        assert response.status_code == 302
-        # Check the response URL, but chop off the querystring; we don't care here.
-        assert response.url.split('?')[0] == expected_url
-
     @ddt.data(
         (False, ModuleStoreEnum.Type.split),
         (True, ModuleStoreEnum.Type.split),
@@ -174,32 +142,34 @@ def test_jump_to_invalid_location(self, preview_mode, store_type):
         with self.store.default_store(store_type):
             course = CourseFactory.create()
             location = course.id.make_usage_key(None, 'NoSuchPlace')
-        expected_redirect_url = (
-            f'/courses/{course.id}/courseware?' + urlencode({'activate_block_id': str(course.location)})
+
+        expected_redirect_url = f'http://learning-mfe/course/{course.id}'
+        jumpto_url = (
+            f'/courses/{course.id}/jump_to/{location}?preview=1'
         ) if preview_mode else (
-            f'http://learning-mfe/course/{course.id}'
+            f'/courses/{course.id}/jump_to/{location}'
         )
+
         # This is fragile, but unfortunately the problem is that within the LMS we
         # can't use the reverse calls from the CMS
-        jumpto_url = f'/courses/{course.id}/jump_to/{location}'
-        with set_preview_mode(preview_mode):
+        with set_preview_mode(False):
             response = self.client.get(jumpto_url)
         assert response.status_code == 302
         assert response.url == expected_redirect_url
 
-    @set_preview_mode(True)
-    def test_jump_to_legacy_from_sequence(self):
+    @set_preview_mode(False)
+    def test_jump_to_preview_from_sequence(self):
         with self.store.default_store(ModuleStoreEnum.Type.split):
             course = CourseFactory.create()
             chapter = BlockFactory.create(category='chapter', parent_location=course.location)
             sequence = BlockFactory.create(category='sequential', parent_location=chapter.location)
-        activate_block_id = urlencode({'activate_block_id': str(sequence.location)})
+        jumpto_url = f'/courses/{course.id}/jump_to/{sequence.location}?preview=1'
         expected_redirect_url = (
-            f'/courses/{course.id}/courseware/{chapter.url_name}/{sequence.url_name}/?{activate_block_id}'
+            f'http://learning-mfe/preview/course/{course.id}/{sequence.location}'
         )
-        jumpto_url = f'/courses/{course.id}/jump_to/{sequence.location}'
         response = self.client.get(jumpto_url)
-        self.assertRedirects(response, expected_redirect_url, status_code=302, target_status_code=302)
+        assert response.status_code == 302
+        assert response.url == expected_redirect_url
 
     @set_preview_mode(False)
     def test_jump_to_mfe_from_sequence(self):
@@ -214,8 +184,8 @@ def test_jump_to_mfe_from_sequence(self):
         assert response.status_code == 302
         assert response.url == expected_redirect_url
 
-    @set_preview_mode(True)
-    def test_jump_to_legacy_from_block(self):
+    @set_preview_mode(False)
+    def test_jump_to_preview_from_block(self):
         with self.store.default_store(ModuleStoreEnum.Type.split):
             course = CourseFactory.create()
             chapter = BlockFactory.create(category='chapter', parent_location=course.location)
@@ -225,21 +195,21 @@ def test_jump_to_legacy_from_block(self):
             block1 = BlockFactory.create(category='html', parent_location=vertical1.location)
             block2 = BlockFactory.create(category='html', parent_location=vertical2.location)
 
-        activate_block_id = urlencode({'activate_block_id': str(block1.location)})
+        jumpto_url = f'/courses/{course.id}/jump_to/{block1.location}?preview=1'
         expected_redirect_url = (
-            f'/courses/{course.id}/courseware/{chapter.url_name}/{sequence.url_name}/1?{activate_block_id}'
+            f'http://learning-mfe/preview/course/{course.id}/{sequence.location}/{vertical1.location}'
         )
-        jumpto_url = f'/courses/{course.id}/jump_to/{block1.location}'
         response = self.client.get(jumpto_url)
-        self.assertRedirects(response, expected_redirect_url, status_code=302, target_status_code=302)
+        assert response.status_code == 302
+        assert response.url == expected_redirect_url
 
-        activate_block_id = urlencode({'activate_block_id': str(block2.location)})
+        jumpto_url = f'/courses/{course.id}/jump_to/{block2.location}?preview=1'
         expected_redirect_url = (
-            f'/courses/{course.id}/courseware/{chapter.url_name}/{sequence.url_name}/2?{activate_block_id}'
+            f'http://learning-mfe/preview/course/{course.id}/{sequence.location}/{vertical2.location}'
         )
-        jumpto_url = f'/courses/{course.id}/jump_to/{block2.location}'
         response = self.client.get(jumpto_url)
-        self.assertRedirects(response, expected_redirect_url, status_code=302, target_status_code=302)
+        assert response.status_code == 302
+        assert response.url == expected_redirect_url
 
     @set_preview_mode(False)
     def test_jump_to_mfe_from_block(self):
@@ -300,8 +270,12 @@ def test_jump_to_legacy_from_nested_block(self):
     def test_jump_to_id_invalid_location(self, preview_mode, store_type):
         with self.store.default_store(store_type):
             course = CourseFactory.create()
-        jumpto_url = f'/courses/{course.id}/jump_to/NoSuchPlace'
-        with set_preview_mode(preview_mode):
+        jumpto_url = (
+            f'/courses/{course.id}/jump_to/NoSuchPlace?preview=1'
+        ) if preview_mode else (
+            f'/courses/{course.id}/jump_to/NoSuchPlace'
+        )
+        with set_preview_mode(False):
             response = self.client.get(jumpto_url)
         assert response.status_code == 404
 
@@ -1498,8 +1472,8 @@ def test_view_certificate_link(self):
             self.assertContains(resp, "earned a certificate for this course.")
 
     @ddt.data(
-        (True, 53),
-        (False, 53),
+        (True, 54),
+        (False, 54),
     )
     @ddt.unpack
     def test_progress_queries_paced_courses(self, self_paced, query_count):
@@ -1514,13 +1488,13 @@ def test_progress_queries(self):
         ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1))
         self.setup_course()
         with self.assertNumQueries(
-            53, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
+            54, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
         ), check_mongo_calls(2):
             self._get_progress_page()
 
         for _ in range(2):
             with self.assertNumQueries(
-                38, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
+                39, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
             ), check_mongo_calls(2):
                 self._get_progress_page()
 
@@ -3359,7 +3333,7 @@ def test_learner_redirect(self):
     def test_preview_no_redirect(self):
         __, __, preview_url = self._get_urls()
         with set_preview_mode(True):
-            # Previews will not redirect to the mfe
+            # Previews server from PREVIEW_LMS_BASE 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_PASSWORD)
@@ -3803,7 +3777,7 @@ def test_courseware_mfe_search_staff_access(self):
     @override_waffle_flag(COURSEWARE_MICROFRONTEND_SEARCH_ENABLED, active=False)
     def test_is_mfe_search_waffle_disabled(self):
         """
-        Courseware search is only available when the waffle flag is enabled.
+        Courseware search is only available when the waffle flag is enabled, if no inclusion date is provided.
         """
         user_admin = UserFactory(is_staff=True, is_superuser=True)
         CourseEnrollmentFactory.create(user=user_admin, course_id=self.course.id, mode=CourseMode.VERIFIED)
@@ -3814,6 +3788,27 @@ def test_is_mfe_search_waffle_disabled(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(body, {'enabled': False})
 
+    @patch.dict('django.conf.settings.FEATURES', {'COURSEWARE_SEARCH_INCLUSION_DATE': '2020'})
+    @override_waffle_flag(COURSEWARE_MICROFRONTEND_SEARCH_ENABLED, active=False)
+    @ddt.data(
+        (datetime(2013, 9, 18, 11, 30, 00), False),
+        (None, False),
+        (datetime(2024, 9, 18, 11, 30, 00), True),
+    )
+    @ddt.unpack
+    def test_inclusion_date_greater_than_course_start(self, start_date, expected_enabled):
+        course_with_start = CourseFactory.create(start=start_date)
+        api_url = reverse('courseware_search_enabled_view', kwargs={'course_id': str(course_with_start.id)})
+
+        user_staff = UserFactory(is_staff=True)
+
+        self.client.login(username=user_staff.username, password=TEST_PASSWORD)
+        response = self.client.get(api_url, content_type='application/json')
+        body = json.loads(response.content.decode('utf-8'))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(body, {'enabled': expected_enabled})
+
 
 class TestCoursewareMFENavigationSidebarTogglesAPI(SharedModuleStoreTestCase):
     """
diff --git a/lms/djangoapps/courseware/toggles.py b/lms/djangoapps/courseware/toggles.py
index 43fb40436a5e..e6070a2e3bd1 100644
--- a/lms/djangoapps/courseware/toggles.py
+++ b/lms/djangoapps/courseware/toggles.py
@@ -148,7 +148,6 @@
 # .. toggle_creation_date: 2019-05-16
 # .. toggle_expiration_date: None
 # .. toggle_tickets: https://github.com/mitodl/edx-platform/issues/123
-# .. toggle_status: unsupported
 COURSES_INVITE_ONLY = SettingToggle('COURSES_INVITE_ONLY', default=False)
 
 
diff --git a/lms/djangoapps/courseware/views/index.py b/lms/djangoapps/courseware/views/index.py
index c123c7f71f4c..7a9242f595ef 100644
--- a/lms/djangoapps/courseware/views/index.py
+++ b/lms/djangoapps/courseware/views/index.py
@@ -27,6 +27,7 @@
 from xmodule.course_block import COURSE_VISIBILITY_PUBLIC
 from xmodule.modulestore.django import modulestore
 from xmodule.x_module import PUBLIC_VIEW, STUDENT_VIEW
+from xmodule.util.xmodule_django import get_current_request_hostname
 
 from common.djangoapps.edxmako.shortcuts import render_to_response, render_to_string
 from common.djangoapps.student.models import CourseEnrollment
@@ -188,11 +189,13 @@ def microfrontend_url(self):
                 unit_key = None
         except InvalidKeyError:
             unit_key = None
+        is_preview = settings.FEATURES.get('PREVIEW_LMS_BASE') == get_current_request_hostname()
         url = make_learning_mfe_courseware_url(
             self.course_key,
             self.section.location if self.section else None,
             unit_key,
             params=self.request.GET,
+            preview=is_preview,
         )
         return url
 
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index 95af0cf75f06..6e0804db8ca0 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -33,6 +33,8 @@
 from django.views.generic import View
 from edx_django_utils.monitoring import set_custom_attribute, set_custom_attributes_for_course_key
 from ipware.ip import get_client_ip
+from xblock.core import XBlock
+
 from lms.djangoapps.static_template_view.views import render_500
 from markupsafe import escape
 from opaque_keys import InvalidKeyError
@@ -46,7 +48,12 @@
 from rest_framework.throttling import UserRateThrottle
 from token_utils.api import unpack_token_for
 from web_fragments.fragment import Fragment
-from xmodule.course_block import COURSE_VISIBILITY_PUBLIC, COURSE_VISIBILITY_PUBLIC_OUTLINE
+from xmodule.course_block import (
+    COURSE_VISIBILITY_PUBLIC,
+    COURSE_VISIBILITY_PUBLIC_OUTLINE,
+    CATALOG_VISIBILITY_CATALOG_AND_ABOUT,
+)
+from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
 from xmodule.tabs import CourseTabList
@@ -288,7 +295,10 @@ def courses(request):
     course_discovery_meanings = getattr(settings, 'COURSE_DISCOVERY_MEANINGS', {})
     set_default_filter = ENABLE_COURSE_DISCOVERY_DEFAULT_LANGUAGE_FILTER.is_enabled()
     if not settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'):
-        courses_list = get_courses(request.user)
+        courses_list = get_courses(
+            request.user,
+            filter_={"catalog_visibility": CATALOG_VISIBILITY_CATALOG_AND_ABOUT},
+        )
 
         if configuration_helpers.get_value("ENABLE_COURSE_SORTING_BY_START_DATE",
                                            settings.FEATURES["ENABLE_COURSE_SORTING_BY_START_DATE"]):
@@ -432,10 +442,12 @@ def jump_to(request, course_id, location):
     except InvalidKeyError as exc:
         raise Http404("Invalid course_key or usage_key") from exc
 
+    staff_access = has_access(request.user, 'staff', course_key)
     try:
         redirect_url = get_courseware_url(
             usage_key=usage_key,
             request=request,
+            is_staff=staff_access,
         )
     except (ItemNotFoundError, NoPathToItem):
         # We used to 404 here, but that's ultimately a bad experience. There are real world use cases where a user
@@ -445,6 +457,7 @@ def jump_to(request, course_id, location):
         redirect_url = get_courseware_url(
             usage_key=course_location_from_key(course_key),
             request=request,
+            is_staff=staff_access,
         )
 
     return redirect(redirect_url)
@@ -825,9 +838,13 @@ def course_about(request, course_id):  # pylint: disable=too-many-statements
                 single_paid_mode = modes.get(CourseMode.PROFESSIONAL)
 
             if single_paid_mode and single_paid_mode.sku:
-                ecommerce_checkout_link = ecomm_service.get_checkout_page_url(single_paid_mode.sku)
+                ecommerce_checkout_link = ecomm_service.get_checkout_page_url(
+                    single_paid_mode.sku, course_run_keys=[course_id]
+                )
             if single_paid_mode and single_paid_mode.bulk_sku:
-                ecommerce_bulk_checkout_link = ecomm_service.get_checkout_page_url(single_paid_mode.bulk_sku)
+                ecommerce_bulk_checkout_link = ecomm_service.get_checkout_page_url(
+                    single_paid_mode.bulk_sku, course_run_keys=[course_id]
+                )
 
         registration_price, course_price = get_course_prices(course)  # lint-amnesty, pylint: disable=unused-variable
 
@@ -1547,6 +1564,10 @@ def render_xblock(request, usage_key_string, check_if_enrolled=True, disable_sta
     set_custom_attributes_for_course_key(course_key)
     set_custom_attribute('usage_key', usage_key_string)
     set_custom_attribute('block_type', usage_key.block_type)
+    block_class = XBlock.load_class(usage_key.block_type)
+    if hasattr(block_class, 'is_extracted'):
+        is_extracted = block_class.is_extracted
+        set_custom_attribute('block_extracted', is_extracted)
 
     requested_view = request.GET.get('view', 'student_view')
     if requested_view != 'student_view' and requested_view != 'public_view':  # lint-amnesty, pylint: disable=consider-using-in
@@ -1554,142 +1575,151 @@ def render_xblock(request, usage_key_string, check_if_enrolled=True, disable_sta
             f"Rendering of the xblock view '{nh3.clean(requested_view)}' is not supported."
         )
 
-    staff_access = has_access(request.user, 'staff', course_key)
+    staff_access = bool(has_access(request.user, 'staff', course_key))
+    is_preview = request.GET.get('preview', '0') == '1'
 
-    with modulestore().bulk_operations(course_key):
-        # verify the user has access to the course, including enrollment check
-        try:
-            course = get_course_with_access(request.user, 'load', course_key, check_if_enrolled=check_if_enrolled)
-        except CourseAccessRedirect:
-            raise Http404("Course not found.")  # lint-amnesty, pylint: disable=raise-missing-from
-
-        # with course access now verified:
-        # assume masquerading role, if applicable.
-        # (if we did this *before* the course access check, then course staff
-        #  masquerading as learners would often be denied access, since course
-        #  staff are generally not enrolled, and viewing a course generally
-        #  requires enrollment.)
-        _course_masquerade, request.user = setup_masquerade(
-            request,
-            course_key,
-            staff_access,
-        )
+    store = modulestore()
+    branch_type = (
+        ModuleStoreEnum.Branch.draft_preferred
+    ) if is_preview and staff_access else (
+        ModuleStoreEnum.Branch.published_only
+    )
 
-        # Record user activity for tracking progress towards a user's course goals (for mobile app)
-        UserActivity.record_user_activity(
-            request.user, usage_key.course_key, request=request, only_if_mobile_app=True
-        )
+    with store.bulk_operations(course_key):
+        with store.branch_setting(branch_type, course_key):
+            # verify the user has access to the course, including enrollment check
+            try:
+                course = get_course_with_access(request.user, 'load', course_key, check_if_enrolled=check_if_enrolled)
+            except CourseAccessRedirect:
+                raise Http404("Course not found.")  # lint-amnesty, pylint: disable=raise-missing-from
+
+            # with course access now verified:
+            # assume masquerading role, if applicable.
+            # (if we did this *before* the course access check, then course staff
+            #  masquerading as learners would often be denied access, since course
+            #  staff are generally not enrolled, and viewing a course generally
+            #  requires enrollment.)
+            _course_masquerade, request.user = setup_masquerade(
+                request,
+                course_key,
+                staff_access,
+            )
 
-        # get the block, which verifies whether the user has access to the block.
-        recheck_access = request.GET.get('recheck_access') == '1'
-        block, _ = get_block_by_usage_id(
-            request,
-            str(course_key),
-            str(usage_key),
-            disable_staff_debug_info=disable_staff_debug_info,
-            course=course,
-            will_recheck_access=recheck_access,
-        )
+            # Record user activity for tracking progress towards a user's course goals (for mobile app)
+            UserActivity.record_user_activity(
+                request.user, usage_key.course_key, request=request, only_if_mobile_app=True
+            )
 
-        student_view_context = request.GET.dict()
-        student_view_context['show_bookmark_button'] = request.GET.get('show_bookmark_button', '0') == '1'
-        student_view_context['show_title'] = request.GET.get('show_title', '1') == '1'
-
-        is_learning_mfe = is_request_from_learning_mfe(request)
-        # Right now, we only care about this in regards to the Learning MFE because it results
-        # in a bad UX if we display blocks with access errors (repeated upgrade messaging).
-        # If other use cases appear, consider removing the is_learning_mfe check or switching this
-        # to be its own query parameter that can toggle the behavior.
-        student_view_context['hide_access_error_blocks'] = is_learning_mfe and recheck_access
-        is_mobile_app = is_request_from_mobile_app(request)
-        student_view_context['is_mobile_app'] = is_mobile_app
-
-        enable_completion_on_view_service = False
-        completion_service = block.runtime.service(block, 'completion')
-        if completion_service and completion_service.completion_tracking_enabled():
-            if completion_service.blocks_to_mark_complete_on_view({block}):
-                enable_completion_on_view_service = True
-                student_view_context['wrap_xblock_data'] = {
-                    'mark-completed-on-view-after-delay': completion_service.get_complete_on_view_delay_ms()
-                }
+            # get the block, which verifies whether the user has access to the block.
+            recheck_access = request.GET.get('recheck_access') == '1'
+            block, _ = get_block_by_usage_id(
+                request,
+                str(course_key),
+                str(usage_key),
+                disable_staff_debug_info=disable_staff_debug_info,
+                course=course,
+                will_recheck_access=recheck_access,
+            )
 
-        missed_deadlines, missed_gated_content = dates_banner_should_display(course_key, request.user)
-
-        # Some content gating happens only at the Sequence level (e.g. "has this
-        # timed exam started?").
-        ancestor_sequence_block = enclosing_sequence_for_gating_checks(block)
-        if ancestor_sequence_block:
-            context = {'specific_masquerade': is_masquerading_as_specific_student(request.user, course_key)}
-            # If the SequenceModule feels that gating is necessary, redirect
-            # there so we can have some kind of error message at any rate.
-            if ancestor_sequence_block.descendants_are_gated(context):
-                return redirect(
-                    reverse(
-                        'render_xblock',
-                        kwargs={'usage_key_string': str(ancestor_sequence_block.location)}
+            student_view_context = request.GET.dict()
+            student_view_context['show_bookmark_button'] = request.GET.get('show_bookmark_button', '0') == '1'
+            student_view_context['show_title'] = request.GET.get('show_title', '1') == '1'
+
+            is_learning_mfe = is_request_from_learning_mfe(request)
+            # Right now, we only care about this in regards to the Learning MFE because it results
+            # in a bad UX if we display blocks with access errors (repeated upgrade messaging).
+            # If other use cases appear, consider removing the is_learning_mfe check or switching this
+            # to be its own query parameter that can toggle the behavior.
+            student_view_context['hide_access_error_blocks'] = is_learning_mfe and recheck_access
+            is_mobile_app = is_request_from_mobile_app(request)
+            student_view_context['is_mobile_app'] = is_mobile_app
+
+            enable_completion_on_view_service = False
+            completion_service = block.runtime.service(block, 'completion')
+            if completion_service and completion_service.completion_tracking_enabled():
+                if completion_service.blocks_to_mark_complete_on_view({block}):
+                    enable_completion_on_view_service = True
+                    student_view_context['wrap_xblock_data'] = {
+                        'mark-completed-on-view-after-delay': completion_service.get_complete_on_view_delay_ms()
+                    }
+
+            missed_deadlines, missed_gated_content = dates_banner_should_display(course_key, request.user)
+
+            # Some content gating happens only at the Sequence level (e.g. "has this
+            # timed exam started?").
+            ancestor_sequence_block = enclosing_sequence_for_gating_checks(block)
+            if ancestor_sequence_block:
+                context = {'specific_masquerade': is_masquerading_as_specific_student(request.user, course_key)}
+                # If the SequenceModule feels that gating is necessary, redirect
+                # there so we can have some kind of error message at any rate.
+                if ancestor_sequence_block.descendants_are_gated(context):
+                    return redirect(
+                        reverse(
+                            'render_xblock',
+                            kwargs={'usage_key_string': str(ancestor_sequence_block.location)}
+                        )
                     )
-                )
 
-        # For courses using an LTI provider managed by edx-exams:
-        # Access to exam content is determined by edx-exams and passed to the LMS using a
-        # JWT url param. There is no longer a need for exam gating or logic inside the
-        # sequence block or its render call. descendants_are_gated shoule not return true
-        # for these timed exams. Instead, sequences are assumed gated by default and we look for
-        # an access token on the request to allow rendering to continue.
-        if course.proctoring_provider == 'lti_external':
-            seq_block = ancestor_sequence_block if ancestor_sequence_block else block
-            if getattr(seq_block, 'is_time_limited', None):
-                if not _check_sequence_exam_access(request, seq_block.location):
-                    return HttpResponseForbidden("Access to exam content is restricted")
+            # For courses using an LTI provider managed by edx-exams:
+            # Access to exam content is determined by edx-exams and passed to the LMS using a
+            # JWT url param. There is no longer a need for exam gating or logic inside the
+            # sequence block or its render call. descendants_are_gated shoule not return true
+            # for these timed exams. Instead, sequences are assumed gated by default and we look for
+            # an access token on the request to allow rendering to continue.
+            if course.proctoring_provider == 'lti_external':
+                seq_block = ancestor_sequence_block if ancestor_sequence_block else block
+                if getattr(seq_block, 'is_time_limited', None):
+                    if not _check_sequence_exam_access(request, seq_block.location):
+                        return HttpResponseForbidden("Access to exam content is restricted")
+
+            context = {
+                'course': course,
+                'block': block,
+                'disable_accordion': True,
+                'allow_iframing': True,
+                'disable_header': True,
+                'disable_footer': True,
+                'disable_window_wrap': True,
+                'enable_completion_on_view_service': enable_completion_on_view_service,
+                'edx_notes_enabled': is_feature_enabled(course, request.user),
+                'staff_access': staff_access,
+                'xqa_server': settings.FEATURES.get('XQA_SERVER', 'http://your_xqa_server.com'),
+                'missed_deadlines': missed_deadlines,
+                'missed_gated_content': missed_gated_content,
+                'has_ended': course.has_ended(),
+                'web_app_course_url': get_learning_mfe_home_url(course_key=course.id, url_fragment='home'),
+                'on_courseware_page': True,
+                'verified_upgrade_link': verified_upgrade_deadline_link(request.user, course=course),
+                'is_learning_mfe': is_learning_mfe,
+                'is_mobile_app': is_mobile_app,
+                'render_course_wide_assets': True,
+            }
 
-        context = {
-            'course': course,
-            'block': block,
-            'disable_accordion': True,
-            'allow_iframing': True,
-            'disable_header': True,
-            'disable_footer': True,
-            'disable_window_wrap': True,
-            'enable_completion_on_view_service': enable_completion_on_view_service,
-            'edx_notes_enabled': is_feature_enabled(course, request.user),
-            'staff_access': staff_access,
-            'xqa_server': settings.FEATURES.get('XQA_SERVER', 'http://your_xqa_server.com'),
-            'missed_deadlines': missed_deadlines,
-            'missed_gated_content': missed_gated_content,
-            'has_ended': course.has_ended(),
-            'web_app_course_url': get_learning_mfe_home_url(course_key=course.id, url_fragment='home'),
-            'on_courseware_page': True,
-            'verified_upgrade_link': verified_upgrade_deadline_link(request.user, course=course),
-            'is_learning_mfe': is_learning_mfe,
-            'is_mobile_app': is_mobile_app,
-            'render_course_wide_assets': True,
-        }
+            try:
+                # .. filter_implemented_name: RenderXBlockStarted
+                # .. filter_type: org.openedx.learning.xblock.render.started.v1
+                context, student_view_context = RenderXBlockStarted.run_filter(
+                    context=context, student_view_context=student_view_context
+                )
+            except RenderXBlockStarted.PreventXBlockBlockRender as exc:
+                log.info("Halted rendering block %s. Reason: %s", usage_key_string, exc.message)
+                return render_500(request)
+            except RenderXBlockStarted.RenderCustomResponse as exc:
+                log.info("Rendering custom exception for block %s. Reason: %s", usage_key_string, exc.message)
+                context.update({
+                    'fragment': Fragment(exc.response)
+                })
+                return render_to_response('courseware/courseware-chromeless.html', context, request=request)
+
+            fragment = block.render(requested_view, context=student_view_context)
+            optimization_flags = get_optimization_flags_for_content(block, fragment)
 
-        try:
-            # .. filter_implemented_name: RenderXBlockStarted
-            # .. filter_type: org.openedx.learning.xblock.render.started.v1
-            context, student_view_context = RenderXBlockStarted.run_filter(
-                context=context, student_view_context=student_view_context
-            )
-        except RenderXBlockStarted.PreventXBlockBlockRender as exc:
-            log.info("Halted rendering block %s. Reason: %s", usage_key_string, exc.message)
-            return render_500(request)
-        except RenderXBlockStarted.RenderCustomResponse as exc:
-            log.info("Rendering custom exception for block %s. Reason: %s", usage_key_string, exc.message)
             context.update({
-                'fragment': Fragment(exc.response)
+                'fragment': fragment,
+                **optimization_flags,
             })
-            return render_to_response('courseware/courseware-chromeless.html', context, request=request)
-
-        fragment = block.render(requested_view, context=student_view_context)
-        optimization_flags = get_optimization_flags_for_content(block, fragment)
-
-        context.update({
-            'fragment': fragment,
-            **optimization_flags,
-        })
 
-        return render_to_response('courseware/courseware-chromeless.html', context, request=request)
+            return render_to_response('courseware/courseware-chromeless.html', context, request=request)
 
 
 def get_optimization_flags_for_content(block, fragment):
@@ -2292,21 +2322,35 @@ def courseware_mfe_search_enabled(request, course_id=None):
     Simple GET endpoint to expose whether the user may use Courseware Search
     for a given course.
     """
-    enabled = False
     course_key = CourseKey.from_string(course_id) if course_id else None
     user = request.user
 
+    has_required_enrollment = False
     if settings.FEATURES.get('ENABLE_COURSEWARE_SEARCH_VERIFIED_ENROLLMENT_REQUIRED'):
         enrollment_mode, _ = CourseEnrollment.enrollment_mode_for_user(user, course_key)
         if (
             auth.user_has_role(user, CourseStaffRole(CourseKey.from_string(course_id)))
             or (enrollment_mode in CourseMode.VERIFIED_MODES)
         ):
-            enabled = True
+            has_required_enrollment = True
     else:
-        enabled = True
+        has_required_enrollment = True
+
+    inclusion_date = settings.FEATURES.get('COURSEWARE_SEARCH_INCLUSION_DATE')
+    start_date = CourseOverview.get_from_id(course_key).start
+    has_valid_inclusion_date = False
+
+    # only include courses that have a start date later than the setting-defined inclusion date, if setting exists
+    if inclusion_date:
+        has_valid_inclusion_date = start_date and start_date.strftime('%Y-%m-%d') > inclusion_date
+
+    # if the user has the appropriate enrollment, the feature is enabled if the course has a valid start date
+    # or if the feature is explicitly enabled via waffle flag.
+    enabled = (has_valid_inclusion_date or courseware_mfe_search_is_enabled(course_key)) \
+        if has_required_enrollment \
+        else False
 
-    payload = {"enabled": courseware_mfe_search_is_enabled(course_key) if enabled else False}
+    payload = {"enabled": enabled}
     return JsonResponse(payload)
 
 
diff --git a/lms/djangoapps/discussion/django_comment_client/base/tests.py b/lms/djangoapps/discussion/django_comment_client/base/tests.py
index 62af24f0ee37..df087fdc533e 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/tests.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/tests.py
@@ -82,6 +82,7 @@ def _set_mock_request_data(self, mock_request, data):
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class CreateThreadGroupIdTestCase(
         MockRequestSetupMixin,
         CohortedTestCase,
@@ -90,7 +91,21 @@ class CreateThreadGroupIdTestCase(
 ):
     cs_endpoint = "/threads"
 
-    def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True):
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def call_view(self, mock_is_forum_v2_enabled, mock_request, commentable_id, user, group_id, pass_group_id=True):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {})
         request_data = {"body": "body", "title": "title", "thread_type": "discussion"}
         if pass_group_id:
@@ -105,8 +120,9 @@ def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=
             commentable_id=commentable_id
         )
 
-    def test_group_info_in_response(self, mock_request):
+    def test_group_info_in_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             "cohorted_topic",
             self.student,
@@ -116,6 +132,7 @@ def test_group_info_in_response(self, mock_request):
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 @disable_signal(views, 'thread_edited')
 @disable_signal(views, 'thread_voted')
 @disable_signal(views, 'thread_deleted')
@@ -127,11 +144,18 @@ class ThreadActionGroupIdTestCase(
     def call_view(
             self,
             view_name,
+            mock_is_forum_v2_enabled,
             mock_request,
             user=None,
             post_params=None,
             view_args=None
     ):
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(
             mock_request,
             {
@@ -154,53 +178,58 @@ def call_view(
             **(view_args or {})
         )
 
-    def test_update(self, mock_request):
+    def test_update(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
             "update_thread",
+            mock_is_forum_v2_enabled,
             mock_request,
             post_params={"body": "body", "title": "title"}
         )
         self._assert_json_response_contains_group_info(response)
 
-    def test_delete(self, mock_request):
-        response = self.call_view("delete_thread", mock_request)
+    def test_delete(self, mock_is_forum_v2_enabled, mock_request):
+        response = self.call_view("delete_thread", mock_is_forum_v2_enabled, mock_request)
         self._assert_json_response_contains_group_info(response)
 
-    def test_vote(self, mock_request):
+    def test_vote(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
             "vote_for_thread",
+            mock_is_forum_v2_enabled,
             mock_request,
             view_args={"value": "up"}
         )
         self._assert_json_response_contains_group_info(response)
-        response = self.call_view("undo_vote_for_thread", mock_request)
+        response = self.call_view("undo_vote_for_thread", mock_is_forum_v2_enabled, mock_request)
         self._assert_json_response_contains_group_info(response)
 
-    def test_flag(self, mock_request):
+    def test_flag(self, mock_is_forum_v2_enabled, mock_request):
         with mock.patch('openedx.core.djangoapps.django_comment_common.signals.thread_flagged.send') as signal_mock:
-            response = self.call_view("flag_abuse_for_thread", mock_request)
+            response = self.call_view("flag_abuse_for_thread", mock_is_forum_v2_enabled, mock_request)
             self._assert_json_response_contains_group_info(response)
             self.assertEqual(signal_mock.call_count, 1)
-        response = self.call_view("un_flag_abuse_for_thread", mock_request)
+        response = self.call_view("un_flag_abuse_for_thread", mock_is_forum_v2_enabled, mock_request)
         self._assert_json_response_contains_group_info(response)
 
-    def test_pin(self, mock_request):
+    def test_pin(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
             "pin_thread",
+            mock_is_forum_v2_enabled,
             mock_request,
             user=self.moderator
         )
         self._assert_json_response_contains_group_info(response)
         response = self.call_view(
             "un_pin_thread",
+            mock_is_forum_v2_enabled,
             mock_request,
             user=self.moderator
         )
         self._assert_json_response_contains_group_info(response)
 
-    def test_openclose(self, mock_request):
+    def test_openclose(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
             "openclose_thread",
+            mock_is_forum_v2_enabled,
             mock_request,
             user=self.moderator
         )
@@ -280,10 +309,11 @@ def _setup_mock_request(self, mock_request, include_depth=False):
             data["depth"] = 0
         self._set_mock_request_data(mock_request, data)
 
-    def create_thread_helper(self, mock_request, extra_request_data=None, extra_response_data=None):
+    def create_thread_helper(self, mock_is_forum_v2_enabled, mock_request, extra_request_data=None, extra_response_data=None):
         """
         Issues a request to create a thread and verifies the result.
         """
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "thread_type": "discussion",
             "title": "Hello",
@@ -350,10 +380,11 @@ def create_thread_helper(self, mock_request, extra_request_data=None, extra_resp
         )
         assert response.status_code == 200
 
-    def update_thread_helper(self, mock_request):
+    def update_thread_helper(self, mock_is_forum_v2_enabled, mock_request):
         """
         Issues a request to update a thread and verifies the result.
         """
+        mock_is_forum_v2_enabled.return_value = False
         self._setup_mock_request(mock_request)
         # Mock out saving in order to test that content is correctly
         # updated. Otherwise, the call to thread.save() receives the
@@ -376,6 +407,7 @@ def update_thread_helper(self, mock_request):
 
 @ddt.ddt
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 @disable_signal(views, 'thread_created')
 @disable_signal(views, 'thread_edited')
 class ViewsQueryCountTestCase(
@@ -393,6 +425,11 @@ class ViewsQueryCountTestCase(
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
         super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def count_queries(func):  # pylint: disable=no-self-argument
         """
@@ -414,22 +451,23 @@ def inner(self, default_store, block_count, mongo_calls, sql_queries, *args, **k
     )
     @ddt.unpack
     @count_queries
-    def test_create_thread(self, mock_request):
-        self.create_thread_helper(mock_request)
+    def test_create_thread(self, mock_is_forum_v2_enabled, mock_request):
+        self.create_thread_helper(mock_is_forum_v2_enabled, mock_request)
 
     @ddt.data(
         (ModuleStoreEnum.Type.split, 3, 6, 41),
     )
     @ddt.unpack
     @count_queries
-    def test_update_thread(self, mock_request):
-        self.update_thread_helper(mock_request)
+    def test_update_thread(self, mock_is_forum_v2_enabled, mock_request):
+        self.update_thread_helper(mock_is_forum_v2_enabled, mock_request)
 
 
 @ddt.ddt
 @disable_signal(views, 'comment_flagged')
 @disable_signal(views, 'thread_flagged')
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class ViewsTestCase(
         ForumsEnableMixin,
         UrlResetMixin,
@@ -464,7 +502,16 @@ def setUp(self):
         # so we need to call super.setUp() which reloads urls.py (because
         # of the UrlResetMixin)
         super().setUp()
-
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         # Patch the comment client user save method so it does not try
         # to create a new cc user when creating a django user
         with patch('common.djangoapps.student.models.user.cc.User.save'):
@@ -497,11 +544,11 @@ def assert_discussion_signals(self, signal, user=None):
         with self.assert_signal_sent(views, signal, sender=None, user=user, exclude_args=('post',)):
             yield
 
-    def test_create_thread(self, mock_request):
+    def test_create_thread(self, mock_is_forum_v2_enabled, mock_request):
         with self.assert_discussion_signals('thread_created'):
-            self.create_thread_helper(mock_request)
+            self.create_thread_helper(mock_is_forum_v2_enabled, mock_request)
 
-    def test_create_thread_standalone(self, mock_request):
+    def test_create_thread_standalone(self, mock_is_forum_v2_enabled, mock_request):
         team = CourseTeamFactory.create(
             name="A Team",
             course_id=self.course_id,
@@ -513,15 +560,15 @@ def test_create_thread_standalone(self, mock_request):
         team.add_user(self.student)
 
         # create_thread_helper verifies that extra data are passed through to the comments service
-        self.create_thread_helper(mock_request, extra_response_data={'context': ThreadContext.STANDALONE})
+        self.create_thread_helper(mock_is_forum_v2_enabled, mock_request, extra_response_data={'context': ThreadContext.STANDALONE})
 
     @ddt.data(
         ('follow_thread', 'thread_followed'),
         ('unfollow_thread', 'thread_unfollowed'),
     )
     @ddt.unpack
-    def test_follow_unfollow_thread_signals(self, view_name, signal, mock_request):
-        self.create_thread_helper(mock_request)
+    def test_follow_unfollow_thread_signals(self, view_name, signal, mock_is_forum_v2_enabled, mock_request):
+        self.create_thread_helper(mock_is_forum_v2_enabled, mock_request)
 
         with self.assert_discussion_signals(signal):
             response = self.client.post(
@@ -532,7 +579,8 @@ def test_follow_unfollow_thread_signals(self, view_name, signal, mock_request):
             )
         assert response.status_code == 200
 
-    def test_delete_thread(self, mock_request):
+    def test_delete_thread(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
@@ -551,7 +599,8 @@ def test_delete_thread(self, mock_request):
         assert response.status_code == 200
         assert mock_request.called
 
-    def test_delete_comment(self, mock_request):
+    def test_delete_comment(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
@@ -573,12 +622,13 @@ def test_delete_comment(self, mock_request):
         assert args[0] == 'delete'
         assert args[1].endswith(f"/{test_comment_id}")
 
-    def _test_request_error(self, view_name, view_kwargs, data, mock_request):
+    def _test_request_error(self, view_name, view_kwargs, data, mock_is_forum_v2_enabled, mock_request):
         """
         Submit a request against the given view with the given data and ensure
         that the result is a 400 error and that no data was posted using
         mock_request
         """
+        mock_is_forum_v2_enabled.return_value = False
         self._setup_mock_request(mock_request, include_depth=(view_name == "create_sub_comment"))
 
         response = self.client.post(reverse(view_name, kwargs=view_kwargs), data=data)
@@ -586,87 +636,97 @@ def _test_request_error(self, view_name, view_kwargs, data, mock_request):
         for call in mock_request.call_args_list:
             assert call[0][0].lower() == 'get'
 
-    def test_create_thread_no_title(self, mock_request):
+    def test_create_thread_no_title(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_thread",
             {"commentable_id": "dummy", "course_id": str(self.course_id)},
             {"body": "foo"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_thread_empty_title(self, mock_request):
+    def test_create_thread_empty_title(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_thread",
             {"commentable_id": "dummy", "course_id": str(self.course_id)},
             {"body": "foo", "title": " "},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_thread_no_body(self, mock_request):
+    def test_create_thread_no_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_thread",
             {"commentable_id": "dummy", "course_id": str(self.course_id)},
             {"title": "foo"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_thread_empty_body(self, mock_request):
+    def test_create_thread_empty_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_thread",
             {"commentable_id": "dummy", "course_id": str(self.course_id)},
             {"body": " ", "title": "foo"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_thread_no_title(self, mock_request):
+    def test_update_thread_no_title(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_thread",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {"body": "foo"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_thread_empty_title(self, mock_request):
+    def test_update_thread_empty_title(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_thread",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {"body": "foo", "title": " "},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_thread_no_body(self, mock_request):
+    def test_update_thread_no_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_thread",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {"title": "foo"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_thread_empty_body(self, mock_request):
+    def test_update_thread_empty_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_thread",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {"body": " ", "title": "foo"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_thread_course_topic(self, mock_request):
+    def test_update_thread_course_topic(self, mock_is_forum_v2_enabled, mock_request):
         with self.assert_discussion_signals('thread_edited'):
-            self.update_thread_helper(mock_request)
+            self.update_thread_helper(mock_is_forum_v2_enabled, mock_request)
 
     @patch(
         'lms.djangoapps.discussion.django_comment_client.utils.get_discussion_categories_ids',
         return_value=["test_commentable"],
     )
-    def test_update_thread_wrong_commentable_id(self, mock_get_discussion_id_map, mock_request):
+    def test_update_thread_wrong_commentable_id(self, mock_get_discussion_id_map, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_thread",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {"body": "foo", "title": "foo", "commentable_id": "wrong_commentable"},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_comment(self, mock_request):
+    def test_create_comment(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._setup_mock_request(mock_request)
         with self.assert_discussion_signals('comment_created'):
             response = self.client.post(
@@ -678,55 +738,62 @@ def test_create_comment(self, mock_request):
             )
         assert response.status_code == 200
 
-    def test_create_comment_no_body(self, mock_request):
+    def test_create_comment_no_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_comment",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_comment_empty_body(self, mock_request):
+    def test_create_comment_empty_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_comment",
             {"thread_id": "dummy", "course_id": str(self.course_id)},
             {"body": " "},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_sub_comment_no_body(self, mock_request):
+    def test_create_sub_comment_no_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_sub_comment",
             {"comment_id": "dummy", "course_id": str(self.course_id)},
             {},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_create_sub_comment_empty_body(self, mock_request):
+    def test_create_sub_comment_empty_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "create_sub_comment",
             {"comment_id": "dummy", "course_id": str(self.course_id)},
             {"body": " "},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_comment_no_body(self, mock_request):
+    def test_update_comment_no_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_comment",
             {"comment_id": "dummy", "course_id": str(self.course_id)},
             {},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_comment_empty_body(self, mock_request):
+    def test_update_comment_empty_body(self, mock_is_forum_v2_enabled, mock_request):
         self._test_request_error(
             "update_comment",
             {"comment_id": "dummy", "course_id": str(self.course_id)},
             {"body": " "},
+            mock_is_forum_v2_enabled,
             mock_request
         )
 
-    def test_update_comment_basic(self, mock_request):
+    def test_update_comment_basic(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._setup_mock_request(mock_request)
         comment_id = "test_comment_id"
         updated_body = "updated body"
@@ -748,13 +815,14 @@ def test_update_comment_basic(self, mock_request):
             data={"body": updated_body}
         )
 
-    def test_flag_thread_open(self, mock_request):
-        self.flag_thread(mock_request, False)
+    def test_flag_thread_open(self, mock_is_forum_v2_enabled, mock_request):
+        self.flag_thread(mock_is_forum_v2_enabled, mock_request, False)
 
-    def test_flag_thread_close(self, mock_request):
-        self.flag_thread(mock_request, True)
+    def test_flag_thread_close(self, mock_is_forum_v2_enabled, mock_request):
+        self.flag_thread(mock_is_forum_v2_enabled, mock_request, True)
 
-    def flag_thread(self, mock_request, is_closed):
+    def flag_thread(self, mock_is_forum_v2_enabled, mock_request, is_closed):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "title": "Hello",
             "body": "this is a post",
@@ -826,13 +894,14 @@ def flag_thread(self, mock_request, is_closed):
 
         assert response.status_code == 200
 
-    def test_un_flag_thread_open(self, mock_request):
-        self.un_flag_thread(mock_request, False)
+    def test_un_flag_thread_open(self, mock_is_forum_v2_enabled, mock_request):
+        self.un_flag_thread(mock_is_forum_v2_enabled, mock_request, False)
 
-    def test_un_flag_thread_close(self, mock_request):
-        self.un_flag_thread(mock_request, True)
+    def test_un_flag_thread_close(self, mock_is_forum_v2_enabled, mock_request):
+        self.un_flag_thread(mock_is_forum_v2_enabled, mock_request, True)
 
-    def un_flag_thread(self, mock_request, is_closed):
+    def un_flag_thread(self, mock_is_forum_v2_enabled, mock_request, is_closed):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "title": "Hello",
             "body": "this is a post",
@@ -905,13 +974,14 @@ def un_flag_thread(self, mock_request, is_closed):
 
         assert response.status_code == 200
 
-    def test_flag_comment_open(self, mock_request):
-        self.flag_comment(mock_request, False)
+    def test_flag_comment_open(self, mock_is_forum_v2_enabled, mock_request):
+        self.flag_comment(mock_is_forum_v2_enabled, mock_request, False)
 
-    def test_flag_comment_close(self, mock_request):
-        self.flag_comment(mock_request, True)
+    def test_flag_comment_close(self, mock_is_forum_v2_enabled, mock_request):
+        self.flag_comment(mock_is_forum_v2_enabled, mock_request, True)
 
-    def flag_comment(self, mock_request, is_closed):
+    def flag_comment(self, mock_is_forum_v2_enabled, mock_request, is_closed):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "body": "this is a comment",
             "course_id": "MITx/999/Robot_Super_Course",
@@ -976,13 +1046,14 @@ def flag_comment(self, mock_request, is_closed):
 
         assert response.status_code == 200
 
-    def test_un_flag_comment_open(self, mock_request):
-        self.un_flag_comment(mock_request, False)
+    def test_un_flag_comment_open(self, mock_is_forum_v2_enabled, mock_request):
+        self.un_flag_comment(mock_is_forum_v2_enabled, mock_request, False)
 
-    def test_un_flag_comment_close(self, mock_request):
-        self.un_flag_comment(mock_request, True)
+    def test_un_flag_comment_close(self, mock_is_forum_v2_enabled, mock_request):
+        self.un_flag_comment(mock_is_forum_v2_enabled, mock_request, True)
 
-    def un_flag_comment(self, mock_request, is_closed):
+    def un_flag_comment(self, mock_is_forum_v2_enabled, mock_request, is_closed):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "body": "this is a comment",
             "course_id": "MITx/999/Robot_Super_Course",
@@ -1054,7 +1125,8 @@ def un_flag_comment(self, mock_request, is_closed):
         ('downvote_comment', 'comment_id', 'comment_voted')
     )
     @ddt.unpack
-    def test_voting(self, view_name, item_id, signal, mock_request):
+    def test_voting(self, view_name, item_id, signal, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._setup_mock_request(mock_request)
         with self.assert_discussion_signals(signal):
             response = self.client.post(
@@ -1065,7 +1137,8 @@ def test_voting(self, view_name, item_id, signal, mock_request):
             )
         assert response.status_code == 200
 
-    def test_endorse_comment(self, mock_request):
+    def test_endorse_comment(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._setup_mock_request(mock_request)
         self.client.login(username=self.moderator.username, password=self.password)
         with self.assert_discussion_signals('comment_endorsed', user=self.moderator):
@@ -1079,6 +1152,7 @@ def test_endorse_comment(self, mock_request):
 
 
 @patch("openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request", autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 @disable_signal(views, 'comment_endorsed')
 class ViewPermissionsTestCase(ForumsEnableMixin, UrlResetMixin, SharedModuleStoreTestCase, MockRequestSetupMixin):
 
@@ -1106,8 +1180,19 @@ def setUpTestData(cls):
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
         super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
-    def test_pin_thread_as_student(self, mock_request):
+    def test_pin_thread_as_student(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {})
         self.client.login(username=self.student.username, password=self.password)
         response = self.client.post(
@@ -1115,7 +1200,8 @@ def test_pin_thread_as_student(self, mock_request):
         )
         assert response.status_code == 401
 
-    def test_pin_thread_as_moderator(self, mock_request):
+    def test_pin_thread_as_moderator(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {})
         self.client.login(username=self.moderator.username, password=self.password)
         response = self.client.post(
@@ -1123,7 +1209,8 @@ def test_pin_thread_as_moderator(self, mock_request):
         )
         assert response.status_code == 200
 
-    def test_un_pin_thread_as_student(self, mock_request):
+    def test_un_pin_thread_as_student(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {})
         self.client.login(username=self.student.username, password=self.password)
         response = self.client.post(
@@ -1131,7 +1218,8 @@ def test_un_pin_thread_as_student(self, mock_request):
         )
         assert response.status_code == 401
 
-    def test_un_pin_thread_as_moderator(self, mock_request):
+    def test_un_pin_thread_as_moderator(self, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {})
         self.client.login(username=self.moderator.username, password=self.password)
         response = self.client.post(
@@ -1139,7 +1227,7 @@ def test_un_pin_thread_as_moderator(self, mock_request):
         )
         assert response.status_code == 200
 
-    def _set_mock_request_thread_and_comment(self, mock_request, thread_data, comment_data):
+    def _set_mock_request_thread_and_comment(self, mock_is_forum_v2_enabled, mock_request, thread_data, comment_data):
         def handle_request(*args, **kwargs):
             url = args[1]
             if "/threads/" in url:
@@ -1148,10 +1236,12 @@ def handle_request(*args, **kwargs):
                 return self._create_response_mock(comment_data)
             else:
                 raise ArgumentError("Bad url to mock request")
+        mock_is_forum_v2_enabled.return_value = False
         mock_request.side_effect = handle_request
 
-    def test_endorse_response_as_staff(self, mock_request):
+    def test_endorse_response_as_staff(self, mock_is_forum_v2_enabled, mock_request):
         self._set_mock_request_thread_and_comment(
+            mock_is_forum_v2_enabled,
             mock_request,
             {"type": "thread", "thread_type": "question", "user_id": str(self.student.id), "commentable_id": "course"},
             {"type": "comment", "thread_id": "dummy"}
@@ -1162,8 +1252,9 @@ def test_endorse_response_as_staff(self, mock_request):
         )
         assert response.status_code == 200
 
-    def test_endorse_response_as_student(self, mock_request):
+    def test_endorse_response_as_student(self, mock_is_forum_v2_enabled, mock_request):
         self._set_mock_request_thread_and_comment(
+            mock_is_forum_v2_enabled,
             mock_request,
             {"type": "thread", "thread_type": "question",
              "user_id": str(self.moderator.id), "commentable_id": "course"},
@@ -1175,8 +1266,9 @@ def test_endorse_response_as_student(self, mock_request):
         )
         assert response.status_code == 401
 
-    def test_endorse_response_as_student_question_author(self, mock_request):
+    def test_endorse_response_as_student_question_author(self, mock_is_forum_v2_enabled, mock_request):
         self._set_mock_request_thread_and_comment(
+            mock_is_forum_v2_enabled,
             mock_request,
             {"type": "thread", "thread_type": "question", "user_id": str(self.student.id), "commentable_id": "course"},
             {"type": "comment", "thread_id": "dummy"}
@@ -1209,10 +1301,12 @@ def setUpTestData(cls):
         CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def _test_unicode_data(self, text, mock_request,):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def _test_unicode_data(self, text, mock_is_forum_v2_enabled, mock_request,):
         """
         Test to make sure unicode data in a thread doesn't break it.
         """
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {})
         request = RequestFactory().post("dummy_url", {"thread_type": "discussion", "body": text, "title": text})
         request.user = self.student
@@ -1235,6 +1329,13 @@ class UpdateThreadUnicodeTestCase(
         UnicodeTestMixin,
         MockRequestSetupMixin
 ):
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     @classmethod
     def setUpClass(cls):
@@ -1255,7 +1356,9 @@ def setUpTestData(cls):
         return_value=["test_commentable"],
     )
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def _test_unicode_data(self, text, mock_request, mock_get_discussion_id_map):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def _test_unicode_data(self, text, mock_is_forum_v2_enabled, mock_request, mock_get_discussion_id_map):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
@@ -1280,6 +1383,13 @@ class CreateCommentUnicodeTestCase(
         UnicodeTestMixin,
         MockRequestSetupMixin
 ):
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     @classmethod
     def setUpClass(cls):
@@ -1296,7 +1406,9 @@ def setUpTestData(cls):
         CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def _test_unicode_data(self, text, mock_request):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def _test_unicode_data(self, text, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         commentable_id = "non_team_dummy_id"
         self._set_mock_request_data(mock_request, {
             "closed": False,
@@ -1327,6 +1439,13 @@ class UpdateCommentUnicodeTestCase(
         UnicodeTestMixin,
         MockRequestSetupMixin
 ):
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
 
     @classmethod
     def setUpClass(cls):
@@ -1343,7 +1462,9 @@ def setUpTestData(cls):
         CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def _test_unicode_data(self, text, mock_request):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def _test_unicode_data(self, text, mock_is_forum_v2_enabled, mock_request):
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
@@ -1359,6 +1480,7 @@ def _test_unicode_data(self, text, mock_request):
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class CommentActionTestCase(
         MockRequestSetupMixin,
         CohortedTestCase,
@@ -1367,11 +1489,18 @@ class CommentActionTestCase(
     def call_view(
             self,
             view_name,
+            mock_is_forum_v2_enabled,
             mock_request,
             user=None,
             post_params=None,
             view_args=None
     ):
+        mock_is_forum_v2_enabled.return_value = False
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
         self._set_mock_request_data(
             mock_request,
             {
@@ -1394,9 +1523,9 @@ def call_view(
             **(view_args or {})
         )
 
-    def test_flag(self, mock_request):
+    def test_flag(self, mock_is_forum_v2_enabled, mock_request):
         with mock.patch('openedx.core.djangoapps.django_comment_common.signals.comment_flagged.send') as signal_mock:
-            self.call_view("flag_abuse_for_comment", mock_request)
+            self.call_view("flag_abuse_for_comment", mock_is_forum_v2_enabled, mock_request)
             self.assertEqual(signal_mock.call_count, 1)
 
 
@@ -1410,6 +1539,14 @@ class CreateSubCommentUnicodeTestCase(
     """
     Make sure comments under a response can handle unicode.
     """
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+
     @classmethod
     def setUpClass(cls):
         # pylint: disable=super-method-not-called
@@ -1425,10 +1562,12 @@ def setUpTestData(cls):
         CourseEnrollmentFactory(user=cls.student, course_id=cls.course.id)
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def _test_unicode_data(self, text, mock_request):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def _test_unicode_data(self, text, mock_is_forum_v2_enabled, mock_request):
         """
         Create a comment with unicode in it.
         """
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "closed": False,
             "depth": 1,
@@ -1453,6 +1592,7 @@ def _test_unicode_data(self, text, mock_request):
 
 @ddt.ddt
 @patch("openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request", autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 @disable_signal(views, 'thread_voted')
 @disable_signal(views, 'thread_edited')
 @disable_signal(views, 'comment_created')
@@ -1562,13 +1702,24 @@ def create_users_and_enroll(coursemode):
             users=[cls.group_moderator, cls.cohorted]
         )
 
-    @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
+    @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
         super().setUp()
 
-    def _setup_mock(self, user, mock_request, data):
+    def _setup_mock(self, user, mock_is_forum_v2_enabled, mock_request, data):
         user = getattr(self, user)
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, data)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.client.login(username=user.username, password=self.password)
 
     @ddt.data(
@@ -1593,7 +1744,7 @@ def _setup_mock(self, user, mock_request, data):
         ('group_moderator', 'cohorted', 'course_commentable_id', 401, CourseDiscussionSettings.NONE)
     )
     @ddt.unpack
-    def test_update_thread(self, user, thread_author, commentable_id, status_code, division_scheme, mock_request):
+    def test_update_thread(self, user, thread_author, commentable_id, status_code, division_scheme, mock_is_forum_v2_enabled, mock_request):
         """
         Verify that update_thread is limited to thread authors and privileged users (team membership does not matter).
         """
@@ -1603,7 +1754,7 @@ def test_update_thread(self, user, thread_author, commentable_id, status_code, d
         thread_author = getattr(self, thread_author)
 
         self._setup_mock(
-            user, mock_request,  # user is the person making the request.
+            user, mock_is_forum_v2_enabled, mock_request,  # user is the person making the request.
             {
                 "user_id": str(thread_author.id),
                 "closed": False, "commentable_id": commentable_id,
@@ -1643,12 +1794,12 @@ def test_update_thread(self, user, thread_author, commentable_id, status_code, d
         ('group_moderator', 'cohorted', 'team_commentable_id', 401, CourseDiscussionSettings.NONE)
     )
     @ddt.unpack
-    def test_delete_comment(self, user, comment_author, commentable_id, status_code, division_scheme, mock_request):
+    def test_delete_comment(self, user, comment_author, commentable_id, status_code, division_scheme, mock_is_forum_v2_enabled, mock_request):
         commentable_id = getattr(self, commentable_id)
         comment_author = getattr(self, comment_author)
         self.change_divided_discussion_settings(division_scheme)
 
-        self._setup_mock(user, mock_request, {
+        self._setup_mock(user, mock_is_forum_v2_enabled, mock_request, {
             "closed": False,
             "commentable_id": commentable_id,
             "user_id": str(comment_author.id),
@@ -1671,12 +1822,12 @@ def test_delete_comment(self, user, comment_author, commentable_id, status_code,
 
     @ddt.data(*ddt_permissions_args)
     @ddt.unpack
-    def test_create_comment(self, user, commentable_id, status_code, mock_request):
+    def test_create_comment(self, user, commentable_id, status_code, mock_is_forum_v2_enabled, mock_request):
         """
         Verify that create_comment is limited to members of the team or users with 'edit_content' permission.
         """
         commentable_id = getattr(self, commentable_id)
-        self._setup_mock(user, mock_request, {"closed": False, "commentable_id": commentable_id})
+        self._setup_mock(user, mock_is_forum_v2_enabled, mock_request, {"closed": False, "commentable_id": commentable_id})
 
         response = self.client.post(
             reverse(
@@ -1692,13 +1843,13 @@ def test_create_comment(self, user, commentable_id, status_code, mock_request):
 
     @ddt.data(*ddt_permissions_args)
     @ddt.unpack
-    def test_create_sub_comment(self, user, commentable_id, status_code, mock_request):
+    def test_create_sub_comment(self, user, commentable_id, status_code, mock_is_forum_v2_enabled, mock_request):
         """
         Verify that create_subcomment is limited to members of the team or users with 'edit_content' permission.
         """
         commentable_id = getattr(self, commentable_id)
         self._setup_mock(
-            user, mock_request,
+            user, mock_is_forum_v2_enabled, mock_request,
             {"closed": False, "commentable_id": commentable_id, "thread_id": "dummy_thread"},
         )
         response = self.client.post(
@@ -1715,14 +1866,14 @@ def test_create_sub_comment(self, user, commentable_id, status_code, mock_reques
 
     @ddt.data(*ddt_permissions_args)
     @ddt.unpack
-    def test_comment_actions(self, user, commentable_id, status_code, mock_request):
+    def test_comment_actions(self, user, commentable_id, status_code, mock_is_forum_v2_enabled, mock_request):
         """
         Verify that voting and flagging of comments is limited to members of the team or users with
         'edit_content' permission.
         """
         commentable_id = getattr(self, commentable_id)
         self._setup_mock(
-            user, mock_request,
+            user, mock_is_forum_v2_enabled, mock_request,
             {
                 "closed": False,
                 "commentable_id": commentable_id,
@@ -1742,14 +1893,14 @@ def test_comment_actions(self, user, commentable_id, status_code, mock_request):
 
     @ddt.data(*ddt_permissions_args)
     @ddt.unpack
-    def test_threads_actions(self, user, commentable_id, status_code, mock_request):
+    def test_threads_actions(self, user, commentable_id, status_code, mock_is_forum_v2_enabled, mock_request):
         """
         Verify that voting, flagging, and following of threads is limited to members of the team or users with
         'edit_content' permission.
         """
         commentable_id = getattr(self, commentable_id)
         self._setup_mock(
-            user, mock_request,
+            user, mock_is_forum_v2_enabled, mock_request,
             {"closed": False, "commentable_id": commentable_id, "body": "dummy body", "course_id": str(self.course.id)}
         )
         for action in ["upvote_thread", "downvote_thread", "un_flag_abuse_for_thread", "flag_abuse_for_thread",
@@ -1772,6 +1923,19 @@ class ForumEventTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockReque
     """
     Forum actions are expected to launch analytics events. Test these here.
     """
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     @classmethod
     def setUpClass(cls):
         # pylint: disable=super-method-not-called
@@ -1791,12 +1955,14 @@ def setUpTestData(cls):
 
     @patch('eventtracking.tracker.emit')
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def test_response_event(self, mock_request, mock_emit):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_response_event(self, mock_is_forum_v2_enabled, 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)
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "closed": False,
             "commentable_id": 'test_commentable_id',
@@ -1833,12 +1999,14 @@ def test_response_event(self, mock_request, mock_emit):
 
     @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):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_comment_event(self, mock_is_forum_v2_enabled, 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)
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "closed": False,
             "depth": 1,
@@ -1875,6 +2043,7 @@ def test_comment_event(self, mock_request, mock_emit):
 
     @patch('eventtracking.tracker.emit')
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
     @ddt.data((
         'create_thread',
         'edx.forum.thread.created', {
@@ -1896,7 +2065,7 @@ def test_comment_event(self, mock_request, mock_emit):
         {'comment_id': 'dummy_comment_id'}
     ))
     @ddt.unpack
-    def test_team_events(self, view_name, event_name, view_data, view_kwargs, mock_request, mock_emit):
+    def test_team_events(self, view_name, event_name, view_data, view_kwargs, mock_is_forum_v2_enabled, mock_request, mock_emit):
         user = self.student
         team = CourseTeamFactory.create(discussion_topic_id=TEAM_COMMENTABLE_ID)
         CourseTeamMembershipFactory.create(team=team, user=user)
@@ -1905,6 +2074,7 @@ def test_team_events(self, view_name, event_name, view_data, view_kwargs, mock_r
         forum_event = views.TRACKING_LOG_TO_EVENT_MAPS.get(event_name)
         forum_event.connect(event_receiver)
 
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             'closed': False,
             'commentable_id': TEAM_COMMENTABLE_ID,
@@ -1943,9 +2113,11 @@ def test_team_events(self, view_name, event_name, view_data, view_kwargs, mock_r
     @ddt.unpack
     @patch('eventtracking.tracker.emit')
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def test_thread_voted_event(self, view_name, obj_id_name, obj_type, mock_request, mock_emit):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_thread_voted_event(self, view_name, obj_id_name, obj_type, mock_is_forum_v2_enabled, mock_request, mock_emit):
         undo = view_name.startswith('undo')
 
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             'closed': False,
             'commentable_id': 'test_commentable_id',
@@ -1971,11 +2143,13 @@ def test_thread_voted_event(self, view_name, obj_id_name, obj_type, mock_request
     @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):
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_thread_followed_event(self, view_name, mock_is_forum_v2_enabled, mock_request, mock_emit):
         event_receiver = Mock()
         for signal in views.TRACKING_LOG_TO_EVENT_MAPS.values():
             signal.connect(event_receiver)
 
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             'closed': False,
             'commentable_id': 'test_commentable_id',
@@ -2025,10 +2199,11 @@ def setUpTestData(cls):
         cls.other_user = UserFactory.create(username="other")
         CourseEnrollmentFactory(user=cls.other_user, course_id=cls.course.id)
 
-    def set_post_counts(self, mock_request, threads_count=1, comments_count=1):
+    def set_post_counts(self, mock_is_forum_v2_enabled, mock_request, threads_count=1, comments_count=1):
         """
         sets up a mock response from the comments service for getting post counts for our other_user
         """
+        mock_is_forum_v2_enabled.return_value = False
         self._set_mock_request_data(mock_request, {
             "threads_count": threads_count,
             "comments_count": comments_count,
@@ -2042,15 +2217,17 @@ def make_request(self, method='get', course_id=None, **kwargs):
         return views.users(request, course_id=str(course_id))
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def test_finds_exact_match(self, mock_request):
-        self.set_post_counts(mock_request)
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_finds_exact_match(self, mock_is_forum_v2_enabled, mock_request):
+        self.set_post_counts(mock_is_forum_v2_enabled, mock_request)
         response = self.make_request(username="other")
         assert response.status_code == 200
         assert json.loads(response.content.decode('utf-8'))['users'] == [{'id': self.other_user.id, 'username': self.other_user.username}]
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def test_finds_no_match(self, mock_request):
-        self.set_post_counts(mock_request)
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_finds_no_match(self, mock_is_forum_v2_enabled, mock_request):
+        self.set_post_counts(mock_is_forum_v2_enabled, mock_request)
         response = self.make_request(username="othor")
         assert response.status_code == 200
         assert json.loads(response.content.decode('utf-8'))['users'] == []
@@ -2086,8 +2263,9 @@ def test_requires_requestor_enrolled_in_course(self):
         assert 'users' not in content
 
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
-    def test_requires_matched_user_has_forum_content(self, mock_request):
-        self.set_post_counts(mock_request, 0, 0)
+    @patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
+    def test_requires_matched_user_has_forum_content(self, mock_is_forum_v2_enabled, mock_request):
+        self.set_post_counts(mock_is_forum_v2_enabled, mock_request, 0, 0)
         response = self.make_request(username="other")
         assert response.status_code == 200
         assert json.loads(response.content.decode('utf-8'))['users'] == []
diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index e3e52a5400a4..3df362bdf6d2 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -562,7 +562,6 @@ def create_thread(request, course_id, commentable_id):
         params['context'] = ThreadContext.STANDALONE
     else:
         params['context'] = ThreadContext.COURSE
-
     thread = cc.Thread(**params)
 
     # Divide the thread if required
diff --git a/lms/djangoapps/discussion/django_comment_client/tests/group_id.py b/lms/djangoapps/discussion/django_comment_client/tests/group_id.py
index 78853293ec46..0a5fbe491930 100644
--- a/lms/djangoapps/discussion/django_comment_client/tests/group_id.py
+++ b/lms/djangoapps/discussion/django_comment_client/tests/group_id.py
@@ -60,51 +60,76 @@ class CohortedTopicGroupIdTestMixin(GroupIdAssertionMixin):
     Provides test cases to verify that views pass the correct `group_id` to
     the comments service when requesting content in cohorted discussions.
     """
-    def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True):
+    def call_view(self, mock_is_forum_v2_enabled, mock_request, commentable_id, user, group_id, pass_group_id=True):
         """
         Call the view for the implementing test class, constructing a request
         from the parameters.
         """
         pass  # lint-amnesty, pylint: disable=unnecessary-pass
 
-    def test_cohorted_topic_student_without_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.student, '', pass_group_id=False)
+    def test_cohorted_topic_student_without_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "cohorted_topic", self.student, '', pass_group_id=False)
         self._assert_comments_service_called_with_group_id(mock_request, self.student_cohort.id)
 
-    def test_cohorted_topic_student_none_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.student, "")
+    def test_cohorted_topic_student_none_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "cohorted_topic", self.student, "")
         self._assert_comments_service_called_with_group_id(mock_request, self.student_cohort.id)
 
-    def test_cohorted_topic_student_with_own_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.student, self.student_cohort.id)
+    def test_cohorted_topic_student_with_own_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "cohorted_topic", self.student, self.student_cohort.id)
         self._assert_comments_service_called_with_group_id(mock_request, self.student_cohort.id)
 
-    def test_cohorted_topic_student_with_other_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.student, self.moderator_cohort.id)
+    def test_cohorted_topic_student_with_other_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "cohorted_topic",
+            self.student,
+            self.moderator_cohort.id
+        )
         self._assert_comments_service_called_with_group_id(mock_request, self.student_cohort.id)
 
-    def test_cohorted_topic_moderator_without_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.moderator, '', pass_group_id=False)
+    def test_cohorted_topic_moderator_without_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "cohorted_topic",
+            self.moderator,
+            '',
+            pass_group_id=False
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_cohorted_topic_moderator_none_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.moderator, "")
+    def test_cohorted_topic_moderator_none_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "cohorted_topic", self.moderator, "")
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_cohorted_topic_moderator_with_own_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.moderator, self.moderator_cohort.id)
+    def test_cohorted_topic_moderator_with_own_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "cohorted_topic",
+            self.moderator,
+            self.moderator_cohort.id
+        )
         self._assert_comments_service_called_with_group_id(mock_request, self.moderator_cohort.id)
 
-    def test_cohorted_topic_moderator_with_other_group_id(self, mock_request):
-        self.call_view(mock_request, "cohorted_topic", self.moderator, self.student_cohort.id)
+    def test_cohorted_topic_moderator_with_other_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "cohorted_topic",
+            self.moderator,
+            self.student_cohort.id
+        )
         self._assert_comments_service_called_with_group_id(mock_request, self.student_cohort.id)
 
-    def test_cohorted_topic_moderator_with_invalid_group_id(self, mock_request):
+    def test_cohorted_topic_moderator_with_invalid_group_id(self, mock_is_forum_v2_enabled, mock_request):
         invalid_id = self.student_cohort.id + self.moderator_cohort.id
-        response = self.call_view(mock_request, "cohorted_topic", self.moderator, invalid_id)  # lint-amnesty, pylint: disable=assignment-from-no-return
+        response = self.call_view(mock_is_forum_v2_enabled, mock_request, "cohorted_topic", self.moderator, invalid_id)  # lint-amnesty, pylint: disable=assignment-from-no-return
         assert response.status_code == 500
 
-    def test_cohorted_topic_enrollment_track_invalid_group_id(self, mock_request):
+    def test_cohorted_topic_enrollment_track_invalid_group_id(self, mock_is_forum_v2_enabled, mock_request):
         CourseModeFactory.create(course_id=self.course.id, mode_slug=CourseMode.AUDIT)
         CourseModeFactory.create(course_id=self.course.id, mode_slug=CourseMode.VERIFIED)
         discussion_settings = CourseDiscussionSettings.get(self.course.id)
@@ -115,7 +140,7 @@ def test_cohorted_topic_enrollment_track_invalid_group_id(self, mock_request):
         })
 
         invalid_id = -1000
-        response = self.call_view(mock_request, "cohorted_topic", self.moderator, invalid_id)  # lint-amnesty, pylint: disable=assignment-from-no-return
+        response = self.call_view(mock_is_forum_v2_enabled, mock_request, "cohorted_topic", self.moderator, invalid_id)  # lint-amnesty, pylint: disable=assignment-from-no-return
         assert response.status_code == 500
 
 
@@ -124,57 +149,95 @@ class NonCohortedTopicGroupIdTestMixin(GroupIdAssertionMixin):
     Provides test cases to verify that views pass the correct `group_id` to
     the comments service when requesting content in non-cohorted discussions.
     """
-    def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True):
+    def call_view(self, mock_is_forum_v2_enabled, mock_request, commentable_id, user, group_id, pass_group_id=True):
         """
         Call the view for the implementing test class, constructing a request
         from the parameters.
         """
         pass  # lint-amnesty, pylint: disable=unnecessary-pass
 
-    def test_non_cohorted_topic_student_without_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.student, '', pass_group_id=False)
+    def test_non_cohorted_topic_student_without_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "non_cohorted_topic",
+            self.student,
+            '',
+            pass_group_id=False
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_student_none_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.student, '')
+    def test_non_cohorted_topic_student_none_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "non_cohorted_topic", self.student, '')
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_student_with_own_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.student, self.student_cohort.id)
+    def test_non_cohorted_topic_student_with_own_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "non_cohorted_topic",
+            self.student,
+            self.student_cohort.id
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_student_with_other_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.student, self.moderator_cohort.id)
+    def test_non_cohorted_topic_student_with_other_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "non_cohorted_topic",
+            self.student,
+            self.moderator_cohort.id
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_moderator_without_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.moderator, '', pass_group_id=False)
+    def test_non_cohorted_topic_moderator_without_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "non_cohorted_topic",
+            self.moderator,
+            "",
+            pass_group_id=False,
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_moderator_none_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.moderator, '')
+    def test_non_cohorted_topic_moderator_none_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "non_cohorted_topic", self.moderator, '')
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_moderator_with_own_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.moderator, self.moderator_cohort.id)
+    def test_non_cohorted_topic_moderator_with_own_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "non_cohorted_topic",
+            self.moderator,
+            self.moderator_cohort.id,
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_moderator_with_other_group_id(self, mock_request):
-        self.call_view(mock_request, "non_cohorted_topic", self.moderator, self.student_cohort.id)
+    def test_non_cohorted_topic_moderator_with_other_group_id(self, mock_is_forum_v2_enabled, mock_request):
+        self.call_view(
+            mock_is_forum_v2_enabled,
+            mock_request,
+            "non_cohorted_topic",
+            self.moderator,
+            self.student_cohort.id,
+        )
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_non_cohorted_topic_moderator_with_invalid_group_id(self, mock_request):
+    def test_non_cohorted_topic_moderator_with_invalid_group_id(self, mock_is_forum_v2_enabled, mock_request):
         invalid_id = self.student_cohort.id + self.moderator_cohort.id
-        self.call_view(mock_request, "non_cohorted_topic", self.moderator, invalid_id)
+        self.call_view(mock_is_forum_v2_enabled, mock_request, "non_cohorted_topic", self.moderator, invalid_id)
         self._assert_comments_service_called_without_group_id(mock_request)
 
-    def test_team_discussion_id_not_cohorted(self, mock_request):
+    def test_team_discussion_id_not_cohorted(self, mock_is_forum_v2_enabled, mock_request):
         team = CourseTeamFactory(
             course_id=self.course.id,
             topic_id='topic-id'
         )
 
         team.add_user(self.student)
-        self.call_view(mock_request, team.discussion_topic_id, self.student, '')
+        self.call_view(mock_is_forum_v2_enabled, mock_request, team.discussion_topic_id, self.student, '')
 
         self._assert_comments_service_called_without_group_id(mock_request)
diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index 19ccf26d19a4..a517e00dff34 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -199,7 +199,7 @@ def _get_course(course_key: CourseKey, user: User, check_tab: bool = True) -> Co
     return course
 
 
-def _get_thread_and_context(request, thread_id, retrieve_kwargs=None):
+def _get_thread_and_context(request, thread_id, retrieve_kwargs=None, course_id=None):
     """
     Retrieve the given thread and build a serializer context for it, returning
     both. This function also enforces access control for the thread (checking
@@ -213,7 +213,7 @@ def _get_thread_and_context(request, thread_id, retrieve_kwargs=None):
             retrieve_kwargs["with_responses"] = False
         if "mark_as_read" not in retrieve_kwargs:
             retrieve_kwargs["mark_as_read"] = False
-        cc_thread = Thread(id=thread_id).retrieve(**retrieve_kwargs)
+        cc_thread = Thread(id=thread_id).retrieve(course_id=course_id, **retrieve_kwargs)
         course_key = CourseKey.from_string(cc_thread["course_id"])
         course = _get_course(course_key, request.user)
         context = get_context(course, request, cc_thread)
@@ -1645,7 +1645,8 @@ def get_thread(request, thread_id, requested_fields=None, course_id=None):
         retrieve_kwargs={
             "with_responses": True,
             "user_id": str(request.user.id),
-        }
+        },
+        course_id=course_id,
     )
     if course_id and course_id != cc_thread.course_id:
         raise ThreadNotFoundError("Thread not found.")
diff --git a/lms/djangoapps/discussion/rest_api/discussions_notifications.py b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
index 25abcf80d486..f6572c829c7a 100644
--- a/lms/djangoapps/discussion/rest_api/discussions_notifications.py
+++ b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
@@ -3,7 +3,7 @@
 """
 import re
 
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, Tag
 from django.conf import settings
 from django.utils.text import Truncator
 
@@ -89,6 +89,7 @@ def _send_course_wide_notification(self, notification_type, audience_filters=Non
                 "post_title": getattr(self.thread, 'title', ''),
                 "course_name": self.course.display_name,
                 "sender_id": self.creator.id,
+                "group_by_id": str(self.course.id),
                 **extra_context,
             },
             notification_type=notification_type,
@@ -116,6 +117,7 @@ def send_new_response_notification(self):
             context = {
                 'email_content': clean_thread_html_body(self.comment.body),
             }
+            self._populate_context_with_ids_for_mobile(context)
             self._send_notification([self.thread.user_id], "new_response", extra_context=context)
 
     def _response_and_thread_has_same_creator(self) -> bool:
@@ -155,6 +157,7 @@ def send_new_comment_notification(self):
                 "author_pronoun": str(author_pronoun),
                 "email_content": clean_thread_html_body(self.comment.body),
             }
+            self._populate_context_with_ids_for_mobile(context)
             self._send_notification([self.thread.user_id], "new_comment", extra_context=context)
 
     def send_new_comment_on_response_notification(self):
@@ -170,6 +173,7 @@ def send_new_comment_on_response_notification(self):
             context = {
                 "email_content": clean_thread_html_body(self.comment.body),
             }
+            self._populate_context_with_ids_for_mobile(context)
             self._send_notification(
                 [self.parent_response.user_id],
                 "new_comment_on_response",
@@ -201,7 +205,7 @@ def send_response_on_followed_post_notification(self):
 
         while has_more_subscribers:
 
-            subscribers = Subscription.fetch(self.thread.id, query_params={'page': page})
+            subscribers = Subscription.fetch(self.thread.id, self.course.id, query_params={'page': page})
             if page <= subscribers.num_pages:
                 for subscriber in subscribers.collection:
                     # Check if the subscriber is not the thread creator or response creator
@@ -215,12 +219,15 @@ def send_response_on_followed_post_notification(self):
         # Remove duplicate users from the list of users to send notification
         users = list(set(users))
         if not self.parent_id:
+            context = {
+                "email_content": clean_thread_html_body(self.comment.body),
+            }
+            self._populate_context_with_ids_for_mobile(context)
             self._send_notification(
                 users,
                 "response_on_followed_post",
-                extra_context={
-                    "email_content": clean_thread_html_body(self.comment.body),
-                })
+                extra_context=context
+            )
         else:
             author_name = f"{self.parent_response.username}'s"
             # use 'their' if comment author is also response author.
@@ -230,14 +237,16 @@ def send_response_on_followed_post_notification(self):
                 if self._response_and_comment_has_same_creator()
                 else f"{self.parent_response.username}'s"
             )
+            context = {
+                "author_name": str(author_name),
+                "author_pronoun": str(author_pronoun),
+                "email_content": clean_thread_html_body(self.comment.body),
+            }
+            self._populate_context_with_ids_for_mobile(context)
             self._send_notification(
                 users,
                 "comment_on_followed_post",
-                extra_context={
-                    "author_name": str(author_name),
-                    "author_pronoun": str(author_pronoun),
-                    "email_content": clean_thread_html_body(self.comment.body),
-                }
+                extra_context=context
             )
 
     def _create_cohort_course_audience(self):
@@ -289,6 +298,7 @@ def send_response_endorsed_on_thread_notification(self):
             context = {
                 "email_content": clean_thread_html_body(self.comment.body)
             }
+            self._populate_context_with_ids_for_mobile(context)
             self._send_notification([self.thread.user_id], "response_endorsed_on_thread", extra_context=context)
 
     def send_response_endorsed_notification(self):
@@ -298,6 +308,7 @@ def send_response_endorsed_notification(self):
         context = {
             "email_content": clean_thread_html_body(self.comment.body)
         }
+        self._populate_context_with_ids_for_mobile(context)
         self._send_notification([self.creator.id], "response_endorsed", extra_context=context)
 
     def send_new_thread_created_notification(self):
@@ -329,6 +340,7 @@ def send_new_thread_created_notification(self):
             'post_title': self.thread.title,
             "email_content": clean_thread_html_body(self.thread.body),
         }
+        self._populate_context_with_ids_for_mobile(context)
         self._send_course_wide_notification(notification_type, audience_filters, context)
 
     def send_reported_content_notification(self):
@@ -361,6 +373,12 @@ def send_reported_content_notification(self):
         ]}
         self._send_course_wide_notification("content_reported", audience_filters, context)
 
+    def _populate_context_with_ids_for_mobile(self, context):
+        context['thread_id'] = self.thread.id
+        context['topic_id'] = self.thread.commentable_id
+        context['comment_id'] = self.comment_id
+        context['parent_id'] = self.parent_id
+
 
 def is_discussion_cohorted(course_key_str):
     """
@@ -379,6 +397,30 @@ def remove_html_tags(text):
     return re.sub(clean, '', text)
 
 
+def strip_empty_tags(soup):
+    """
+    Strip starting and ending empty tags from the soup object
+    """
+    def strip_tag(element, reverse=False):
+        """
+        Checks if element is empty and removes it
+        """
+        if not element.get_text(strip=True):
+            element.extract()
+            return True
+        if isinstance(element, Tag):
+            child_list = element.contents[::-1] if reverse else element.contents
+            for child in child_list:
+                if not strip_tag(child):
+                    break
+        return False
+
+    while soup.contents:
+        if not (strip_tag(soup.contents[0]) or strip_tag(soup.contents[-1], reverse=True)):
+            break
+    return soup
+
+
 def clean_thread_html_body(html_body):
     """
     Get post body with tags removed and limited to 500 characters
@@ -391,7 +433,8 @@ def clean_thread_html_body(html_body):
         "video", "track",  # Video Tags
         "audio",  # Audio Tags
         "embed", "object", "iframe",  # Embedded Content
-        "script"
+        "script",
+        "b", "strong", "i", "em", "u", "s", "strike", "del", "ins", "mark", "sub", "sup",  # Text Formatting
     ]
 
     # Remove the specified tags while keeping their content
@@ -399,4 +442,29 @@ def clean_thread_html_body(html_body):
         for match in html_body.find_all(tag):
             match.unwrap()
 
+    if not html_body.find():
+        return str(html_body)
+
+    # Replace tags that are not allowed in email
+    tags_to_update = [
+        {"source": "button", "target": "span"},
+        *[
+            {"source": tag, "target": "p"}
+            for tag in ["div", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"]
+        ],
+    ]
+    for tag_dict in tags_to_update:
+        for source_tag in html_body.find_all(tag_dict['source']):
+            target_tag = html_body.new_tag(tag_dict['target'], **source_tag.attrs)
+            if source_tag.contents:
+                for content in list(source_tag.contents):
+                    target_tag.append(content)
+            source_tag.insert_before(target_tag)
+            source_tag.extract()
+
+    for tag in html_body.find_all(True):
+        tag.attrs = {}
+        tag['style'] = 'margin: 0'
+
+    html_body = strip_empty_tags(html_body)
     return str(html_body)
diff --git a/lms/djangoapps/discussion/rest_api/serializers.py b/lms/djangoapps/discussion/rest_api/serializers.py
index f8868cbed8c8..ff0c656baf28 100644
--- a/lms/djangoapps/discussion/rest_api/serializers.py
+++ b/lms/djangoapps/discussion/rest_api/serializers.py
@@ -68,7 +68,7 @@ def get_context(course, request, thread=None):
     moderator_user_ids = get_moderator_users_list(course.id)
     ta_user_ids = get_course_ta_users_list(course.id)
     requester = request.user
-    cc_requester = CommentClientUser.from_django_user(requester).retrieve()
+    cc_requester = CommentClientUser.from_django_user(requester).retrieve(course_id=course.id)
     cc_requester["course_id"] = course.id
     course_discussion_settings = CourseDiscussionSettings.get(course.id)
     is_global_staff = GlobalStaff().has_user(requester)
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index 9a9041fd5fa4..62725cc47466 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -1248,6 +1248,22 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.maxDiff = None  # pylint: disable=invalid-name
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
@@ -1872,6 +1888,12 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/test_path")
@@ -2198,6 +2220,22 @@ def setUp(self):
         self.course = CourseFactory.create()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/test_path")
@@ -2589,6 +2627,17 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
@@ -3153,6 +3202,22 @@ def setUp(self):
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
 
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/test_path")
@@ -3670,6 +3735,22 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/test_path")
@@ -3823,6 +3904,22 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/test_path")
@@ -3991,6 +4088,17 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/test_path")
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py b/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py
index f1a71fd1239e..9e4a76aa4025 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py
@@ -104,14 +104,14 @@ def test_html_tags_removal(self):
         <p>This is a <a href="#">link</a> to a page.</p>
         <p>Here is an image: <img src="image.jpg" alt="image"></p>
         <p>Embedded video: <iframe src="video.mp4"></iframe></p>
-        <p>Script test: <script>alert('hello');</script></p>
+        <p>Script test: <script>alert("hello");</script></p>
         <p>Some other content that should remain.</p>
         """
-        expected_output = ("<p>This is a link to a page.</p>"
-                           "<p>Here is an image: </p>"
-                           "<p>Embedded video: </p>"
-                           "<p>Script test: alert('hello');</p>"
-                           "<p>Some other content that should remain.</p>")
+        expected_output = ('<p style="margin: 0">This is a link to a page.</p>'
+                           '<p style="margin: 0">Here is an image: </p>'
+                           '<p style="margin: 0">Embedded video: </p>'
+                           '<p style="margin: 0">Script test: alert("hello");</p>'
+                           '<p style="margin: 0">Some other content that should remain.</p>')
 
         result = clean_thread_html_body(html_body)
 
@@ -132,19 +132,16 @@ def test_truncate_html_body(self):
         """
         Test that the clean_thread_html_body function truncates the HTML body to 500 characters
         """
-        html_body = """
-        <p>This is a long text that should be truncated to 500 characters.</p>
-        """ * 20  # Repeat to exceed 500 characters
-
-        result = clean_thread_html_body(html_body)
-        self.assertGreaterEqual(500, len(result))
+        html_body = "This is a long text that should be truncated to 500 characters." * 20
+        result = clean_thread_html_body(f"<p>{html_body}</p>")
+        self.assertGreaterEqual(525, len(result))    # 500 characters + 25 characters for the HTML tags
 
     def test_no_tags_to_remove(self):
         """
         Test that the clean_thread_html_body function does not remove any tags if there are no unwanted tags
         """
         html_body = "<p>This paragraph has no tags to remove.</p>"
-        expected_output = "<p>This paragraph has no tags to remove.</p>"
+        expected_output = '<p style="margin: 0">This paragraph has no tags to remove.</p>'
 
         result = clean_thread_html_body(html_body)
         self.assertEqual(result, expected_output)
@@ -168,3 +165,50 @@ def test_only_script_tag(self):
 
         result = clean_thread_html_body(html_body)
         self.assertEqual(result.strip(), expected_output)
+
+    def test_tag_replace(self):
+        """
+        Tests if the clean_thread_html_body function replaces tags
+        """
+        for tag in ["div", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"]:
+            html_body = f'<{tag}>Text</{tag}>'
+            result = clean_thread_html_body(html_body)
+            self.assertEqual(result, '<p style="margin: 0">Text</p>')
+
+    def test_button_tag_replace(self):
+        """
+        Tests that the clean_thread_html_body function replaces the button tag with span tag
+        """
+        html_body = '<button class="abc">Button</button>'
+        expected_output = '<span style="margin: 0">Button</span>'
+        result = clean_thread_html_body(html_body)
+        self.assertEqual(result, expected_output)
+
+        html_body = '<p><p>abc</p><button class="abc"></button><p>abc</p></p>'
+        expected_output = '<p style="margin: 0"><p style="margin: 0">abc</p>'\
+                          '<span style="margin: 0"></span><p style="margin: 0">abc</p></p>'
+        result = clean_thread_html_body(html_body)
+        self.assertEqual(result, expected_output)
+
+    def test_button_tag_removal(self):
+        """
+        Tests button tag with no text is removed if at start or end
+        """
+        html_body = '<button class="abc"></button>'
+        expected_output = ''
+        result = clean_thread_html_body(html_body)
+        self.assertEqual(result, expected_output)
+
+    def test_attributes_removal_from_tag(self):
+        # Tests for removal of attributes from tags
+        html_body = '<p class="abc" style="color:red" aria-disabled=true>Paragraph</p>'
+        result = clean_thread_html_body(html_body)
+        self.assertEqual(result, '<p style="margin: 0">Paragraph</p>')
+
+    def test_strip_empty_tags(self):
+        """
+        Tests if the clean_thread_html_body function removes starting and ending empty tags
+        """
+        html_body = '<div><p></p><p>content</p><p></p></div>'
+        result = clean_thread_html_body(html_body)
+        self.assertEqual(result, '<p style="margin: 0"><p style="margin: 0">content</p></p>')
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_serializers.py b/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
index 8103eb692791..73b195e02fa6 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
@@ -54,6 +54,12 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
         self.maxDiff = None  # pylint: disable=invalid-name
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
@@ -571,6 +577,12 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/dummy")
@@ -802,6 +814,22 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user = UserFactory.create()
         self.register_get_user_response(self.user)
         self.request = RequestFactory().get("/dummy")
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_tasks.py b/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
index ddfc120a8e4b..8171ca7e6a71 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
@@ -58,10 +58,27 @@ def setUp(self):
         Setup test case
         """
         super().setUp()
-
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
         # Creating a course
         self.course = CourseFactory.create()
 
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
         # Creating relative discussion and cohort settings
         CourseCohortsSettings.objects.create(course_id=str(self.course.id))
         CourseDiscussionSettings.objects.create(course_id=str(self.course.id), _divided_discussions='[]')
@@ -250,8 +267,26 @@ def setUp(self):
         super().setUp()
         httpretty.reset()
         httpretty.enable()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
         self.course = CourseFactory.create()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user_1 = UserFactory.create()
         CourseEnrollment.enroll(self.user_1, self.course.id)
         self.user_2 = UserFactory.create()
@@ -270,6 +305,8 @@ def setUp(self):
                 "username": thread.username,
                 "thread_type": 'discussion',
                 "title": thread.title,
+                "commentable_id": thread.commentable_id,
+
             })
         self._register_subscriptions_endpoint()
 
@@ -319,7 +356,11 @@ def test_send_notification_to_thread_creator(self):
             'post_title': 'test thread',
             'email_content': self.comment.body,
             'course_name': self.course.display_name,
-            'sender_id': self.user_2.id
+            'sender_id': self.user_2.id,
+            'parent_id': None,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 4,
         }
         self.assertDictEqual(args.context, expected_context)
         self.assertEqual(
@@ -365,7 +406,11 @@ def test_send_notification_to_parent_threads(self):
             'author_name': 'dummy\'s',
             'author_pronoun': 'dummy\'s',
             'course_name': self.course.display_name,
-            'sender_id': self.user_3.id
+            'sender_id': self.user_3.id,
+            'parent_id': 2,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 4,
         }
         self.assertDictEqual(args_comment.context, expected_context)
         self.assertEqual(
@@ -382,7 +427,11 @@ def test_send_notification_to_parent_threads(self):
             'post_title': self.thread.title,
             'email_content': self.comment.body,
             'course_name': self.course.display_name,
-            'sender_id': self.user_3.id
+            'sender_id': self.user_3.id,
+            'parent_id': 2,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 4,
         }
         self.assertDictEqual(args_comment_on_response.context, expected_context)
         self.assertEqual(
@@ -442,7 +491,11 @@ def test_comment_creators_own_response(self):
             'author_pronoun': 'your',
             'course_name': self.course.display_name,
             'sender_id': self.user_3.id,
-            'email_content': self.comment.body
+            'email_content': self.comment.body,
+            'parent_id': 2,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 4,
         }
         self.assertDictEqual(args_comment.context, expected_context)
         self.assertEqual(
@@ -487,6 +540,10 @@ def test_send_notification_to_followers(self, parent_id, notification_type):
             'email_content': self.comment.body,
             'course_name': self.course.display_name,
             'sender_id': self.user_2.id,
+            'parent_id': parent_id,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 4,
         }
         if parent_id:
             expected_context['author_name'] = 'dummy\'s'
@@ -536,8 +593,26 @@ def setUp(self):
         super().setUp()
         httpretty.reset()
         httpretty.enable()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
         self.course = CourseFactory.create()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user_1 = UserFactory.create()
         CourseEnrollment.enroll(self.user_1, self.course.id)
         self.user_2 = UserFactory.create()
@@ -571,6 +646,8 @@ def test_new_comment_notification(self):
             "username": thread.username,
             "thread_type": 'discussion',
             "title": thread.title,
+            "commentable_id": thread.commentable_id,
+
         })
         self.register_get_comment_response({
             'id': response.id,
@@ -603,8 +680,26 @@ def setUp(self):
         super().setUp()
         httpretty.reset()
         httpretty.enable()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
         self.course = CourseFactory.create()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment",
+            return_value=self.course.id
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
         self.user_1 = UserFactory.create()
         CourseEnrollment.enroll(self.user_1, self.course.id)
         self.user_2 = UserFactory.create()
@@ -636,6 +731,7 @@ def test_response_endorsed_notifications(self):
             "username": thread.username,
             "thread_type": 'discussion',
             "title": thread.title,
+            "commentable_id": thread.commentable_id,
         })
         self.register_get_comment_response({
             'id': 1,
@@ -663,7 +759,11 @@ def test_response_endorsed_notifications(self):
             'post_title': 'test thread',
             'course_name': self.course.display_name,
             'sender_id': int(self.user_2.id),
-            'email_content': 'dummy'
+            'email_content': 'dummy',
+            'parent_id': None,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 2,
         }
         self.assertDictEqual(notification_data.context, expected_context)
         self.assertEqual(notification_data.content_url, _get_mfe_url(self.course.id, thread.id))
@@ -681,7 +781,11 @@ def test_response_endorsed_notifications(self):
             'post_title': 'test thread',
             'course_name': self.course.display_name,
             'sender_id': int(response.user_id),
-            'email_content': 'dummy'
+            'email_content': 'dummy',
+            'parent_id': None,
+            'topic_id': None,
+            'thread_id': 1,
+            'comment_id': 2,
         }
         self.assertDictEqual(notification_data.context, expected_context)
         self.assertEqual(notification_data.content_url, _get_mfe_url(self.course.id, thread.id))
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py
index 283117000712..9ae03986bb93 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_views.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_views.py
@@ -171,6 +171,12 @@ def setUp(self):
         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)})
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def user_login(self):
         """
@@ -301,6 +307,7 @@ def test_file_upload_with_no_data(self):
 
 @ddt.ddt
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
+@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_FORUM_V2": False})
 class CommentViewSetListByUserTest(
     ForumsEnableMixin,
     CommentsServiceMockMixin,
@@ -319,6 +326,12 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
         self.user = UserFactory.create(password=self.TEST_PASSWORD)
         self.register_get_user_response(self.user)
@@ -500,6 +513,12 @@ class CourseViewTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.url = reverse("discussion_course", kwargs={"course_id": str(self.course.id)})
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_404(self):
         response = self.client.get(
@@ -561,6 +580,12 @@ def setUp(self):
         self.superuser_client = APIClient()
         self.retired_username = get_retired_username_by_username(self.user.username)
         self.url = reverse("retire_discussion_user")
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def assert_response_correct(self, response, expected_status, expected_content):
         """
@@ -631,6 +656,12 @@ def setUp(self):
         self.worker_client = APIClient()
         self.new_username = "test_username_replacement"
         self.url = reverse("replace_discussion_username")
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def assert_response_correct(self, response, expected_status, expected_content):
         """
@@ -733,6 +764,12 @@ def setUp(self):
             "courseware-3": {"discussion": 7, "question": 2},
         }
         self.register_get_course_commentable_counts_response(self.course.id, self.thread_counts_map)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def create_course(self, blocks_count, module_store, topics):
         """
@@ -988,6 +1025,12 @@ def setUp(self) -> None:
         patcher.start()
         self.addCleanup(patcher.stop)
         self.url = reverse("course_topics_v3", kwargs={"course_id": str(self.course.id)})
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         response = self.client.get(self.url)
@@ -1024,6 +1067,12 @@ def setUp(self):
         super().setUp()
         self.author = UserFactory.create()
         self.url = reverse("thread-list")
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def create_source_thread(self, overrides=None):
         """
@@ -1365,6 +1414,12 @@ class ThreadViewSetCreateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.url = reverse("thread-list")
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         self.register_get_user_response(self.user)
@@ -1437,6 +1492,17 @@ def setUp(self):
         self.unsupported_media_type = JSONParser.media_type
         super().setUp()
         self.url = reverse("thread-detail", kwargs={"thread_id": "test_thread"})
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         self.register_get_user_response(self.user)
@@ -1581,6 +1647,17 @@ def setUp(self):
         super().setUp()
         self.url = reverse("thread-detail", kwargs={"thread_id": "test_thread"})
         self.thread_id = "test_thread"
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         self.register_get_user_response(self.user)
@@ -1681,6 +1758,12 @@ def setUp(self):
 
         ]
         self.url = reverse("discussion_learner_threads", kwargs={'course_id': str(self.course.id)})
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def update_thread(self, thread):
         """
@@ -1923,6 +2006,17 @@ def setUp(self):
         self.url = reverse("comment-list")
         self.thread_id = "test_thread"
         self.storage = get_profile_image_storage()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def create_source_comment(self, overrides=None):
         """
@@ -2377,6 +2471,22 @@ def setUp(self):
         super().setUp()
         self.url = reverse("comment-detail", kwargs={"comment_id": "test_comment"})
         self.comment_id = "test_comment"
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         self.register_get_user_response(self.user)
@@ -2416,6 +2526,23 @@ class CommentViewSetCreateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.url = reverse("comment-list")
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         self.register_get_user_response(self.user)
@@ -2518,6 +2645,22 @@ def setUp(self):
         httpretty.enable()
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.register_get_user_response(self.user)
         self.url = reverse("comment-detail", kwargs={"comment_id": "test_comment"})
 
@@ -2640,6 +2783,22 @@ def setUp(self):
         super().setUp()
         self.url = reverse("thread-detail", kwargs={"thread_id": "test_thread"})
         self.thread_id = "test_thread"
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def test_basic(self):
         self.register_get_user_response(self.user)
@@ -2693,6 +2852,22 @@ def setUp(self):
         self.url = reverse("comment-detail", kwargs={"comment_id": "test_comment"})
         self.thread_id = "test_thread"
         self.comment_id = "test_comment"
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def make_comment_data(self, comment_id, parent_id=None, children=[]):  # pylint: disable=W0102
         """
@@ -2838,6 +3013,12 @@ def setUp(self):
         self.path = reverse('discussion_course_settings', kwargs={'course_id': str(self.course.id)})
         self.password = self.TEST_PASSWORD
         self.user = UserFactory(username='staff', password=self.password, is_staff=True)
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
 
     def _get_oauth_headers(self, user):
         """Return the OAuth headers for testing OAuth authentication"""
@@ -3127,6 +3308,12 @@ class CourseDiscussionRolesAPIViewTest(APITestCase, UrlResetMixin, ModuleStoreTe
     @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
         super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
         self.course = CourseFactory.create(
             org="x",
             course="y",
@@ -3318,6 +3505,12 @@ class CourseActivityStatsTest(ForumsEnableMixin, UrlResetMixin, CommentsServiceM
     @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self) -> None:
         super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
         self.course = CourseFactory.create()
         self.course_key = str(self.course.id)
         seed_permissions_roles(self.course.id)
diff --git a/lms/djangoapps/discussion/rest_api/tests/utils.py b/lms/djangoapps/discussion/rest_api/tests/utils.py
index 27e34705f5df..496f8723acfb 100644
--- a/lms/djangoapps/discussion/rest_api/tests/utils.py
+++ b/lms/djangoapps/discussion/rest_api/tests/utils.py
@@ -675,13 +675,14 @@ class ThreadMock(object):
     A mock thread object
     """
 
-    def __init__(self, thread_id, creator, title, parent_id=None, body=''):
+    def __init__(self, thread_id, creator, title, parent_id=None, body='', commentable_id=None):
         self.id = thread_id
         self.user_id = str(creator.id)
         self.username = creator.username
         self.title = title
         self.parent_id = parent_id
         self.body = body
+        self.commentable_id = commentable_id
 
     def url_with_id(self, params):
         return f"http://example.com/{params['id']}"
diff --git a/lms/djangoapps/discussion/signals/handlers.py b/lms/djangoapps/discussion/signals/handlers.py
index 2aa7d36456c4..73c19d27858c 100644
--- a/lms/djangoapps/discussion/signals/handlers.py
+++ b/lms/djangoapps/discussion/signals/handlers.py
@@ -109,8 +109,10 @@ def create_message_context(comment, site):
         'course_id': str(thread.course_id),
         'comment_id': comment.id,
         'comment_body': comment.body,
+        'comment_body_text': comment.body_text,
         'comment_author_id': comment.user_id,
         'comment_created_at': comment.created_at,  # comment_client models dates are already serialized
+        'comment_parent_id': comment.parent_id,
         'thread_id': thread.id,
         'thread_title': thread.title,
         'thread_author_id': thread.user_id,
diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py
index d483a82dbd66..3fef4f5f7cef 100644
--- a/lms/djangoapps/discussion/tasks.py
+++ b/lms/djangoapps/discussion/tasks.py
@@ -12,6 +12,7 @@
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.contrib.sites.models import Site
 from edx_ace import ace
+from edx_ace.channel import ChannelType
 from edx_ace.recipient import Recipient
 from edx_ace.utils import date
 from edx_django_utils.monitoring import set_code_owner_attribute
@@ -74,6 +75,12 @@ def __init__(self, *args, **kwargs):
         self.options['transactional'] = True
 
 
+class CommentNotification(BaseMessageType):
+    """
+    Notify discussion participants of new comments.
+    """
+
+
 @shared_task(base=LoggedTask)
 @set_code_owner_attribute
 def send_ace_message(context):  # lint-amnesty, pylint: disable=missing-function-docstring
@@ -82,16 +89,39 @@ def send_ace_message(context):  # lint-amnesty, pylint: disable=missing-function
     if _should_send_message(context):
         context['site'] = Site.objects.get(id=context['site_id'])
         thread_author = User.objects.get(id=context['thread_author_id'])
-        with emulate_http_request(site=context['site'], user=thread_author):
-            message_context = _build_message_context(context)
+        comment_author = User.objects.get(id=context['comment_author_id'])
+        with emulate_http_request(site=context['site'], user=comment_author):
+            message_context = _build_message_context(context, notification_type='forum_response')
             message = ResponseNotification().personalize(
                 Recipient(thread_author.id, thread_author.email),
                 _get_course_language(context['course_id']),
                 message_context
             )
-            log.info('Sending forum comment email notification with context %s', message_context)
-            ace.send(message)
+            log.info('Sending forum comment notification with context %s', message_context)
+            if _is_first_comment(context['comment_id'], context['thread_id']):
+                limit_to_channels = None
+            else:
+                limit_to_channels = [ChannelType.PUSH]
+            ace.send(message, limit_to_channels=limit_to_channels)
+            _track_notification_sent(message, context)
+
+    elif _should_send_subcomment_message(context):
+        context['site'] = Site.objects.get(id=context['site_id'])
+        comment_author = User.objects.get(id=context['comment_author_id'])
+        thread_author = User.objects.get(id=context['thread_author_id'])
+
+        with emulate_http_request(site=context['site'], user=comment_author):
+            message_context = _build_message_context(context)
+            message = CommentNotification().personalize(
+                Recipient(thread_author.id, thread_author.email),
+                _get_course_language(context['course_id']),
+                message_context
+            )
+            log.info('Sending forum comment notification with context %s', message_context)
+            ace.send(message, limit_to_channels=[ChannelType.PUSH])
             _track_notification_sent(message, context)
+    else:
+        return
 
 
 @shared_task(base=LoggedTask)
@@ -154,19 +184,36 @@ def _should_send_message(context):
     return (
         _is_user_subscribed_to_thread(cc_thread_author, context['thread_id']) and
         _is_not_subcomment(context['comment_id']) and
-        _is_first_comment(context['comment_id'], context['thread_id'])
+        not _comment_author_is_thread_author(context)
     )
 
 
+def _should_send_subcomment_message(context):
+    cc_thread_author = cc.User(id=context['thread_author_id'], course_id=context['course_id'])
+    return (
+        _is_user_subscribed_to_thread(cc_thread_author, context['thread_id']) and
+        _is_subcomment(context['comment_id']) and
+        not _comment_author_is_thread_author(context)
+    )
+
+
+def _comment_author_is_thread_author(context):
+    return context.get('comment_author_id', '') == context['thread_author_id']
+
+
 def _is_content_still_reported(context):
     if context.get('comment_id') is not None:
         return len(cc.Comment.find(context['comment_id']).abuse_flaggers) > 0
     return len(cc.Thread.find(context['thread_id']).abuse_flaggers) > 0
 
 
-def _is_not_subcomment(comment_id):
+def _is_subcomment(comment_id):
     comment = cc.Comment.find(id=comment_id).retrieve()
-    return not getattr(comment, 'parent_id', None)
+    return getattr(comment, 'parent_id', None)
+
+
+def _is_not_subcomment(comment_id):
+    return not _is_subcomment(comment_id)
 
 
 def _is_first_comment(comment_id, thread_id):  # lint-amnesty, pylint: disable=missing-function-docstring
@@ -204,7 +251,7 @@ def _get_course_language(course_id):
     return language
 
 
-def _build_message_context(context):  # lint-amnesty, pylint: disable=missing-function-docstring
+def _build_message_context(context, notification_type='forum_comment'):  # lint-amnesty, pylint: disable=missing-function-docstring
     message_context = get_base_template_context(context['site'])
     message_context.update(context)
     thread_author = User.objects.get(id=context['thread_author_id'])
@@ -218,6 +265,14 @@ def _build_message_context(context):  # lint-amnesty, pylint: disable=missing-fu
         'thread_username': thread_author.username,
         'comment_username': comment_author.username,
         'post_link': post_link,
+        'push_notification_extra_context': {
+            'course_id': str(context['course_id']),
+            'parent_id': str(context['comment_parent_id']),
+            'notification_type': notification_type,
+            'topic_id': str(context['thread_commentable_id']),
+            'thread_id': context['thread_id'],
+            'comment_id': context['comment_id'],
+        },
         'comment_created_at': date.deserialize(context['comment_created_at']),
         'thread_created_at': date.deserialize(context['thread_created_at'])
     })
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/commentnotification/push/body.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/commentnotification/push/body.txt
new file mode 100644
index 000000000000..391e3d8ef4d7
--- /dev/null
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/commentnotification/push/body.txt
@@ -0,0 +1,3 @@
+{% load i18n %}
+{% blocktrans trimmed %}{{ comment_username }} commented to {{ thread_title }}:{% endblocktrans %}
+{{ comment_body_text }}
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/commentnotification/push/title.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/commentnotification/push/title.txt
new file mode 100644
index 000000000000..a9ea6f298c03
--- /dev/null
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/commentnotification/push/title.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Comment to {{ thread_title }}{% endblocktrans %}
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/push/body.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/push/body.txt
new file mode 100644
index 000000000000..ee97a6e329f5
--- /dev/null
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/push/body.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans trimmed %}{{ comment_username }} replied to {{ thread_title }}: {{ comment_body|truncatechars:200 }}{% endblocktrans %}
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/push/title.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/push/title.txt
new file mode 100644
index 000000000000..03caca997346
--- /dev/null
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/push/title.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Response to {{ thread_title }}{% endblocktrans %}
diff --git a/lms/djangoapps/discussion/tests/test_tasks.py b/lms/djangoapps/discussion/tests/test_tasks.py
index f6cce4437546..952a6c567a52 100644
--- a/lms/djangoapps/discussion/tests/test_tasks.py
+++ b/lms/djangoapps/discussion/tests/test_tasks.py
@@ -19,7 +19,11 @@
 import openedx.core.djangoapps.django_comment_common.comment_client as cc
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.discussion.signals.handlers import ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY
-from lms.djangoapps.discussion.tasks import _should_send_message, _track_notification_sent
+from lms.djangoapps.discussion.tasks import (
+    _is_first_comment,
+    _should_send_message,
+    _track_notification_sent,
+)
 from openedx.core.djangoapps.ace_common.template_context import get_base_template_context
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
 from openedx.core.djangoapps.django_comment_common.models import ForumsConfig
@@ -222,19 +226,39 @@ def setUp(self):
 
         self.ace_send_patcher = mock.patch('edx_ace.ace.send')
         self.mock_ace_send = self.ace_send_patcher.start()
+        self.mock_message_patcher = mock.patch('lms.djangoapps.discussion.tasks.ResponseNotification')
+        self.mock_message = self.mock_message_patcher.start()
 
         thread_permalink = '/courses/discussion/dummy_discussion_id'
         self.permalink_patcher = mock.patch('lms.djangoapps.discussion.tasks.permalink', return_value=thread_permalink)
         self.mock_permalink = self.permalink_patcher.start()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def tearDown(self):
         super().tearDown()
         self.request_patcher.stop()
         self.ace_send_patcher.stop()
+        self.mock_message_patcher.stop()
         self.permalink_patcher.stop()
 
     @ddt.data(True, False)
     def test_send_discussion_email_notification(self, user_subscribed):
+        self.mock_message_patcher.stop()
         if user_subscribed:
             non_matching_id = 'not-a-match'
             # with per_page left with a default value of 1, this ensures
@@ -271,8 +295,10 @@ def test_send_discussion_email_notification(self, user_subscribed):
                 expected_message_context.update({
                     'comment_author_id': self.comment_author.id,
                     'comment_body': comment['body'],
+                    'comment_body_text': comment.body_text,
                     'comment_created_at': ONE_HOUR_AGO,
                     'comment_id': comment['id'],
+                    'comment_parent_id': comment['parent_id'],
                     'comment_username': self.comment_author.username,
                     'course_id': self.course.id,
                     'thread_author_id': self.thread_author.id,
@@ -283,7 +309,15 @@ def test_send_discussion_email_notification(self, user_subscribed):
                     'thread_commentable_id': thread['commentable_id'],
                     'post_link': f'https://{site.domain}{self.mock_permalink.return_value}',
                     'site': site,
-                    'site_id': site.id
+                    'site_id': site.id,
+                    'push_notification_extra_context': {
+                        'notification_type': 'forum_response',
+                        'topic_id': thread['commentable_id'],
+                        'course_id': comment['course_id'],
+                        'parent_id': str(comment['parent_id']),
+                        'thread_id': thread['id'],
+                        'comment_id': comment['id'],
+                    },
                 })
                 expected_recipient = Recipient(self.thread_author.id, self.thread_author.email)
                 actual_message = self.mock_ace_send.call_args_list[0][0][0]
@@ -326,7 +360,9 @@ def run_should_not_send_email_test(self, thread, comment_dict):
             'comment_id': comment_dict['id'],
             'thread_id': thread['id'],
         })
-        assert actual_result is False
+
+        should_email_send = _is_first_comment(comment_dict['id'], thread['id'])
+        assert not should_email_send
         assert not self.mock_ace_send.called
 
     def test_subcomment_should_not_send_email(self):
diff --git a/lms/djangoapps/discussion/tests/test_views.py b/lms/djangoapps/discussion/tests/test_views.py
index e0d3b869da3d..facdb368f14f 100644
--- a/lms/djangoapps/discussion/tests/test_views.py
+++ b/lms/djangoapps/discussion/tests/test_views.py
@@ -4,6 +4,7 @@
 import json
 import logging
 from datetime import datetime
+from unittest import mock
 from unittest.mock import ANY, Mock, call, patch
 
 import ddt
@@ -109,9 +110,20 @@ def setUp(self):
         config = ForumsConfig.current()
         config.enabled = True
         config.save()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     @patch('common.djangoapps.student.models.user.cc.User.from_django_user')
-    @patch('common.djangoapps.student.models.user.cc.User.active_threads')
+    @patch('openedx.core.djangoapps.django_comment_common.comment_client.user.User.active_threads')
     def test_user_profile_exception(self, mock_threads, mock_from_django_user):
 
         # Mock the code that makes the HTTP requests to the cs_comment_service app
@@ -323,6 +335,17 @@ class SingleThreadTestCase(ForumsEnableMixin, ModuleStoreTestCase):  # lint-amne
 
     def setUp(self):
         super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
         self.course = CourseFactory.create(discussion_topics={'dummy discussion': {'id': 'dummy_discussion_id'}})
         self.student = UserFactory.create()
@@ -513,6 +536,20 @@ class SingleThreadQueryCountTestCase(ForumsEnableMixin, ModuleStoreTestCase):
     Ensures the number of modulestore queries and number of sql queries are
     independent of the number of responses retrieved for a given discussion thread.
     """
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     @ddt.data(
         # split mongo: 3 queries, regardless of thread response size.
         (False, 1, 2, 2, 21, 8),
@@ -582,6 +619,20 @@ def call_single_thread():
 @patch('requests.request', autospec=True)
 class SingleCohortedThreadTestCase(CohortedTestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
 
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     def _create_mock_cohorted_thread(self, mock_request):  # lint-amnesty, pylint: disable=missing-function-docstring
         mock_text = "dummy content"
         mock_thread_id = "test_thread_id"
@@ -644,6 +695,20 @@ def test_html(self, mock_request):
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
 class SingleThreadAccessTestCase(CohortedTestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
 
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     def call_view(self, mock_request, commentable_id, user, group_id, thread_group_id=None, pass_group_id=True):  # lint-amnesty, pylint: disable=missing-function-docstring
         thread_id = "test_thread_id"
         mock_request.side_effect = make_mock_request_impl(
@@ -746,6 +811,20 @@ def test_private_team_thread(self, mock_request):
 class SingleThreadGroupIdTestCase(CohortedTestCase, GroupIdAssertionMixin):  # lint-amnesty, pylint: disable=missing-class-docstring
     cs_endpoint = "/threads/dummy_thread_id"
 
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True, is_ajax=False):  # lint-amnesty, pylint: disable=missing-function-docstring
         mock_request.side_effect = make_mock_request_impl(
             course=self.course, text="dummy context", group_id=self.student_cohort.id
@@ -881,6 +960,22 @@ class SingleThreadContentGroupTestCase(ForumsEnableMixin, UrlResetMixin, Content
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
         super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
     def assert_can_access(self, user, discussion_id, thread_id, should_have_access):
         """
@@ -1046,6 +1141,7 @@ def test_private_team_discussion(self, mock_request):
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class InlineDiscussionGroupIdTestCase(  # lint-amnesty, pylint: disable=missing-class-docstring
         CohortedTestCase,
         CohortedTopicGroupIdTestMixin,
@@ -1056,8 +1152,22 @@ class InlineDiscussionGroupIdTestCase(  # lint-amnesty, pylint: disable=missing-
     def setUp(self):
         super().setUp()
         self.cohorted_commentable_id = 'cohorted_topic'
-
-    def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True):
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def call_view(
+        self,
+        mock_is_forum_v2_enabled,
+        mock_request,
+        commentable_id,
+        user,
+        group_id,
+        pass_group_id=True
+    ):  # pylint: disable=arguments-differ
+        mock_is_forum_v2_enabled.return_value = False
         kwargs = {'commentable_id': self.cohorted_commentable_id}
         if group_id:
             # avoid causing a server error when the LMS chokes attempting
@@ -1084,8 +1194,9 @@ def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=
             commentable_id
         )
 
-    def test_group_info_in_ajax_response(self, mock_request):
+    def test_group_info_in_ajax_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             self.cohorted_commentable_id,
             self.student,
@@ -1097,10 +1208,29 @@ def test_group_info_in_ajax_response(self, mock_request):
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class ForumFormDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixin):  # lint-amnesty, pylint: disable=missing-class-docstring
     cs_endpoint = "/threads"
 
-    def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True, is_ajax=False):  # pylint: disable=arguments-differ
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def call_view(
+        self,
+        mock_is_forum_v2_enabled,
+        mock_request,
+        commentable_id,
+        user,
+        group_id,
+        pass_group_id=True,
+        is_ajax=False
+    ):  # pylint: disable=arguments-differ
+        mock_is_forum_v2_enabled.return_value = False
         kwargs = {}
         if group_id:
             kwargs['group_id'] = group_id
@@ -1120,8 +1250,9 @@ def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=
             **headers
         )
 
-    def test_group_info_in_html_response(self, mock_request):
+    def test_group_info_in_html_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             "cohorted_topic",
             self.student,
@@ -1129,8 +1260,9 @@ def test_group_info_in_html_response(self, mock_request):
         )
         self._assert_html_response_contains_group_info(response)
 
-    def test_group_info_in_ajax_response(self, mock_request):
+    def test_group_info_in_ajax_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             "cohorted_topic",
             self.student,
@@ -1143,16 +1275,38 @@ def test_group_info_in_ajax_response(self, mock_request):
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class UserProfileDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixin):  # lint-amnesty, pylint: disable=missing-class-docstring
     cs_endpoint = "/active_threads"
 
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     def call_view_for_profiled_user(
-            self, mock_request, requesting_user, profiled_user, group_id, pass_group_id, is_ajax=False
+        self,
+        mock_is_forum_v2_enabled,
+        mock_request,
+        requesting_user,
+        profiled_user,
+        group_id,
+        pass_group_id,
+        is_ajax=False
     ):
         """
         Calls "user_profile" view method on behalf of "requesting_user" to get information about
         the user "profiled_user".
         """
+        mock_is_forum_v2_enabled.return_value = False
         kwargs = {}
         if group_id:
             kwargs['group_id'] = group_id
@@ -1172,13 +1326,23 @@ def call_view_for_profiled_user(
             **headers
         )
 
-    def call_view(self, mock_request, _commentable_id, user, group_id, pass_group_id=True, is_ajax=False):  # pylint: disable=arguments-differ
+    def call_view(
+        self,
+        mock_is_forum_v2_enabled,
+        mock_request,
+        _commentable_id,
+        user,
+        group_id,
+        pass_group_id=True,
+        is_ajax=False
+    ):  # pylint: disable=arguments-differ
         return self.call_view_for_profiled_user(
-            mock_request, user, user, group_id, pass_group_id=pass_group_id, is_ajax=is_ajax
+            mock_is_forum_v2_enabled, mock_request, user, user, group_id, pass_group_id=pass_group_id, is_ajax=is_ajax
         )
 
-    def test_group_info_in_html_response(self, mock_request):
+    def test_group_info_in_html_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             "cohorted_topic",
             self.student,
@@ -1187,8 +1351,9 @@ def test_group_info_in_html_response(self, mock_request):
         )
         self._assert_html_response_contains_group_info(response)
 
-    def test_group_info_in_ajax_response(self, mock_request):
+    def test_group_info_in_ajax_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             "cohorted_topic",
             self.student,
@@ -1200,7 +1365,14 @@ def test_group_info_in_ajax_response(self, mock_request):
         )
 
     def _test_group_id_passed_to_user_profile(
-            self, mock_request, expect_group_id_in_request, requesting_user, profiled_user, group_id, pass_group_id
+        self,
+        mock_is_forum_v2_enabled,
+        mock_request,
+        expect_group_id_in_request,
+        requesting_user,
+        profiled_user,
+        group_id,
+        pass_group_id
     ):
         """
         Helper method for testing whether or not group_id was passed to the user_profile request.
@@ -1221,10 +1393,11 @@ def get_params_from_user_info_call(for_specific_course):
                     has_course_id = "course_id" in params
                     if (for_specific_course and has_course_id) or (not for_specific_course and not has_course_id):
                         return params
-            pytest.fail("Did not find appropriate user_profile call for 'for_specific_course'=" + for_specific_course)
+            pytest.fail(f"Did not find appropriate user_profile call for 'for_specific_course'={for_specific_course}")
 
         mock_request.reset_mock()
         self.call_view_for_profiled_user(
+            mock_is_forum_v2_enabled,
             mock_request,
             requesting_user,
             profiled_user,
@@ -1243,7 +1416,7 @@ def get_params_from_user_info_call(for_specific_course):
         else:
             assert 'group_id' not in params_with_course_id
 
-    def test_group_id_passed_to_user_profile_student(self, mock_request):
+    def test_group_id_passed_to_user_profile_student(self, mock_is_forum_v2_enabled, mock_request):
         """
         Test that the group id is always included when requesting user profile information for a particular
         course if the requester does not have discussion moderation privileges.
@@ -1254,7 +1427,13 @@ def verify_group_id_always_present(profiled_user, pass_group_id):
             (non-privileged user).
             """
             self._test_group_id_passed_to_user_profile(
-                mock_request, True, self.student, profiled_user, self.student_cohort.id, pass_group_id
+                mock_is_forum_v2_enabled,
+                mock_request,
+                True,
+                self.student,
+                profiled_user,
+                self.student_cohort.id,
+                pass_group_id
             )
 
         # In all these test cases, the requesting_user is the student (non-privileged user).
@@ -1264,7 +1443,7 @@ def verify_group_id_always_present(profiled_user, pass_group_id):
         verify_group_id_always_present(profiled_user=self.moderator, pass_group_id=True)
         verify_group_id_always_present(profiled_user=self.moderator, pass_group_id=False)
 
-    def test_group_id_user_profile_moderator(self, mock_request):
+    def test_group_id_user_profile_moderator(self, mock_is_forum_v2_enabled, mock_request):
         """
         Test that the group id is only included when a privileged user requests user profile information for a
         particular course and user if the group_id is explicitly passed in.
@@ -1274,7 +1453,13 @@ def verify_group_id_present(profiled_user, pass_group_id, requested_cohort=self.
             Helper method to verify that group_id is present.
             """
             self._test_group_id_passed_to_user_profile(
-                mock_request, True, self.moderator, profiled_user, requested_cohort.id, pass_group_id
+                mock_is_forum_v2_enabled,
+                mock_request,
+                True,
+                self.moderator,
+                profiled_user,
+                requested_cohort.id,
+                pass_group_id
             )
 
         def verify_group_id_not_present(profiled_user, pass_group_id, requested_cohort=self.moderator_cohort):
@@ -1282,7 +1467,13 @@ def verify_group_id_not_present(profiled_user, pass_group_id, requested_cohort=s
             Helper method to verify that group_id is not present.
             """
             self._test_group_id_passed_to_user_profile(
-                mock_request, False, self.moderator, profiled_user, requested_cohort.id, pass_group_id
+                mock_is_forum_v2_enabled,
+                mock_request,
+                False,
+                self.moderator,
+                profiled_user,
+                requested_cohort.id,
+                pass_group_id
             )
 
         # In all these test cases, the requesting_user is the moderator (privileged user).
@@ -1301,10 +1492,28 @@ def verify_group_id_not_present(profiled_user, pass_group_id, requested_cohort=s
 
 
 @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+@patch('openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled', autospec=True)
 class FollowedThreadsDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixin):  # lint-amnesty, pylint: disable=missing-class-docstring
     cs_endpoint = "/subscribed_threads"
 
-    def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True):
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def call_view(
+        self,
+        mock_is_forum_v2_enabled,
+        mock_request,
+        commentable_id,
+        user,
+        group_id,
+        pass_group_id=True
+    ):  # pylint: disable=arguments-differ
+        mock_is_forum_v2_enabled.return_value = False
         kwargs = {}
         if group_id:
             kwargs['group_id'] = group_id
@@ -1325,8 +1534,9 @@ def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=
             user.id
         )
 
-    def test_group_info_in_ajax_response(self, mock_request):
+    def test_group_info_in_ajax_response(self, mock_is_forum_v2_enabled, mock_request):
         response = self.call_view(
+            mock_is_forum_v2_enabled,
             mock_request,
             "cohorted_topic",
             self.student,
@@ -1528,6 +1738,22 @@ class CommentsServiceRequestHeadersTestCase(ForumsEnableMixin, UrlResetMixin, Mo
     @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
         super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.models.forum_api.get_course_id_by_comment"
+        )
+        self.mock_get_course_id_by_comment = patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
 
         username = "foo"
         password = "bar"
@@ -1742,6 +1968,20 @@ def setUpClass(cls):
         with super().setUpClassAndTestData():
             cls.course = CourseFactory.create(discussion_topics={'dummy_discussion_id': {'id': 'dummy_discussion_id'}})
 
+    def setUp(self):
+        super().setUp()
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
+
     @classmethod
     def setUpTestData(cls):
         super().setUpTestData()
@@ -1858,7 +2098,17 @@ class EnterpriseConsentTestCase(EnterpriseTestConsentRequired, ForumsEnableMixin
     def setUp(self):
         # Invoke UrlResetMixin setUp
         super().setUp()
-
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         username = "foo"
         password = "bar"
 
@@ -2195,6 +2445,17 @@ class ThreadViewedEventTestCase(EventTestMixin, ForumsEnableMixin, UrlResetMixin
     def setUp(self):  # pylint: disable=arguments-differ
         super().setUp('lms.djangoapps.discussion.django_comment_client.base.views.tracker')
 
+        patcher = mock.patch(
+            'openedx.core.djangoapps.discussions.config.waffle.ENABLE_FORUM_V2.is_enabled',
+            return_value=False
+        )
+        patcher.start()
+        self.addCleanup(patcher.stop)
+        patcher = mock.patch(
+            "openedx.core.djangoapps.django_comment_common.comment_client.thread.forum_api.get_course_id_by_thread"
+        )
+        self.mock_get_course_id_by_thread = patcher.start()
+        self.addCleanup(patcher.stop)
         self.course = CourseFactory.create(
             teams_configuration=TeamsConfig({
                 'topics': [{
diff --git a/lms/djangoapps/discussion/toggles.py b/lms/djangoapps/discussion/toggles.py
index a1c292a4734f..a01a3b6a0a59 100644
--- a/lms/djangoapps/discussion/toggles.py
+++ b/lms/djangoapps/discussion/toggles.py
@@ -1,6 +1,7 @@
 """
 Discussions feature toggles
 """
+
 from openedx.core.djangoapps.discussions.config.waffle import WAFFLE_FLAG_NAMESPACE
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
 
@@ -11,4 +12,6 @@
 # .. toggle_use_cases: temporary, open_edx
 # .. toggle_creation_date: 2021-11-05
 # .. toggle_target_removal_date: 2022-12-05
-ENABLE_DISCUSSIONS_MFE = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_discussions_mfe', __name__)
+ENABLE_DISCUSSIONS_MFE = CourseWaffleFlag(
+    f"{WAFFLE_FLAG_NAMESPACE}.enable_discussions_mfe", __name__
+)
diff --git a/lms/djangoapps/experiments/models.py b/lms/djangoapps/experiments/models.py
index 2e69d185d384..049cd9108292 100644
--- a/lms/djangoapps/experiments/models.py
+++ b/lms/djangoapps/experiments/models.py
@@ -37,6 +37,7 @@ class ExperimentKeyValue(TimeStampedModel):
     """
     ExperimentData stores any generic key-value associated with experiments
     identified by experiment_id.
+
     .. no_pii:
     """
     experiment_id = models.PositiveSmallIntegerField(
diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py
index a5608eb39afd..4dd5fb51f4ef 100644
--- a/lms/djangoapps/grades/models.py
+++ b/lms/djangoapps/grades/models.py
@@ -467,12 +467,6 @@ def update_or_create_grade(cls, **params):
             defaults=params,
         )
 
-        # TODO: Remove as part of EDUCATOR-4602.
-        if str(usage_key.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-            log.info('Created/updated grade ***{}*** for user ***{}*** in course ***{}***'
-                     'for subsection ***{}*** with default params ***{}***'
-                     .format(grade, user_id, usage_key.course_key, usage_key, params))
-
         grade.override = PersistentSubsectionGradeOverride.get_override(user_id, usage_key)
         if first_attempted is not None and grade.first_attempted is None:
             grade.first_attempted = first_attempted
@@ -822,11 +816,6 @@ def update_or_create_override(
         grade_defaults['override_reason'] = override_data['comment'] if 'comment' in override_data else None
         grade_defaults['system'] = override_data['system'] if 'system' in override_data else None
 
-        # TODO: Remove as part of EDUCATOR-4602.
-        if str(subsection_grade_model.course_id) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-            log.info('Creating override for user ***{}*** for PersistentSubsectionGrade'
-                     '***{}*** with override data ***{}*** and derived grade_defaults ***{}***.'
-                     .format(requesting_user, subsection_grade_model, override_data, grade_defaults))
         try:
             override = PersistentSubsectionGradeOverride.objects.get(grade=subsection_grade_model)
             for key, value in grade_defaults.items():
diff --git a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
index 26df7ce2583d..c295563da565 100644
--- a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
@@ -859,11 +859,6 @@ def post(self, request, course_key):
                 subsection = course.get_child(usage_key)
                 if subsection:
                     subsection_grade_model = self._create_subsection_grade(user, course, subsection)
-                    # TODO: Remove as part of EDUCATOR-4602.
-                    if str(course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-                        log.info('PersistentSubsectionGrade ***{}*** created for'
-                                 ' subsection ***{}*** in course ***{}*** for user ***{}***.'
-                                 .format(subsection_grade_model, subsection.location, course, user.id))
                 else:
                     self._log_update_result(request.user, requested_user_id, requested_usage_id, success=False)
                     result.append(GradebookUpdateResponseItem(
diff --git a/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py
index 5d7c428c2221..42dd9139ee21 100644
--- a/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py
@@ -22,6 +22,7 @@
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory
 
+import openedx.core.djangoapps.content.block_structure.api as bs_api
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.roles import (
     CourseBetaTesterRole,
@@ -2228,6 +2229,9 @@ def test_get_override_for_unreleased_block(self):
             display_name='Unreleased Section',
         )
 
+        # We need to update the course in the cache after we create the new block.
+        bs_api.update_course_in_cache(self.course_data.course_key)
+
         resp = self.client.get(
             self.get_url(subsection_id=unreleased_subsection.location)
         )
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 cd2107ec7c29..656e7e6b4396 100644
--- a/lms/djangoapps/grades/rest_api/v1/tests/test_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/tests/test_views.py
@@ -302,7 +302,7 @@ def setUpClass(cls):
             + [
                 {
                     'category': 'Homework',
-                    'detail': 'Homework Average = 0%',
+                    'detail': 'Homework Average = 0.00%',
                     'label': 'HW Avg', 'percent': 0.0,
                     'prominent': True
                 }
@@ -332,21 +332,21 @@ def setUpClass(cls):
                 },
                 {
                     'category': 'Lab',
-                    'detail': 'Lab Average = 0%',
+                    'detail': 'Lab Average = 0.00%',
                     'label': 'Lab Avg',
                     'percent': 0.0,
                     'prominent': True
                 },
                 {
                     'category': 'Midterm Exam',
-                    'detail': 'Midterm Exam = 0%',
+                    'detail': 'Midterm Exam = 0.00%',
                     'label': 'Midterm',
                     'percent': 0.0,
                     'prominent': True
                 },
                 {
                     'category': 'Final Exam',
-                    'detail': 'Final Exam = 0%',
+                    'detail': 'Final Exam = 0.00%',
                     'label': 'Final',
                     'percent': 0.0,
                     'prominent': True
diff --git a/lms/djangoapps/grades/rest_api/v1/views.py b/lms/djangoapps/grades/rest_api/v1/views.py
index 5f49f2299ae3..b6835fd61ec4 100644
--- a/lms/djangoapps/grades/rest_api/v1/views.py
+++ b/lms/djangoapps/grades/rest_api/v1/views.py
@@ -378,7 +378,7 @@ class SubmissionHistoryView(GradeViewMixin, PaginatedAPIView):
     def get(self, request, course_id=None):
         """
         Get submission history details. This submission history is related to only
-        ProblemBlock and it doesn't support LibraryContentBlock or ContentLibraries
+        ProblemBlock and it doesn't support LegacyLibraryContentBlock or ContentLibraries
         as of now.
 
         **Usecases**:
@@ -463,7 +463,7 @@ def _generate_course_structure(enrollments):
     @staticmethod
     def get_problem_blocks(course):
         """ Get a list of problem xblock for the course.
-            This doesn't support LibraryContentBlock or ContentLibraries
+            This doesn't support LegacyLibraryContentBlock or ContentLibraries
             as of now
         """
         blocks = []
diff --git a/lms/djangoapps/grades/scores.py b/lms/djangoapps/grades/scores.py
index f621d85ea17b..7a89a88c794b 100644
--- a/lms/djangoapps/grades/scores.py
+++ b/lms/djangoapps/grades/scores.py
@@ -102,10 +102,6 @@ def get_score(submissions_scores, csm_scores, persisted_block, block):
             weight, graded - retrieved from the latest block content
     """
     weight = _get_weight_from_block(persisted_block, block)
-    # TODO: Remove as part of EDUCATOR-4602.
-    if str(block.location.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-        log.info('Weight for block: ***{}*** is {}'
-                 .format(str(block.location), weight))
 
     # Priority order for retrieving the scores:
     # submissions API -> CSM -> grades persisted block -> latest block content
@@ -115,13 +111,6 @@ def get_score(submissions_scores, csm_scores, persisted_block, block):
         _get_score_from_persisted_or_latest_block(persisted_block, block, weight)
     )
 
-    # TODO: Remove as part of EDUCATOR-4602.
-    if str(block.location.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-        log.info('Calculated raw-earned: {}, raw_possible: {}, weighted_earned: '
-                 '{}, weighted_possible: {}, first_attempted: {} for block: ***{}***.'
-                 .format(raw_earned, raw_possible, weighted_earned,
-                         weighted_possible, first_attempted, str(block.location)))
-
     if weighted_possible is None or weighted_earned is None:
         return None
 
@@ -162,8 +151,8 @@ def compute_percent(earned, possible):
      Returns the percentage of the given earned and possible values.
      """
     if possible > 0:
-        # Rounds to two decimal places.
-        return around(earned / possible, decimals=2)
+        # Rounds to four decimal places.
+        return around(earned / possible, decimals=4)
     else:
         return 0.0
 
@@ -219,11 +208,6 @@ def _get_score_from_persisted_or_latest_block(persisted_block, block, weight):
     Uses the raw_possible value from the persisted_block if found, else from
     the latest block content.
     """
-    # TODO: Remove as part of EDUCATOR-4602.
-    if str(block.location.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-        log.info('Using _get_score_from_persisted_or_latest_block to calculate score for block: ***{}***.'.format(
-            str(block.location)
-        ))
     raw_earned = 0.0
     first_attempted = None
 
@@ -231,10 +215,6 @@ def _get_score_from_persisted_or_latest_block(persisted_block, block, weight):
         raw_possible = persisted_block.raw_possible
     else:
         raw_possible = block.transformer_data[GradesTransformer].max_score
-        # TODO: Remove as part of EDUCATOR-4602.
-        if str(block.location.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-            log.info('Using latest block content to calculate score for block: ***{}***.')
-            log.info(f'weight for block: ***{str(block.location)}*** is {raw_possible}.')
 
     # TODO TNL-5982 remove defensive code for scorables without max_score
     if raw_possible is None:
diff --git a/lms/djangoapps/grades/subsection_grade.py b/lms/djangoapps/grades/subsection_grade.py
index ba098a92a417..4ce0a1f3a463 100644
--- a/lms/djangoapps/grades/subsection_grade.py
+++ b/lms/djangoapps/grades/subsection_grade.py
@@ -170,39 +170,21 @@ def _compute_block_score(  # lint-amnesty, pylint: disable=missing-function-docs
             csm_scores,
             persisted_block=None,
     ):
-        # TODO: Remove as part of EDUCATOR-4602.
-        if str(block_key.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-            log.info('Computing block score for block: ***{}*** in course: ***{}***.'.format(
-                str(block_key),
-                str(block_key.course_key),
-            ))
         try:
             block = course_structure[block_key]
         except KeyError:
-            # TODO: Remove as part of EDUCATOR-4602.
-            if str(block_key.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-                log.info('User\'s access to block: ***{}*** in course: ***{}*** has changed. '
-                         'No block score calculated.'.format(str(block_key), str(block_key.course_key)))
             # It's possible that the user's access to that
             # block has changed since the subsection grade
             # was last persisted.
+            pass
         else:
             if getattr(block, 'has_score', False):
-                # TODO: Remove as part of EDUCATOR-4602.
-                if str(block_key.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-                    log.info('Block: ***{}*** in course: ***{}*** HAS has_score attribute. Continuing.'
-                             .format(str(block_key), str(block_key.course_key)))
                 return get_score(
                     submissions_scores,
                     csm_scores,
                     persisted_block,
                     block,
                 )
-            # TODO: Remove as part of EDUCATOR-4602.
-            if str(block_key.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-                log.info('Block: ***{}*** in course: ***{}*** DOES NOT HAVE has_score attribute. '
-                         'No block score calculated.'
-                         .format(str(block_key), str(block_key.course_key)))
 
     @staticmethod
     def _aggregated_score_from_model(grade_model, is_graded):
@@ -283,23 +265,11 @@ def __init__(self, subsection, course_structure, submissions_scores, csm_scores)
                 start_node=subsection.location,
         ):
             problem_score = self._compute_block_score(block_key, course_structure, submissions_scores, csm_scores)
-
-            # TODO: Remove as part of EDUCATOR-4602.
-            if str(block_key.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-                log.info('Calculated problem score ***{}*** for block ***{!s}***'
-                         ' in subsection ***{}***.'
-                         .format(problem_score, block_key, subsection.location))
             if problem_score:
                 self.problem_scores[block_key] = problem_score
 
         all_total, graded_total = graders.aggregate_scores(list(self.problem_scores.values()))
 
-        # TODO: Remove as part of EDUCATOR-4602.
-        if str(subsection.location.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-            log.info('Calculated aggregate all_total ***{}***'
-                     ' and grade_total ***{}*** for subsection ***{}***'
-                     .format(all_total, graded_total, subsection.location))
-
         super().__init__(subsection, all_total, graded_total)
 
     def update_or_create_model(self, student, score_deleted=False, force_update_subsections=False):
@@ -307,11 +277,6 @@ def update_or_create_model(self, student, score_deleted=False, force_update_subs
         Saves or updates the subsection grade in a persisted model.
         """
         if self._should_persist_per_attempted(score_deleted, force_update_subsections):
-            # TODO: Remove as part of EDUCATOR-4602.
-            if str(self.location.course_key) == 'course-v1:UQx+BUSLEAD5x+2T2019':
-                log.info('Updating PersistentSubsectionGrade for student ***{}*** in'
-                         ' subsection ***{}*** with params ***{}***.'
-                         .format(student.id, self.location, self._persisted_model_params(student)))
             model = PersistentSubsectionGrade.update_or_create_grade(**self._persisted_model_params(student))
 
             if hasattr(model, 'override'):
diff --git a/lms/djangoapps/grades/tests/integration/test_events.py b/lms/djangoapps/grades/tests/integration/test_events.py
index f058cc81799e..315ffd65ef25 100644
--- a/lms/djangoapps/grades/tests/integration/test_events.py
+++ b/lms/djangoapps/grades/tests/integration/test_events.py
@@ -7,6 +7,7 @@
 
 from crum import set_current_request
 
+import openedx.core.djangoapps.content.block_structure.api as bs_api
 from xmodule.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.tests.factories import UserFactory
@@ -76,44 +77,45 @@ def setUp(self):
         CourseEnrollment.enroll(self.student, self.course.id)
         self.instructor = UserFactory.create(is_staff=True, username='test_instructor', password=self.TEST_PASSWORD)
         self.refresh_course()
+        # Since this doesn't happen automatically and we don't want to run all the publish signal handlers
+        # Just make sure we have the latest version of the course in cache before we test the problem.
+        bs_api.update_course_in_cache(self.course.id)
 
     @patch('lms.djangoapps.grades.events.tracker')
     def test_submit_answer(self, events_tracker):
         self.submit_question_answer('p1', {'2_1': 'choice_choice_2'})
-        course = self.store.get_course(self.course.id, depth=0)
 
         event_transaction_id = events_tracker.emit.mock_calls[0][1][1]['event_transaction_id']
-        events_tracker.emit.assert_has_calls(
-            [
-                mock_call(
-                    events.PROBLEM_SUBMITTED_EVENT_TYPE,
-                    {
-                        'user_id': str(self.student.id),
-                        'event_transaction_id': event_transaction_id,
-                        'event_transaction_type': events.PROBLEM_SUBMITTED_EVENT_TYPE,
-                        'course_id': str(self.course.id),
-                        'problem_id': str(self.problem.location),
-                        'weighted_earned': 2.0,
-                        'weighted_possible': 2.0,
-                    },
-                ),
-                mock_call(
-                    events.COURSE_GRADE_CALCULATED,
-                    {
-                        'course_version': str(course.course_version),
-                        'percent_grade': 0.02,
-                        'grading_policy_hash': 'ChVp0lHGQGCevD0t4njna/C44zQ=',
-                        'user_id': str(self.student.id),
-                        'letter_grade': '',
-                        'event_transaction_id': event_transaction_id,
-                        'event_transaction_type': events.PROBLEM_SUBMITTED_EVENT_TYPE,
-                        'course_id': str(self.course.id),
-                        'course_edited_timestamp': str(course.subtree_edited_on),
-                    }
-                ),
-            ],
-            any_order=True,
-        )
+        expected_calls = [
+            mock_call(
+                events.PROBLEM_SUBMITTED_EVENT_TYPE,
+                {
+                    'user_id': str(self.student.id),
+                    'event_transaction_id': event_transaction_id,
+                    'event_transaction_type': events.PROBLEM_SUBMITTED_EVENT_TYPE,
+                    'course_id': str(self.course.id),
+                    'problem_id': str(self.problem.location),
+                    'weighted_earned': 2.0,
+                    'weighted_possible': 2.0,
+                },
+            ),
+            mock_call(
+                events.COURSE_GRADE_CALCULATED,
+                {
+                    'course_version': str(self.course.course_version),
+                    'percent_grade': 0.02,
+                    'grading_policy_hash': 'ChVp0lHGQGCevD0t4njna/C44zQ=',
+                    'user_id': str(self.student.id),
+                    'letter_grade': '',
+                    'event_transaction_id': event_transaction_id,
+                    'event_transaction_type': events.PROBLEM_SUBMITTED_EVENT_TYPE,
+                    'course_id': str(self.course.id),
+                    'course_edited_timestamp': str(self.course.subtree_edited_on),
+                }
+            ),
+        ]
+
+        events_tracker.emit.assert_has_calls(expected_calls, any_order=True)
 
     @ddt.data(True, False)
     def test_delete_student_state(self, emit_signals):
diff --git a/lms/djangoapps/grades/tests/test_course_grade_factory.py b/lms/djangoapps/grades/tests/test_course_grade_factory.py
index 4e3bcde0ad95..c47e80a3dae0 100644
--- a/lms/djangoapps/grades/tests/test_course_grade_factory.py
+++ b/lms/djangoapps/grades/tests/test_course_grade_factory.py
@@ -68,35 +68,35 @@ def _assert_section_order(course_grade):
                 self.sequence2.display_name
             ]
 
-        with self.assertNumQueries(4), mock_get_score(1, 2):
+        with self.assertNumQueries(5), mock_get_score(1, 2):
             _assert_read(expected_pass=False, expected_percent=0)  # start off with grade of 0
 
-        num_queries = 42
+        num_queries = 43
         with self.assertNumQueries(num_queries), mock_get_score(1, 2):
             grade_factory.update(self.request.user, self.course, force_update_subsections=True)
 
-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
             _assert_read(expected_pass=True, expected_percent=0.5)  # updated to grade of .5
 
-        num_queries = 6
+        num_queries = 7
         with self.assertNumQueries(num_queries), mock_get_score(1, 4):
             grade_factory.update(self.request.user, self.course, force_update_subsections=False)
 
-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
             _assert_read(expected_pass=True, expected_percent=0.5)  # NOT updated to grade of .25
 
-        num_queries = 18
+        num_queries = 19
         with self.assertNumQueries(num_queries), mock_get_score(2, 2):
             grade_factory.update(self.request.user, self.course, force_update_subsections=True)
 
-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
             _assert_read(expected_pass=True, expected_percent=1.0)  # updated to grade of 1.0
 
-        num_queries = 28
+        num_queries = 29
         with self.assertNumQueries(num_queries), mock_get_score(0, 0):  # the subsection now is worth zero
             grade_factory.update(self.request.user, self.course, force_update_subsections=True)
 
-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
             _assert_read(expected_pass=False, expected_percent=0.0)  # updated to grade of 0.0
 
     @ddt.data((True, False))
@@ -185,26 +185,26 @@ def test_course_grade_summary(self):
             'section_breakdown': [
                 {
                     'category': 'Homework',
-                    'detail': 'Homework 1 - Test Sequential X with an & Ampersand - 50% (1/2)',
+                    'detail': 'Homework 1 - Test Sequential X with an & Ampersand - 50.00% (1/2)',
                     'label': 'HW 01',
                     'percent': 0.5
                 },
                 {
                     'category': 'Homework',
-                    'detail': 'Homework 2 - Test Sequential A - 0% (0/1)',
+                    'detail': 'Homework 2 - Test Sequential A - 0.00% (0/1)',
                     'label': 'HW 02',
                     'percent': 0.0
                 },
                 {
                     'category': 'Homework',
-                    'detail': 'Homework Average = 25%',
+                    'detail': 'Homework Average = 25.00%',
                     'label': 'HW Avg',
                     'percent': 0.25,
                     'prominent': True
                 },
                 {
                     'category': 'NoCredit',
-                    'detail': 'NoCredit Average = 0%',
+                    'detail': 'NoCredit Average = 0.00%',
                     'label': 'NC Avg',
                     'percent': 0,
                     'prominent': True
@@ -286,7 +286,7 @@ def test_grading_exception(self, mock_course_grade):
             else mock_course_grade.return_value
             for student in self.students
         ]
-        with self.assertNumQueries(11):
+        with self.assertNumQueries(20):
             all_course_grades, all_errors = self._course_grades_and_errors_for(self.course, self.students)
         assert {student: str(all_errors[student]) for student in all_errors} == {
             student3: 'Error for student3.',
diff --git a/lms/djangoapps/grades/tests/test_subsection_grade.py b/lms/djangoapps/grades/tests/test_subsection_grade.py
index 7dd39af4ece2..2398e7a71000 100644
--- a/lms/djangoapps/grades/tests/test_subsection_grade.py
+++ b/lms/djangoapps/grades/tests/test_subsection_grade.py
@@ -14,7 +14,7 @@
 @ddt
 class SubsectionGradeTest(GradeTestBase):  # lint-amnesty, pylint: disable=missing-class-docstring
 
-    @data((50, 100, .50), (59.49, 100, .59), (59.51, 100, .60), (59.50, 100, .60), (60.5, 100, .60))
+    @data((50, 100, .5), (.5949, 100, .0059), (.5951, 100, .006), (.595, 100, .0059), (.605, 100, .006))
     @unpack
     def test_create_and_read(self, mock_earned, mock_possible, expected_result):
         with mock_get_score(mock_earned, mock_possible):
diff --git a/lms/djangoapps/grades/tests/test_tasks.py b/lms/djangoapps/grades/tests/test_tasks.py
index 4dfd2dbef97f..347879105aad 100644
--- a/lms/djangoapps/grades/tests/test_tasks.py
+++ b/lms/djangoapps/grades/tests/test_tasks.py
@@ -156,8 +156,8 @@ def test_block_structure_created_only_once(self):
             assert mock_block_structure_create.call_count == 1
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 2, 41, True),
-        (ModuleStoreEnum.Type.split, 2, 41, False),
+        (ModuleStoreEnum.Type.split, 2, 42, True),
+        (ModuleStoreEnum.Type.split, 2, 42, False),
     )
     @ddt.unpack
     def test_query_counts(self, default_store, num_mongo_calls, num_sql_calls, create_multiple_subsections):
@@ -168,7 +168,7 @@ def test_query_counts(self, default_store, num_mongo_calls, num_sql_calls, creat
                     self._apply_recalculate_subsection_grade()
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 2, 41),
+        (ModuleStoreEnum.Type.split, 2, 42),
     )
     @ddt.unpack
     def test_query_counts_dont_change_with_more_content(self, default_store, num_mongo_calls, num_sql_calls):
@@ -255,7 +255,7 @@ def test_problem_block_with_restricted_access(self, mock_subsection_signal):
         UserPartition.scheme_extensions = None
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 2, 41),
+        (ModuleStoreEnum.Type.split, 2, 42),
     )
     @ddt.unpack
     def test_persistent_grades_on_course(self, default_store, num_mongo_queries, num_sql_queries):
diff --git a/lms/djangoapps/grades/tests/test_transformer.py b/lms/djangoapps/grades/tests/test_transformer.py
index b0cb6c0d49fb..7ef13e5b5b7c 100644
--- a/lms/djangoapps/grades/tests/test_transformer.py
+++ b/lms/djangoapps/grades/tests/test_transformer.py
@@ -13,6 +13,7 @@
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import check_mongo_calls_range
 
+import openedx.core.djangoapps.content.block_structure.api as bs_api
 from common.djangoapps.student.tests.factories import UserFactory
 from lms.djangoapps.course_blocks.api import get_course_blocks
 from lms.djangoapps.course_blocks.transformers.tests.helpers import CourseStructureTestCase
@@ -462,6 +463,7 @@ def test_modulestore_performance(self, store_type, max_mongo_calls, min_mongo_ca
             )
         with self.store.default_store(store_type):
             blocks = self.build_course(course)
+        bs_api.update_course_in_cache(blocks['course'].id)
         clear_course_from_cache(blocks['course'].id)
         with check_mongo_calls_range(max_mongo_calls, min_mongo_calls):
             get_course_blocks(self.student, blocks['course'].location, self.transformers)
diff --git a/lms/djangoapps/instructor/access.py b/lms/djangoapps/instructor/access.py
index 9255d113f038..a5d25769ca10 100644
--- a/lms/djangoapps/instructor/access.py
+++ b/lms/djangoapps/instructor/access.py
@@ -86,8 +86,8 @@ def _change_access(course, user, level, action, send_email=True):
                 course_id=course.id,
                 student_email=user.email,
                 auto_enroll=True,
-                email_students=send_email,
-                email_params=email_params,
+                message_students=send_email,
+                message_params=email_params,
             )
         role.add_users(user)
     elif action == 'revoke':
diff --git a/lms/djangoapps/instructor/enrollment.py b/lms/djangoapps/instructor/enrollment.py
index 896d0deadcd9..ed344876eb42 100644
--- a/lms/djangoapps/instructor/enrollment.py
+++ b/lms/djangoapps/instructor/enrollment.py
@@ -125,7 +125,14 @@ def get_user_email_language(user):
     return UserPreference.get_value(user, LANGUAGE_KEY)
 
 
-def enroll_email(course_id, student_email, auto_enroll=False, email_students=False, email_params=None, language=None):
+def enroll_email(
+    course_id,
+    student_email,
+    auto_enroll=False,
+    message_students=False,
+    message_params=None,
+    language=None
+):
     """
     Enroll a student by email.
 
@@ -133,8 +140,8 @@ def enroll_email(course_id, student_email, auto_enroll=False, email_students=Fal
     `auto_enroll` determines what is put in CourseEnrollmentAllowed.auto_enroll
         if auto_enroll is set, then when the email registers, they will be
         enrolled in the course automatically.
-    `email_students` determines if student should be notified of action by email.
-    `email_params` parameters used while parsing email templates (a `dict`).
+    `message_students` determines if student should be notified of action by email or push message.
+    `message_params` parameters used while parsing message templates (a `dict`).
     `language` is the language used to render the email.
 
     returns two EmailEnrollmentState's
@@ -142,6 +149,16 @@ def enroll_email(course_id, student_email, auto_enroll=False, email_students=Fal
     """
     previous_state = EmailEnrollmentState(course_id, student_email)
     enrollment_obj = None
+    if message_params:
+        message_params.update({
+            'app_label': 'instructor',
+            'push_notification_extra_context': {
+                'notification_type': 'enroll',
+                'course_id': str(course_id),
+            },
+        })
+    else:
+        message_params = {}
     if previous_state.user and previous_state.user.is_active:
         # if the student is currently unenrolled, don't enroll them in their
         # previous mode
@@ -159,85 +176,99 @@ def enroll_email(course_id, student_email, auto_enroll=False, email_students=Fal
             course_mode = previous_state.mode
 
         enrollment_obj = CourseEnrollment.enroll_by_email(student_email, course_id, course_mode)
-        if email_students:
-            email_params['message_type'] = 'enrolled_enroll'
-            email_params['email_address'] = student_email
-            email_params['user_id'] = previous_state.user.id
-            email_params['full_name'] = previous_state.full_name
-            send_mail_to_student(student_email, email_params, language=language)
+        if message_students:
+            message_params['message_type'] = 'enrolled_enroll'
+            message_params['email_address'] = student_email
+            message_params['user_id'] = previous_state.user.id
+            message_params['full_name'] = previous_state.full_name
+            send_mail_to_student(student_email, message_params, language=language)
 
     elif not is_email_retired(student_email):
         cea, _ = CourseEnrollmentAllowed.objects.get_or_create(course_id=course_id, email=student_email)
         cea.auto_enroll = auto_enroll
         cea.save()
-        if email_students:
-            email_params['message_type'] = 'allowed_enroll'
-            email_params['email_address'] = student_email
+        if message_students:
+            message_params['message_type'] = 'allowed_enroll'
+            message_params['email_address'] = student_email
             if previous_state.user:
-                email_params['user_id'] = previous_state.user.id
-            send_mail_to_student(student_email, email_params, language=language)
+                message_params['user_id'] = previous_state.user.id
+            send_mail_to_student(student_email, message_params, language=language)
 
     after_state = EmailEnrollmentState(course_id, student_email)
 
     return previous_state, after_state, enrollment_obj
 
 
-def unenroll_email(course_id, student_email, email_students=False, email_params=None, language=None):
+def unenroll_email(course_id, student_email, message_students=False, message_params=None, language=None):
     """
     Unenroll a student by email.
 
     `student_email` is student's emails e.g. "foo@bar.com"
-    `email_students` determines if student should be notified of action by email.
-    `email_params` parameters used while parsing email templates (a `dict`).
+    `message_students` determines if student should be notified of action by email or push message.
+    `message_params` parameters used while parsing email templates (a `dict`).
     `language` is the language used to render the email.
 
     returns two EmailEnrollmentState's
         representing state before and after the action.
     """
     previous_state = EmailEnrollmentState(course_id, student_email)
+    if message_params:
+        message_params.update({
+            'app_label': 'instructor',
+            'push_notification_extra_context': {
+                'notification_type': 'unenroll',
+            },
+        })
+    else:
+        message_params = {}
     if previous_state.enrollment:
         CourseEnrollment.unenroll_by_email(student_email, course_id)
-        if email_students:
-            email_params['message_type'] = 'enrolled_unenroll'
-            email_params['email_address'] = student_email
+        if message_students:
+            message_params['message_type'] = 'enrolled_unenroll'
+            message_params['email_address'] = student_email
             if previous_state.user:
-                email_params['user_id'] = previous_state.user.id
-            email_params['full_name'] = previous_state.full_name
-            send_mail_to_student(student_email, email_params, language=language)
+                message_params['user_id'] = previous_state.user.id
+            message_params['full_name'] = previous_state.full_name
+            send_mail_to_student(student_email, message_params, language=language)
 
     if previous_state.allowed:
         CourseEnrollmentAllowed.objects.get(course_id=course_id, email=student_email).delete()
-        if email_students:
-            email_params['message_type'] = 'allowed_unenroll'
-            email_params['email_address'] = student_email
+        if message_students:
+            message_params['message_type'] = 'allowed_unenroll'
+            message_params['email_address'] = student_email
             if previous_state.user:
-                email_params['user_id'] = previous_state.user.id
+                message_params['user_id'] = previous_state.user.id
             # Since no User object exists for this student there is no "full_name" available.
-            send_mail_to_student(student_email, email_params, language=language)
+            send_mail_to_student(student_email, message_params, language=language)
 
     after_state = EmailEnrollmentState(course_id, student_email)
 
     return previous_state, after_state
 
 
-def send_beta_role_email(action, user, email_params):
+def send_beta_role_email(action, user, message_params):
     """
     Send an email to a user added or removed as a beta tester.
 
     `action` is one of 'add' or 'remove'
     `user` is the User affected
-    `email_params` parameters used while parsing email templates (a `dict`).
+    `message_params` parameters used while parsing email templates (a `dict`).
     """
     if action in ('add', 'remove'):
-        email_params['message_type'] = '%s_beta_tester' % action
-        email_params['email_address'] = user.email
-        email_params['user_id'] = user.id
-        email_params['full_name'] = user.profile.name
+        message_params['message_type'] = '%s_beta_tester' % action
+        message_params['email_address'] = user.email
+        message_params['user_id'] = user.id
+        message_params['full_name'] = user.profile.name
+        message_params['app_label'] = 'instructor'
+        message_params['push_notification_extra_context'] = {
+            'notification_type': message_params['message_type'],
+            'course_id': str(getattr(message_params.get('course'), 'id', '')),
+        }
     else:
         raise ValueError(f"Unexpected action received '{action}' - expected 'add' or 'remove'")
     trying_to_add_inactive_user = not user.is_active and action == 'add'
     if not trying_to_add_inactive_user:
-        send_mail_to_student(user.email, email_params, language=get_user_email_language(user))
+        send_mail_to_student(user.email, message_params, language=get_user_email_language(user))
 
 
 @contextmanager
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index b0e533ee6f7f..f1e7322abc6b 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -47,6 +47,7 @@
     UNENROLLED_TO_ALLOWEDTOENROLL,
     UNENROLLED_TO_ENROLLED,
     UNENROLLED_TO_UNENROLLED,
+    CourseAccessRole,
     CourseEnrollment,
     CourseEnrollmentAllowed,
     ManualEnrollmentAudit,
@@ -60,12 +61,14 @@
     CourseFinanceAdminRole,
     CourseInstructorRole,
 )
-from common.djangoapps.student.tests.factories import BetaTesterFactory
-from common.djangoapps.student.tests.factories import CourseEnrollmentFactory
-from common.djangoapps.student.tests.factories import GlobalStaffFactory
-from common.djangoapps.student.tests.factories import InstructorFactory
-from common.djangoapps.student.tests.factories import StaffFactory
-from common.djangoapps.student.tests.factories import UserFactory
+from common.djangoapps.student.tests.factories import (
+    BetaTesterFactory,
+    CourseEnrollmentFactory,
+    GlobalStaffFactory,
+    InstructorFactory,
+    StaffFactory,
+    UserFactory
+)
 from lms.djangoapps.bulk_email.models import BulkEmailFlag, CourseEmail, CourseEmailTemplate
 from lms.djangoapps.certificates.data import CertificateStatuses
 from lms.djangoapps.certificates.tests.factories import (
@@ -94,6 +97,9 @@
 from openedx.core.djangoapps.course_groups.cohorts import set_course_cohorted
 from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_COMMUNITY_TA
 from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
+from openedx.core.djangoapps.oauth_dispatch import jwt as jwt_api
+from openedx.core.djangoapps.oauth_dispatch.adapters import DOTAdapter
+from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
 from openedx.core.djangoapps.user_api.preferences.api import delete_user_preference
@@ -1984,6 +1990,15 @@ def test_add_notenrolled_username_autoenroll(self):
         self.add_notenrolled(response, self.notenrolled_student.username)
         assert CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id)
 
+    def test_add_notenrolled_username_autoenroll_with_multiple_users(self):
+        url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
+        identifiers = (f"Lorem@ipsum.dolor, "
+                       f"sit@amet.consectetur\nadipiscing@elit.Aenean\r convallis@at.lacus\r, ut@lacinia.Sed, "
+                       f"{self.notenrolled_student.username}"
+                       )
+        response = self.client.post(url, {'identifiers': identifiers, 'action': 'add', 'email_students': False, 'auto_enroll': True})  # lint-amnesty, pylint: disable=line-too-long
+        assert 6, len(json.loads(response.content.decode())['results'])
+
     @ddt.data('http', 'https')
     def test_add_notenrolled_with_email(self, protocol):
         url = reverse('bulk_beta_modify_access', kwargs={'course_id': str(self.course.id)})
@@ -3449,6 +3464,15 @@ def test_list_entrance_exam_instructor_with_invalid_exam_key(self):
         })
         assert response.status_code == 400
 
+    def test_skip_entrance_exam_student_with_invalid_student(self):
+        """ Test skip entrance exam api for non existing user. """
+        # create a re-score entrance exam task
+        url = reverse('mark_student_can_skip_entrance_exam', kwargs={'course_id': str(self.course.id)})
+        response = self.client.post(url, {
+            'unique_student_identifier': 'test',
+        })
+        assert response.status_code == 400
+
     def test_skip_entrance_exam_student(self):
         """ Test skip entrance exam api for student. """
         # create a re-score entrance exam task
@@ -3515,6 +3539,14 @@ def test_send_email_but_not_logged_in(self):
         self.client.logout()
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, self.full_test_message)
+        assert response.status_code == 401
+
+    def test_send_email_logged_in_but_no_perms(self):
+        self.client.logout()
+        user = UserFactory()
+        self.client.login(username=user.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
 
     def test_send_email_but_not_staff(self):
@@ -3635,6 +3667,7 @@ def test_send_email_with_lapsed_date_expect_error(self):
 
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         with LogCapture() as log:
+
             response = self.client.post(url, self.full_test_message)
 
         assert response.status_code == 400
@@ -4145,6 +4178,31 @@ def test_change_due_date(self):
         # This operation regenerates the cache, so we can use cached results from edx-when.
         assert get_date_for_block(self.course, self.week1, self.user1, use_cached=True) == due_date
 
+    def test_change_due_date_with_reason(self):
+        url = reverse('change_due_date', kwargs={'course_id': str(self.course.id)})
+        due_date = datetime.datetime(2013, 12, 30, tzinfo=UTC)
+        response = self.client.post(url, {
+            'student': self.user1.username,
+            'url': str(self.week1.location),
+            'due_datetime': '12/30/2013 00:00',
+            'reason': 'Testing reason.'  # this is optional field.
+        })
+        assert response.status_code == 200, response.content
+
+        assert get_extended_due(self.course, self.week1, self.user1) == due_date
+        # This operation regenerates the cache, so we can use cached results from edx-when.
+        assert get_date_for_block(self.course, self.week1, self.user1, use_cached=True) == due_date
+
+    def test_reset_due_date_with_reason(self):
+        url = reverse('reset_due_date', kwargs={'course_id': str(self.course.id)})
+        response = self.client.post(url, {
+            'student': self.user1.username,
+            'url': str(self.week1.location),
+            'reason': 'Testing reason.'  # this is optional field.
+        })
+        assert response.status_code == 200
+        assert 'Successfully reset due date for student' in response.content.decode('utf-8')
+
     def test_change_to_invalid_due_date(self):
         url = reverse('change_due_date', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, {
@@ -4666,3 +4724,127 @@ def test_get_certificate_for_user_no_certificate(self):
             f"The student {self.user} does not have certificate for the course {self.course.id.course}. Kindly "
             "verify student username/email and the selected course are correct and try again."
         )
+
+
+@patch.dict(settings.FEATURES, {'ALLOW_AUTOMATED_SIGNUPS': True})
+class TestOauthInstructorAPILevelsAccess(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
+    """
+    Test endpoints using Oauth2 authentication.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.course = CourseFactory.create(
+            org='test_org',
+            course='test_course',
+            run='test_run',
+            entrance_exam_id='i4x://{}/{}/chapter/Entrance_exam'.format('test_org', 'test_course')
+        )
+        self.problem_location = msk_from_problem_urlname(
+            self.course.id,
+            'robot-some-problem-urlname'
+        )
+        self.problem_urlname = str(self.problem_location)
+
+        self.other_user = UserFactory()
+        dot_application = ApplicationFactory(user=self.other_user, authorization_grant_type='password')
+        access_token = AccessTokenFactory(user=self.other_user, application=dot_application)
+        oauth_adapter = DOTAdapter()
+        token_dict = {
+            'access_token': access_token,
+            'scope': 'email profile',
+        }
+        jwt_token = jwt_api.create_jwt_from_token(token_dict, oauth_adapter, use_asymmetric_key=True)
+
+        self.headers = {
+            'HTTP_AUTHORIZATION': 'JWT ' + jwt_token
+        }
+
+        # endpoints contains all urls with body and role.
+        self.endpoints = [
+            ('list_course_role_members', {'rolename': 'staff'}, 'instructor'),
+            ('register_and_enroll_students', {}, 'staff'),
+            ('get_student_progress_url', {'course_id': str(self.course.id),
+                                          'unique_student_identifier': self.other_user.email
+                                          }, 'staff'
+             ),
+            ('list_entrance_exam_instructor_tasks', {'unique_student_identifier': self.other_user.email}, 'staff'),
+            ('list_email_content', {}, 'staff'),
+            ('show_student_extensions', {'student': self.other_user.email}, 'staff'),
+            ('list_email_content', {}, 'staff'),
+            ('list_report_downloads', {
+                "send-to": ["myself"],
+                "subject": "This is subject",
+                "message": "message"
+            }, 'data_researcher'),
+            ('list_instructor_tasks',
+             {
+                 'problem_location_str': self.problem_urlname,
+                 'unique_student_identifier': self.other_user.email
+             },
+             'data_researcher'),
+            ('list_instructor_tasks', {}, 'data_researcher')
+        ]
+
+        self.fake_jwt = ('wyJUxMiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJjaGFuZ2UtbWUiLCJleHAiOjE3MjU4OTA2NzIsImdyY'
+                         'W50X3R5cGUiOiJwYXNzd29yZCIsImlhdCI6MTcyNTg4NzA3MiwiaXNzIjoiaHR0cDovLzEyNy4wLjAuMTo4MDAwL29h'
+                         'XNlcl9pZCI6MX0'
+                         '.ec8neWp1YAuF40ye4oeK40obaapUvjfNPUQCycrsajwvcu58KcuLc96sf0JKmMMMn7DH9N98hg8W38iwbhKif1kLsCKr'
+                         'tStl1u2XGvFkyMov8TtespbHit5LYRZpJwrhC1h50ru2buYj3isWrAElGPIDyAj0FAvSJnvJhWSMDtIwB2gxZI1DqOm'
+                         'M6mzT7JbOU4QH2PNZrb2EZ11F6k9I-HrHnLQymr4s0vyjMlcBWllW3y19futNCgsFFRMXI4Z9zIbspsy5bq_Skub'
+                         'dBpnl0P9x8vUJCAbFnJABAVPtF7F7nNsROQMKsZtQxaUUwdcYZi5qKL2GcgGfO0eTL4IbJA')
+
+    def assert_all_end_points(self, endpoint, body, role, add_role, use_jwt=True):
+        """
+        Util method for verifying different end-points.
+        """
+        if add_role:
+            role, _ = CourseAccessRole.objects.get_or_create(
+                course_id=self.course.id,
+                user=self.other_user,
+                role=role,
+                org=self.course.id.org
+            )
+
+        if use_jwt:
+            headers = self.headers
+        else:
+            headers = {
+                'HTTP_AUTHORIZATION': 'JWT ' + self.fake_jwt  # this is fake jwt.
+            }
+
+        url = reverse(endpoint, kwargs={'course_id': str(self.course.id)})
+        response = self.client.post(
+            url,
+            data=body,
+            **headers
+        )
+        return response
+
+    def run_endpoint_tests(self, expected_status, add_role, use_jwt):
+        """
+        Util method for running different end-points.
+        """
+        for endpoint, body, role in self.endpoints:
+            with self.subTest(endpoint=endpoint, role=role, body=body):
+                response = self.assert_all_end_points(endpoint, body, role, add_role, use_jwt)
+                # JWT authentication works but it has no permissions.
+                assert response.status_code == expected_status, f"Failed for endpoint: {endpoint}"
+
+    def test_end_points_with_oauth_without_jwt(self):
+        """
+        Verify the endpoint using invalid JWT returns 401.
+        """
+        self.run_endpoint_tests(expected_status=401, add_role=False, use_jwt=False)
+
+    def test_end_points_with_oauth_without_permissions(self):
+        """
+        Verify the endpoint using JWT authentication. But has no permissions.
+        """
+        self.run_endpoint_tests(expected_status=403, add_role=False, use_jwt=True)
+
+    def test_end_points_with_oauth_with_permissions(self):
+        """
+        Verify the endpoint using JWT authentication with permissions.
+        """
+        self.run_endpoint_tests(expected_status=200, add_role=True, use_jwt=True)
diff --git a/lms/djangoapps/instructor/tests/test_certificates.py b/lms/djangoapps/instructor/tests/test_certificates.py
index ce3433f312d8..3b6a9a223586 100644
--- a/lms/djangoapps/instructor/tests/test_certificates.py
+++ b/lms/djangoapps/instructor/tests/test_certificates.py
@@ -367,7 +367,7 @@ def test_certificate_regeneration_error(self):
 
         # Assert Error Message
         assert res_json['message'] ==\
-               'Please select one or more certificate statuses that require certificate regeneration.'
+               'Please select certificate statuses from the list only.'
 
         # Access the url passing 'certificate_statuses' that are not present in db
         url = reverse('start_certificate_regeneration', kwargs={'course_id': str(self.course.id)})
@@ -378,7 +378,8 @@ def test_certificate_regeneration_error(self):
         res_json = json.loads(response.content.decode('utf-8'))
 
         # Assert Error Message
-        assert res_json['message'] == 'Please select certificate statuses from the list only.'
+        assert (res_json['message'] ==
+                'Please select certificate statuses from the list only.')
 
 
 @override_settings(CERT_QUEUE='certificates')
@@ -488,9 +489,7 @@ def test_certificate_exception_missing_username_and_email_error(self):
         assert not res_json['success']
 
         # Assert Error Message
-        assert res_json['message'] ==\
-               'Student username/email field is required and can not be empty.' \
-               ' Kindly fill in username/email and then press "Add to Exception List" button.'
+        assert res_json['message'] == {'user': ['This field may not be blank.']}
 
     def test_certificate_exception_duplicate_user_error(self):
         """
@@ -604,6 +603,34 @@ def test_certificate_exception_removed_successfully(self):
         # Verify that certificate exception does not exist
         assert not certs_api.is_on_allowlist(self.user2, self.course.id)
 
+    def test_certificate_exception_removed_successfully_form_url(self):
+        """
+        In case of deletion front-end is sending content-type x-www-form-urlencoded.
+        Just to handle that some logic added in api and this test is for that part.
+        Test certificates exception removal api endpoint returns success status
+        when called with valid course key and certificate exception id
+        """
+        GeneratedCertificateFactory.create(
+            user=self.user2,
+            course_id=self.course.id,
+            status=CertificateStatuses.downloadable,
+            grade='1.0'
+        )
+        # Verify that certificate exception exists
+        assert certs_api.is_on_allowlist(self.user2, self.course.id)
+
+        response = self.client.post(
+            self.url,
+            data=json.dumps(self.certificate_exception_in_db),
+            content_type='application/x-www-form-urlencoded',
+            REQUEST_METHOD='DELETE'
+        )
+        # Assert successful request processing
+        assert response.status_code == 204
+
+        # Verify that certificate exception does not exist
+        assert not certs_api.is_on_allowlist(self.user2, self.course.id)
+
     def test_remove_certificate_exception_invalid_request_error(self):
         """
         Test certificates exception removal api endpoint returns error
@@ -1085,9 +1112,7 @@ def test_missing_username_and_email_error(self):
         res_json = json.loads(response.content.decode('utf-8'))
 
         # Assert Error Message
-        assert res_json['message'] == \
-               'Student username/email field is required and can not be empty.' \
-               ' Kindly fill in username/email and then press "Invalidate Certificate" button.'
+        assert res_json['message'] == {'user': ['This field may not be blank.']}
 
     def test_invalid_user_name_error(self):
         """
@@ -1106,7 +1131,6 @@ def test_invalid_user_name_error(self):
         # Assert 400 status code in response
         assert response.status_code == 400
         res_json = json.loads(response.content.decode('utf-8'))
-
         # Assert Error Message
         assert res_json['message'] == f'{invalid_user} does not exist in the LMS. Please check your spelling and retry.'
 
@@ -1125,7 +1149,6 @@ def test_no_generated_certificate_error(self):
         # Assert 400 status code in response
         assert response.status_code == 400
         res_json = json.loads(response.content.decode('utf-8'))
-
         # Assert Error Message
         assert res_json['message'] == f'The student {self.enrolled_user_2.username} does not have certificate for the course {self.course.number}. Kindly verify student username/email and the selected course are correct and try again.'  # pylint: disable=line-too-long
 
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index d9a301b07e7f..43c9c1947c71 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -22,7 +22,7 @@
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist, PermissionDenied, ValidationError
 from django.core.validators import validate_email
 from django.db import IntegrityError, transaction
-from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotFound
+from django.http import QueryDict, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotFound
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -30,7 +30,7 @@
 from django.utils.translation import gettext as _
 from django.views.decorators.cache import cache_control
 from django.views.decorators.csrf import ensure_csrf_cookie
-from django.views.decorators.http import require_POST, require_http_methods
+from django.views.decorators.http import require_POST
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from edx_when.api import get_date_for_block
@@ -77,9 +77,6 @@
 from common.djangoapps.util.views import require_global_staff  # pylint: disable=unused-import
 from lms.djangoapps.bulk_email.api import is_bulk_email_feature_enabled, create_course_email
 from lms.djangoapps.certificates import api as certs_api
-from lms.djangoapps.certificates.models import (
-    CertificateStatuses
-)
 from lms.djangoapps.course_home_api.toggles import course_home_mfe_progress_tab_is_active
 from lms.djangoapps.courseware.access import has_access
 from lms.djangoapps.courseware.courses import get_course_with_access
@@ -107,7 +104,18 @@
 from lms.djangoapps.instructor_task.data import InstructorTaskTypes
 from lms.djangoapps.instructor_task.models import ReportStore
 from lms.djangoapps.instructor.views.serializer import (
-    AccessSerializer, RoleNameSerializer, ShowStudentExtensionSerializer, UserSerializer
+    AccessSerializer,
+    BlockDueDateSerializer,
+    CertificateSerializer,
+    CertificateStatusesSerializer,
+    ListInstructorTaskInputSerializer,
+    ModifyAccessSerializer,
+    RoleNameSerializer,
+    SendEmailSerializer,
+    ShowStudentExtensionSerializer,
+    StudentAttemptsSerializer,
+    UserSerializer,
+    UniqueStudentIdentifierSerializer
 )
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort, is_course_cohorted
@@ -136,7 +144,6 @@
     handle_dashboard_error,
     keep_field_private,
     parse_datetime,
-    require_student_from_identifier,
     set_due_date_extension,
     strip_if_string,
 )
@@ -514,11 +521,13 @@ def post(self, request, course_id):  # pylint: disable=too-many-statements
                                 reason='Enrolling via csv upload',
                                 state_transition=UNENROLLED_TO_ENROLLED,
                             )
-                            enroll_email(course_id=course_id,
-                                         student_email=email,
-                                         auto_enroll=True,
-                                         email_students=notify_by_email,
-                                         email_params=email_params)
+                            enroll_email(
+                                course_id=course_id,
+                                student_email=email,
+                                auto_enroll=True,
+                                message_students=notify_by_email,
+                                message_params=email_params,
+                            )
                         else:
                             # update the course mode if already enrolled
                             existing_enrollment = CourseEnrollment.get_enrollment(user, course_id)
@@ -906,88 +915,91 @@ def students_update_enrollment(request, course_id):  # lint-amnesty, pylint: dis
     return JsonResponse(response_payload)
 
 
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CAN_BETATEST)
-@common_exceptions_400
-@require_post_params(
-    identifiers="stringified list of emails and/or usernames",
-    action="add or remove",
-)
-def bulk_beta_modify_access(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class BulkBetaModifyAccess(DeveloperErrorViewMixin, APIView):
     """
     Enroll or unenroll users in beta testing program.
-
-    Query parameters:
-    - identifiers is string containing a list of emails and/or usernames separated by
-      anything split_input_list can handle.
-    - action is one of ['add', 'remove']
     """
-    course_id = CourseKey.from_string(course_id)
-    action = request.POST.get('action')
-    identifiers_raw = request.POST.get('identifiers')
-    identifiers = _split_input_list(identifiers_raw)
-    email_students = _get_boolean_param(request, 'email_students')
-    auto_enroll = _get_boolean_param(request, 'auto_enroll')
-    results = []
-    rolename = 'beta'
-    course = get_course_by_id(course_id)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.CAN_BETATEST
+    serializer_class = ModifyAccessSerializer
 
-    email_params = {}
-    if email_students:
-        secure = request.is_secure()
-        email_params = get_email_params(course, auto_enroll=auto_enroll, secure=secure)
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        Query parameters:
+        - identifiers is string containing a list of emails and/or usernames separated by
+          anything split_input_list can handle.
+        - action is one of ['add', 'remove']
+        """
+        course_id = CourseKey.from_string(course_id)
+        serializer = self.serializer_class(data=request.data)
+        if not serializer.is_valid():
+            return JsonResponse({'message': serializer.errors}, status=400)
 
-    for identifier in identifiers:
-        try:
-            error = False
-            user_does_not_exist = False
-            user = get_student_from_identifier(identifier)
-            user_active = user.is_active
+        action = serializer.validated_data['action']
+        identifiers = serializer.validated_data['identifiers']
+        email_students = serializer.validated_data['email_students']
+        auto_enroll = serializer.validated_data['auto_enroll']
+
+        results = []
+        rolename = 'beta'
+        course = get_course_by_id(course_id)
 
-            if action == 'add':
-                allow_access(course, user, rolename)
-            elif action == 'remove':
-                revoke_access(course, user, rolename)
+        email_params = {}
+        if email_students:
+            secure = request.is_secure()
+            email_params = get_email_params(course, auto_enroll=auto_enroll, secure=secure)
+
+        for identifier in identifiers:
+            try:
+                error = False
+                user_does_not_exist = False
+                user = get_student_from_identifier(identifier)
+                user_active = user.is_active
+
+                if action == 'add':
+                    allow_access(course, user, rolename)
+                elif action == 'remove':
+                    revoke_access(course, user, rolename)
+                else:
+                    return HttpResponseBadRequest(strip_tags(
+                        f"Unrecognized action '{action}'"
+                    ))
+            except User.DoesNotExist:
+                error = True
+                user_does_not_exist = True
+                user_active = None
+            # catch and log any unexpected exceptions
+            # so that one error doesn't cause a 500.
+            except Exception as exc:  # pylint: disable=broad-except
+                log.exception("Error while #{}ing student")
+                log.exception(exc)
+                error = True
             else:
-                return HttpResponseBadRequest(strip_tags(
-                    f"Unrecognized action '{action}'"
-                ))
-        except User.DoesNotExist:
-            error = True
-            user_does_not_exist = True
-            user_active = None
-        # catch and log any unexpected exceptions
-        # so that one error doesn't cause a 500.
-        except Exception as exc:  # pylint: disable=broad-except
-            log.exception("Error while #{}ing student")
-            log.exception(exc)
-            error = True
-        else:
-            # If no exception thrown, see if we should send an email
-            if email_students:
-                send_beta_role_email(action, user, email_params)
-            # See if we should autoenroll the student
-            if auto_enroll:
-                # Check if student is already enrolled
-                if not is_user_enrolled_in_course(user, course_id):
-                    CourseEnrollment.enroll(user, course_id)
+                # If no exception thrown, see if we should send an email
+                if email_students:
+                    send_beta_role_email(action, user, email_params)
+                # See if we should autoenroll the student
+                if auto_enroll:
+                    # Check if student is already enrolled
+                    if not is_user_enrolled_in_course(user, course_id):
+                        CourseEnrollment.enroll(user, course_id)
 
-        finally:
-            # Tabulate the action result of this email address
-            results.append({
-                'identifier': identifier,
-                'error': error,  # pylint: disable=used-before-assignment
-                'userDoesNotExist': user_does_not_exist,  # pylint: disable=used-before-assignment
-                'is_active': user_active  # pylint: disable=used-before-assignment
-            })
+            finally:
+                # Tabulate the action result of this email address
+                results.append({
+                    'identifier': identifier,
+                    'error': error,  # pylint: disable=used-before-assignment
+                    'userDoesNotExist': user_does_not_exist,  # pylint: disable=used-before-assignment
+                    'is_active': user_active  # pylint: disable=used-before-assignment
+                })
 
-    response_payload = {
-        'action': action,
-        'results': results,
-    }
-    return JsonResponse(response_payload)
+        response_payload = {
+            'action': action,
+            'results': results,
+        }
+        return JsonResponse(response_payload)
 
 
 @method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
@@ -1017,7 +1029,6 @@ def post(self, request, course_id):
         course = get_course_with_access(
             request.user, 'instructor', course_id, depth=None
         )
-
         serializer_data = AccessSerializer(data=request.data)
         if not serializer_data.is_valid():
             return HttpResponseBadRequest(reason=serializer_data.errors)
@@ -1351,76 +1362,87 @@ def _get_problem_responses(request, *, course_id, problem_locations, problem_typ
     return JsonResponse({"status": success_status, "task_id": task.task_id})
 
 
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CAN_RESEARCH)
-def get_grading_config(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class GetGradingConfig(APIView):
     """
     Respond with json which contains a html formatted grade summary.
     """
-    course_id = CourseKey.from_string(course_id)
-    # course = get_course_with_access(
-    #     request.user, 'staff', course_id, depth=None
-    # )
-    course = get_course_by_id(course_id)
-
-    grading_config_summary = instructor_analytics_basic.dump_grading_context(course)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.CAN_RESEARCH
 
-    response_payload = {
-        'course_id': str(course_id),
-        'grading_config_summary': grading_config_summary,
-    }
-    return JsonResponse(response_payload)
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        Post method to return grading config.
+        """
+        course_id = CourseKey.from_string(course_id)
+        course = get_course_by_id(course_id)
+        grading_config_summary = instructor_analytics_basic.dump_grading_context(course)
+        response_payload = {
+            'course_id': str(course_id),
+            'grading_config_summary': grading_config_summary,
+        }
+        return JsonResponse(response_payload)
 
 
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.VIEW_ISSUED_CERTIFICATES)
-def get_issued_certificates(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class GetIssuedCertificates(APIView):
     """
     Responds with JSON if CSV is not required. contains a list of issued certificates.
-    Arguments:
-        course_id
-    Returns:
-        {"certificates": [{course_id: xyz, mode: 'honor'}, ...]}
-
     """
-    course_key = CourseKey.from_string(course_id)
-    csv_required = request.GET.get('csv', 'false')
-
-    query_features = ['course_id', 'mode', 'total_issued_certificate', 'report_run_date']
-    query_features_names = [
-        ('course_id', _('CourseID')),
-        ('mode', _('Certificate Type')),
-        ('total_issued_certificate', _('Total Certificates Issued')),
-        ('report_run_date', _('Date Report Run'))
-    ]
-    certificates_data = instructor_analytics_basic.issued_certificates(course_key, query_features)
-    if csv_required.lower() == 'true':
-        __, data_rows = instructor_analytics_csvs.format_dictlist(certificates_data, query_features)
-        return instructor_analytics_csvs.create_csv_response(
-            'issued_certificates.csv',
-            [col_header for __, col_header in query_features_names],
-            data_rows
-        )
-    else:
-        response_payload = {
-            'certificates': certificates_data,
-            'queried_features': query_features,
-            'feature_names': dict(query_features_names)
-        }
-        return JsonResponse(response_payload)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.VIEW_ISSUED_CERTIFICATES
 
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def post(self, request, course_id):
+        """
+        Arguments: course_id
+        Returns:
+            {"certificates": [{course_id: xyz, mode: 'honor'}, ...]}
+        """
+        return self.all_issued_certificates(request, course_id)
 
-@transaction.non_atomic_requests
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CAN_RESEARCH)
-@common_exceptions_400
-def get_students_features(request, course_id, csv=False):  # pylint: disable=redefined-outer-name
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def get(self, request, course_id):
+        return self.all_issued_certificates(request, course_id)
+
+    def all_issued_certificates(self, request, course_id):
+        """
+        common method for both post and get. This method will return all issued certificates.
+        """
+        course_key = CourseKey.from_string(course_id)
+        csv_required = request.GET.get('csv', 'false')
+
+        query_features = ['course_id', 'mode', 'total_issued_certificate', 'report_run_date']
+        query_features_names = [
+            ('course_id', _('CourseID')),
+            ('mode', _('Certificate Type')),
+            ('total_issued_certificate', _('Total Certificates Issued')),
+            ('report_run_date', _('Date Report Run'))
+        ]
+        certificates_data = instructor_analytics_basic.issued_certificates(course_key, query_features)
+        if csv_required.lower() == 'true':
+            __, data_rows = instructor_analytics_csvs.format_dictlist(certificates_data, query_features)
+            return instructor_analytics_csvs.create_csv_response(
+                'issued_certificates.csv',
+                [col_header for __, col_header in query_features_names],
+                data_rows
+            )
+        else:
+            response_payload = {
+                'certificates': certificates_data,
+                'queried_features': query_features,
+                'feature_names': dict(query_features_names)
+            }
+            return JsonResponse(response_payload)
+
+
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class GetStudentsFeatures(DeveloperErrorViewMixin, APIView):
     """
     Respond with json which contains a summary of all enrolled students profile information.
 
@@ -1429,86 +1451,108 @@ def get_students_features(request, course_id, csv=False):  # pylint: disable=red
 
     TO DO accept requests for different attribute sets.
     """
-    course_key = CourseKey.from_string(course_id)
-    course = get_course_by_id(course_key)
-    report_type = _('enrolled learner profile')
-    available_features = instructor_analytics_basic.AVAILABLE_FEATURES
-
-    # Allow for sites to be able to define additional columns.
-    # Note that adding additional columns has the potential to break
-    # the student profile report due to a character limit on the
-    # asynchronous job input which in this case is a JSON string
-    # containing the list of columns to include in the report.
-    # TODO: Refactor the student profile report code to remove the list of columns
-    # that should be included in the report from the asynchronous job input.
-    # We need to clone the list because we modify it below
-    query_features = list(configuration_helpers.get_value('student_profile_download_fields', []))
-
-    if not query_features:
-        query_features = [
-            'id', 'username', 'name', 'email', 'language', 'location',
-            'year_of_birth', 'gender', 'level_of_education', 'mailing_address',
-            'goals', 'enrollment_mode', 'last_login', 'date_joined', 'external_user_key'
-        ]
-    keep_field_private(query_features, 'year_of_birth')  # protected information
-
-    # Provide human-friendly and translatable names for these features. These names
-    # will be displayed in the table generated in data_download.js. It is not (yet)
-    # used as the header row in the CSV, but could be in the future.
-    query_features_names = {
-        'id': _('User ID'),
-        'username': _('Username'),
-        'name': _('Name'),
-        'email': _('Email'),
-        'language': _('Language'),
-        'location': _('Location'),
-        #  'year_of_birth': _('Birth Year'),  treated as privileged information as of TNL-10683, not to go in reports
-        'gender': _('Gender'),
-        'level_of_education': _('Level of Education'),
-        'mailing_address': _('Mailing Address'),
-        'goals': _('Goals'),
-        'enrollment_mode': _('Enrollment Mode'),
-        'last_login': _('Last Login'),
-        'date_joined': _('Date Joined'),
-        'external_user_key': _('External User Key'),
-    }
-
-    if is_course_cohorted(course.id):
-        # Translators: 'Cohort' refers to a group of students within a course.
-        query_features.append('cohort')
-        query_features_names['cohort'] = _('Cohort')
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.CAN_RESEARCH
 
-    if course.teams_enabled:
-        query_features.append('team')
-        query_features_names['team'] = _('Team')
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def post(self, request, course_id, csv=False):  # pylint: disable=redefined-outer-name
+        """
+        Handle POST requests to retrieve student profile information for a specific course.
 
-    # For compatibility reasons, city and country should always appear last.
-    query_features.append('city')
-    query_features_names['city'] = _('City')
-    query_features.append('country')
-    query_features_names['country'] = _('Country')
+        Args:
+            request: The HTTP request object.
+            course_id: The ID of the course for which to retrieve student information.
+            csv: Optional; if 'csv' is present in the URL, it indicates that the response should be in CSV format.
+            Defaults to None.
 
-    if not csv:
-        student_data = instructor_analytics_basic.enrolled_students_features(course_key, query_features)
-        response_payload = {
-            'course_id': str(course_key),
-            'students': student_data,
-            'students_count': len(student_data),
-            'queried_features': query_features,
-            'feature_names': query_features_names,
-            'available_features': available_features,
+        Returns:
+            Response: A JSON response containing student profile information, or CSV if the `csv` parameter is provided.
+        """
+        course_key = CourseKey.from_string(course_id)
+        course = get_course_by_id(course_key)
+        report_type = _('enrolled learner profile')
+        available_features = instructor_analytics_basic.AVAILABLE_FEATURES
+
+        # Allow for sites to be able to define additional columns.
+        # Note that adding additional columns has the potential to break
+        # the student profile report due to a character limit on the
+        # asynchronous job input which in this case is a JSON string
+        # containing the list of columns to include in the report.
+        # TODO: Refactor the student profile report code to remove the list of columns
+        # that should be included in the report from the asynchronous job input.
+        # We need to clone the list because we modify it below
+        query_features = list(configuration_helpers.get_value('student_profile_download_fields', []))
+
+        if not query_features:
+            query_features = [
+                'id', 'username', 'name', 'email', 'language', 'location',
+                'year_of_birth', 'gender', 'level_of_education', 'mailing_address',
+                'goals', 'enrollment_mode', 'last_login', 'date_joined', 'external_user_key'
+            ]
+        keep_field_private(query_features, 'year_of_birth')  # protected information
+
+        # Provide human-friendly and translatable names for these features. These names
+        # will be displayed in the table generated in data_download.js. It is not (yet)
+        # used as the header row in the CSV, but could be in the future.
+        query_features_names = {
+            'id': _('User ID'),
+            'username': _('Username'),
+            'name': _('Name'),
+            'email': _('Email'),
+            'language': _('Language'),
+            'location': _('Location'),
+            #  'year_of_birth': _('Birth Year'),  treated as privileged information as of TNL-10683,
+            #  not to go in reports
+            'gender': _('Gender'),
+            'level_of_education': _('Level of Education'),
+            'mailing_address': _('Mailing Address'),
+            'goals': _('Goals'),
+            'enrollment_mode': _('Enrollment Mode'),
+            'last_login': _('Last Login'),
+            'date_joined': _('Date Joined'),
+            'external_user_key': _('External User Key'),
         }
-        return JsonResponse(response_payload)
 
-    else:
-        task_api.submit_calculate_students_features_csv(
-            request,
-            course_key,
-            query_features
-        )
-        success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+        if is_course_cohorted(course.id):
+            # Translators: 'Cohort' refers to a group of students within a course.
+            query_features.append('cohort')
+            query_features_names['cohort'] = _('Cohort')
 
-        return JsonResponse({"status": success_status})
+        if course.teams_enabled:
+            query_features.append('team')
+            query_features_names['team'] = _('Team')
+
+        # For compatibility reasons, city and country should always appear last.
+        query_features.append('city')
+        query_features_names['city'] = _('City')
+        query_features.append('country')
+        query_features_names['country'] = _('Country')
+
+        if not csv:
+            student_data = instructor_analytics_basic.enrolled_students_features(course_key, query_features)
+            response_payload = {
+                'course_id': str(course_key),
+                'students': student_data,
+                'students_count': len(student_data),
+                'queried_features': query_features,
+                'feature_names': query_features_names,
+                'available_features': available_features,
+            }
+            return JsonResponse(response_payload)
+
+        else:
+            try:
+                task_api.submit_calculate_students_features_csv(
+                    request,
+                    course_key,
+                    query_features
+                )
+                success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+            except Exception as e:
+                raise self.api_error(status.HTTP_400_BAD_REQUEST, str(e), 'Requested task is already running')
+
+            return JsonResponse({"status": success_status})
 
 
 @method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
@@ -1635,6 +1679,7 @@ def post(self, request, course_key_string):
             task_api.submit_cohort_students(request, course_key, file_name)
         except (FileValidationException, ValueError) as e:
             raise self.api_error(status.HTTP_400_BAD_REQUEST, str(e), 'failed-validation')
+
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -1701,60 +1746,55 @@ def post(self, request, course_id):
         return JsonResponse({"status": success_status})
 
 
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.VIEW_ENROLLMENTS)
-@require_post_params(
-    unique_student_identifier="email or username of student for whom to get enrollment status"
-)
-def get_student_enrollment_status(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class GetStudentEnrollmentStatus(APIView):
     """
     Get the enrollment status of a student.
-    Limited to staff access.
-
-    Takes query parameter unique_student_identifier
     """
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.VIEW_ENROLLMENTS
 
-    error = ''
-    user = None
-    mode = None
-    is_active = None
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        Permission: Limited to staff access.
+        Takes query parameter unique_student_identifier
+        """
+        error = ''
+        mode = None
+        is_active = None
 
-    course_id = CourseKey.from_string(course_id)
-    unique_student_identifier = request.POST.get('unique_student_identifier')
+        course_id = CourseKey.from_string(course_id)
+        unique_student_identifier = request.data.get("unique_student_identifier")
 
-    try:
-        user = get_student_from_identifier(unique_student_identifier)
-        mode, is_active = CourseEnrollment.enrollment_mode_for_user(user, course_id)
-    except User.DoesNotExist:
-        # The student could have been invited to enroll without having
-        # registered. We'll also look at CourseEnrollmentAllowed
-        # records, so let the lack of a User slide.
-        pass
-
-    enrollment_status = _('Enrollment status for {student}: unknown').format(student=unique_student_identifier)
-
-    if user and mode:
-        if is_active:
-            enrollment_status = _('Enrollment status for {student}: active').format(student=user)
-        else:
-            enrollment_status = _('Enrollment status for {student}: inactive').format(student=user)
-    else:
-        email = user.email if user else unique_student_identifier
-        allowed = CourseEnrollmentAllowed.may_enroll_and_unenrolled(course_id)
-        if allowed and email in [cea.email for cea in allowed]:
-            enrollment_status = _('Enrollment status for {student}: pending').format(student=email)
+        serializer_data = UniqueStudentIdentifierSerializer(data=request.data)
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
+
+        user = serializer_data.validated_data.get('unique_student_identifier')
+        if user:
+            mode, is_active = CourseEnrollment.enrollment_mode_for_user(user, course_id)
+
+        if user and mode:
+            if is_active:
+                enrollment_status = _('Enrollment status for {student}: active').format(student=user)
+            else:
+                enrollment_status = _('Enrollment status for {student}: inactive').format(student=user)
         else:
-            enrollment_status = _('Enrollment status for {student}: never enrolled').format(student=email)
+            email = user.email if user else unique_student_identifier
+            allowed = CourseEnrollmentAllowed.may_enroll_and_unenrolled(course_id)
+            if allowed and email in [cea.email for cea in allowed]:
+                enrollment_status = _('Enrollment status for {student}: pending').format(student=email)
+            else:
+                enrollment_status = _('Enrollment status for {student}: never enrolled').format(student=email)
 
-    response_payload = {
-        'course_id': str(course_id),
-        'error': error,
-        'enrollment_status': enrollment_status
-    }
+        response_payload = {
+            'course_id': str(course_id),
+            'error': error,
+            'enrollment_status': enrollment_status
+        }
 
-    return JsonResponse(response_payload)
+        return JsonResponse(response_payload)
 
 
 class StudentProgressUrlSerializer(serializers.Serializer):
@@ -1816,23 +1856,24 @@ def post(self, request, course_id):
         return Response(serializer.data)
 
 
-@transaction.non_atomic_requests
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.GIVE_STUDENT_EXTENSION)
-@require_post_params(
-    problem_to_reset="problem urlname to reset"
-)
-@common_exceptions_400
-def reset_student_attempts(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class ResetStudentAttempts(DeveloperErrorViewMixin, APIView):
     """
-
     Resets a students attempts counter or starts a task to reset all students
     attempts counters. Optionally deletes student state for a problem. Limited
     to staff access. Some sub-methods limited to instructor access.
+    """
+    http_method_names = ['post']
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.GIVE_STUDENT_EXTENSION
+    serializer_class = StudentAttemptsSerializer
 
-    Takes some of the following query parameters
+    @method_decorator(ensure_csrf_cookie)
+    @transaction.non_atomic_requests
+    def post(self, request, course_id):
+        """
+        Takes some of the following query parameters
         - problem_to_reset is a urlname of a problem
         - unique_student_identifier is an email or username
         - all_students is a boolean
@@ -1842,65 +1883,74 @@ def reset_student_attempts(request, course_id):
         - delete_module is a boolean
             requires instructor access
             mutually exclusive with all_students
-    """
-    course_id = CourseKey.from_string(course_id)
-    course = get_course_with_access(
-        request.user, 'staff', course_id, depth=None
-    )
-    all_students = _get_boolean_param(request, 'all_students')
-
-    if all_students and not has_access(request.user, 'instructor', course):
-        return HttpResponseForbidden("Requires instructor access.")
+        """
+        course_id = CourseKey.from_string(course_id)
+        serializer_data = self.serializer_class(data=request.data)
 
-    problem_to_reset = strip_if_string(request.POST.get('problem_to_reset'))
-    student_identifier = request.POST.get('unique_student_identifier', None)
-    student = None
-    if student_identifier is not None:
-        student = get_student_from_identifier(student_identifier)
-    delete_module = _get_boolean_param(request, 'delete_module')
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
 
-    # parameter combinations
-    if all_students and student:
-        return HttpResponseBadRequest(
-            "all_students and unique_student_identifier are mutually exclusive."
-        )
-    if all_students and delete_module:
-        return HttpResponseBadRequest(
-            "all_students and delete_module are mutually exclusive."
+        course = get_course_with_access(
+            request.user, 'staff', course_id, depth=None
         )
 
-    try:
-        module_state_key = UsageKey.from_string(problem_to_reset).map_into_course(course_id)
-    except InvalidKeyError:
-        return HttpResponseBadRequest()
+        all_students = serializer_data.validated_data.get('all_students')
 
-    response_payload = {}
-    response_payload['problem_to_reset'] = problem_to_reset
+        if all_students and not has_access(request.user, 'instructor', course):
+            return HttpResponseForbidden("Requires instructor access.")
 
-    if student:
-        try:
-            enrollment.reset_student_attempts(
-                course_id,
-                student,
-                module_state_key,
-                requesting_user=request.user,
-                delete_module=delete_module
+        problem_to_reset = strip_if_string(serializer_data.validated_data.get('problem_to_reset'))
+        student_identifier = request.POST.get('unique_student_identifier', None)
+        student = serializer_data.validated_data.get('unique_student_identifier')
+        delete_module = serializer_data.validated_data.get('delete_module')
+
+        # parameter combinations
+        if all_students and student:
+            return HttpResponseBadRequest(
+                "all_students and unique_student_identifier are mutually exclusive."
+            )
+        if all_students and delete_module:
+            return HttpResponseBadRequest(
+                "all_students and delete_module are mutually exclusive."
             )
-        except StudentModule.DoesNotExist:
-            return HttpResponseBadRequest(_("Module does not exist."))
-        except sub_api.SubmissionError:
-            # Trust the submissions API to log the error
-            error_msg = _("An error occurred while deleting the score.")
-            return HttpResponse(error_msg, status=500)
-        response_payload['student'] = student_identifier
-    elif all_students:
-        task_api.submit_reset_problem_attempts_for_all_students(request, module_state_key)
-        response_payload['task'] = TASK_SUBMISSION_OK
-        response_payload['student'] = 'All Students'
-    else:
-        return HttpResponseBadRequest()
 
-    return JsonResponse(response_payload)
+        try:
+            module_state_key = UsageKey.from_string(problem_to_reset).map_into_course(course_id)
+        except InvalidKeyError:
+            return HttpResponseBadRequest()
+
+        response_payload = {}
+        response_payload['problem_to_reset'] = problem_to_reset
+
+        if student:
+            try:
+                enrollment.reset_student_attempts(
+                    course_id,
+                    student,
+                    module_state_key,
+                    requesting_user=request.user,
+                    delete_module=delete_module
+                )
+            except StudentModule.DoesNotExist:
+                return HttpResponseBadRequest(_("Module does not exist."))
+            except sub_api.SubmissionError:
+                # Trust the submissions API to log the error
+                error_msg = _("An error occurred while deleting the score.")
+                return HttpResponse(error_msg, status=500)
+            response_payload['student'] = student_identifier
+
+        elif all_students:
+            try:
+                task_api.submit_reset_problem_attempts_for_all_students(request, module_state_key)
+                response_payload['task'] = TASK_SUBMISSION_OK
+                response_payload['student'] = 'All Students'
+            except Exception:  # pylint: disable=broad-except
+                error_msg = _("An error occurred while attempting to reset for all students.")
+                return HttpResponse(error_msg, status=500)
+        else:
+            return HttpResponseBadRequest()
+
+        return JsonResponse(response_payload)
 
 
 @transaction.non_atomic_requests
@@ -1937,8 +1987,10 @@ def reset_student_attempts_for_entrance_exam(request, course_id):
 
     student_identifier = request.POST.get('unique_student_identifier', None)
     student = None
+
     if student_identifier is not None:
         student = get_student_from_identifier(student_identifier)
+
     all_students = _get_boolean_param(request, 'all_students')
     delete_module = _get_boolean_param(request, 'delete_module')
 
@@ -2360,9 +2412,8 @@ def get(self, request, course_id):
         return _list_instructor_tasks(request=request, course_id=course_id)
 
 
-@require_POST
-@ensure_csrf_cookie
-def list_instructor_tasks(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class ListInstructorTasks(APIView):
     """
     List instructor tasks.
 
@@ -2372,21 +2423,44 @@ def list_instructor_tasks(request, course_id):
         - `problem_location_str` and `unique_student_identifier` lists task
             history for problem AND student (intersection)
     """
-    return _list_instructor_tasks(request=request, course_id=course_id)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.SHOW_TASKS
+    serializer_class = ListInstructorTaskInputSerializer
+
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        List instructor tasks.
+        """
+        serializer = self.serializer_class(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        return _list_instructor_tasks(
+            request=request, course_id=course_id, serialize_data=serializer.validated_data
+        )
 
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_course_permission(permissions.SHOW_TASKS)
-def _list_instructor_tasks(request, course_id):
+def _list_instructor_tasks(request, course_id, serialize_data=None):
     """
     List instructor tasks.
 
     Internal function with common code for both DRF and and tradition views.
     """
+    # This method is also used by other APIs with the GET method.
+    # The query_params attribute is utilized for GET requests,
+    # where parameters are passed as query strings.
+
     course_id = CourseKey.from_string(course_id)
-    params = getattr(request, 'query_params', request.POST)
-    problem_location_str = strip_if_string(params.get('problem_location_str', False))
-    student = params.get('unique_student_identifier', None)
+    if serialize_data is not None:
+        problem_location_str = strip_if_string(serialize_data.get('problem_location_str', False))
+        student = serialize_data.get('unique_student_identifier', None)
+    else:
+        params = getattr(request, 'query_params', request.POST)
+        problem_location_str = strip_if_string(params.get('problem_location_str', False))
+        student = params.get('unique_student_identifier', None)
+
     if student is not None:
         student = get_student_from_identifier(student)
 
@@ -2540,16 +2614,22 @@ def get(self, request, course_id):
         return _list_report_downloads(request=request, course_id=course_id)
 
 
-@require_POST
-@ensure_csrf_cookie
-def list_report_downloads(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class ListReportDownloads(APIView):
+
     """
     List grade CSV files that are available for download for this course.
 
     Takes the following query parameters:
     - (optional) report_name - name of the report
     """
-    return _list_report_downloads(request=request, course_id=course_id)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.CAN_RESEARCH
+
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+
+        return _list_report_downloads(request=request, course_id=course_id)
 
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
@@ -2763,81 +2843,96 @@ def extract_user_info(user):
     return JsonResponse(response_payload)
 
 
-@transaction.non_atomic_requests
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.EMAIL)
-@require_post_params(send_to="sending to whom", subject="subject line", message="message text")
-@common_exceptions_400
-def send_email(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class SendEmail(DeveloperErrorViewMixin, APIView):
     """
     Send an email to self, staff, cohorts, or everyone involved in a course.
-    Query Parameters:
-    - 'send_to' specifies what group the email should be sent to
-       Options are defined by the CourseEmail model in
-       lms/djangoapps/bulk_email/models.py
-    - 'subject' specifies email's subject
-    - 'message' specifies email's content
     """
-    course_id = CourseKey.from_string(course_id)
-    course_overview = CourseOverview.get_from_id(course_id)
+    http_method_names = ['post']
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.EMAIL
+    serializer_class = SendEmailSerializer
 
-    if not is_bulk_email_feature_enabled(course_id):
-        log.warning(f"Email is not enabled for course {course_id}")
-        return HttpResponseForbidden("Email is not enabled for this course.")
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def post(self, request, course_id):
+        """
+        Query Parameters:
+        - 'send_to' specifies what group the email should be sent to
+           Options are defined by the CourseEmail model in
+           lms/djangoapps/bulk_email/models.py
+        - 'subject' specifies email's subject
+        - 'message' specifies email's content
+        """
+        course_id = CourseKey.from_string(course_id)
+        course_overview = CourseOverview.get_from_id(course_id)
 
-    targets = json.loads(request.POST.get("send_to"))
-    subject = request.POST.get("subject")
-    message = request.POST.get("message")
-    # optional, this is a date and time in the form of an ISO8601 string
-    schedule = request.POST.get("schedule", "")
+        if not is_bulk_email_feature_enabled(course_id):
+            log.warning(f"Email is not enabled for course {course_id}")
+            return HttpResponseForbidden("Email is not enabled for this course.")
 
-    schedule_dt = None
-    if schedule:
-        try:
-            # convert the schedule from a string to a datetime, then check if its a valid future date and time, dateutil
-            # will throw a ValueError if the schedule is no good.
-            schedule_dt = dateutil.parser.parse(schedule).replace(tzinfo=pytz.utc)
-            if schedule_dt < datetime.datetime.now(pytz.utc):
-                raise ValueError("the requested schedule is in the past")
-        except ValueError as value_error:
-            error_message = (
-                f"Error occurred creating a scheduled bulk email task. Schedule provided: '{schedule}'. Error: "
-                f"{value_error}"
-            )
-            log.error(error_message)
-            return HttpResponseBadRequest(error_message)
+        serializer_data = self.serializer_class(data=request.data)
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
 
-    # Retrieve the customized email "from address" and email template from site configuration for the course/partner. If
-    # there is no site configuration enabled for the current site then we use system defaults for both.
-    from_addr = _get_branded_email_from_address(course_overview)
-    template_name = _get_branded_email_template(course_overview)
+        # Skipping serializer validation to avoid potential disruptions.
+        # The API handles numerous input variations, and changes here could introduce breaking issues.
 
-    # Create the CourseEmail object. This is saved immediately so that any transaction that has been pending up to this
-    # point will also be committed.
-    try:
-        email = create_course_email(
-            course_id,
-            request.user,
-            targets,
-            subject,
-            message,
-            template_name=template_name,
-            from_addr=from_addr,
-        )
-    except ValueError as err:
-        return HttpResponseBadRequest(repr(err))
+        targets = json.loads(request.POST.get("send_to"))
 
-    # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
-    task_api.submit_bulk_course_email(request, course_id, email.id, schedule_dt)
+        subject = serializer_data.validated_data.get("subject")
+        message = serializer_data.validated_data.get("message")
+        # optional, this is a date and time in the form of an ISO8601 string
+        schedule = serializer_data.validated_data.get("schedule", "")
 
-    response_payload = {
-        'course_id': str(course_id),
-        'success': True,
-    }
+        schedule_dt = None
+        if schedule:
+            try:
+                # convert the schedule from a string to a datetime, then check if its a
+                # valid future date and time, dateutil
+                # will throw a ValueError if the schedule is no good.
+                schedule_dt = dateutil.parser.parse(schedule).replace(tzinfo=pytz.utc)
+                if schedule_dt < datetime.datetime.now(pytz.utc):
+                    raise ValueError("the requested schedule is in the past")
+            except ValueError as value_error:
+                error_message = (
+                    f"Error occurred creating a scheduled bulk email task. Schedule provided: '{schedule}'. Error: "
+                    f"{value_error}"
+                )
+                log.error(error_message)
+                return HttpResponseBadRequest(error_message)
 
-    return JsonResponse(response_payload)
+        # Retrieve the customized email "from address" and email template from site configuration for the c
+        # ourse/partner.
+        # If there is no site configuration enabled for the current site then we use system defaults for both.
+        from_addr = _get_branded_email_from_address(course_overview)
+        template_name = _get_branded_email_template(course_overview)
+
+        # Create the CourseEmail object. This is saved immediately so that any transaction that has been
+        # pending up to this point will also be committed.
+        try:
+            email = create_course_email(
+                course_id,
+                request.user,
+                targets,
+                subject,
+                message,
+                template_name=template_name,
+                from_addr=from_addr,
+            )
+        except ValueError as err:
+            return HttpResponseBadRequest(repr(err))
+
+        # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
+        task_api.submit_bulk_course_email(request, course_id, email.id, schedule_dt)
+
+        response_payload = {
+            'course_id': str(course_id),
+            'success': True,
+        }
+
+        return JsonResponse(response_payload)
 
 
 @require_POST
@@ -2933,61 +3028,105 @@ def _display_unit(unit):
         return str(unit.location)
 
 
-@handle_dashboard_error
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.GIVE_STUDENT_EXTENSION)
-@require_post_params('student', 'url', 'due_datetime')
-def change_due_date(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class ChangeDueDate(APIView):
     """
     Grants a due date extension to a student for a particular unit.
     """
-    course = get_course_by_id(CourseKey.from_string(course_id))
-    student = require_student_from_identifier(request.POST.get('student'))
-    unit = find_unit(course, request.POST.get('url'))
-    due_date = parse_datetime(request.POST.get('due_datetime'))
-    reason = strip_tags(request.POST.get('reason', ''))
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.GIVE_STUDENT_EXTENSION
+    serializer_class = BlockDueDateSerializer
 
-    set_due_date_extension(course, unit, student, due_date, request.user, reason=reason)
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        Grants a due date extension to a student for a particular unit.
 
-    return JsonResponse(_(
-        'Successfully changed due date for student {0} for {1} '
-        'to {2}').format(student.profile.name, _display_unit(unit),
-                         due_date.strftime('%Y-%m-%d %H:%M')))
+        params:
+            url (str): The URL related to the block that needs the due date update.
+            due_datetime (str): The new due date and time for the block.
+            student (str): The email or username of the student whose access is being modified.
+        """
+        serializer_data = self.serializer_class(data=request.data)
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
 
+        student = serializer_data.validated_data.get('student')
+        if not student:
+            response_payload = {
+                'error': f'Could not find student matching identifier: {request.data.get("student")}'
+            }
+            return JsonResponse(response_payload)
 
-@handle_dashboard_error
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.GIVE_STUDENT_EXTENSION)
-@require_post_params('student', 'url')
-def reset_due_date(request, course_id):
+        course = get_course_by_id(CourseKey.from_string(course_id))
+
+        unit = find_unit(course, serializer_data.validated_data.get('url'))
+        due_date = parse_datetime(serializer_data.validated_data.get('due_datetime'))
+        reason = strip_tags(serializer_data.validated_data.get('reason', ''))
+        try:
+            set_due_date_extension(course, unit, student, due_date, request.user, reason=reason)
+        except Exception as error:  # pylint: disable=broad-except
+            return JsonResponse({'error': str(error)}, status=400)
+
+        return JsonResponse(_(
+            'Successfully changed due date for student {0} for {1} '
+            'to {2}').format(student.profile.name, _display_unit(unit),
+                             due_date.strftime('%Y-%m-%d %H:%M')))
+
+
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class ResetDueDate(APIView):
     """
     Rescinds a due date extension for a student on a particular unit.
     """
-    course = get_course_by_id(CourseKey.from_string(course_id))
-    student = require_student_from_identifier(request.POST.get('student'))
-    unit = find_unit(course, request.POST.get('url'))
-    reason = strip_tags(request.POST.get('reason', ''))
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.GIVE_STUDENT_EXTENSION
+    serializer_class = BlockDueDateSerializer
 
-    version = getattr(course, 'course_version', None)
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        reset a due date extension to a student for a particular unit.
+        params:
+            url (str): The URL related to the block that needs the due date update.
+            student (str): The email or username of the student whose access is being modified.
+            reason (str): Optional param.
+        """
+        serializer_data = self.serializer_class(data=request.data, context={'disable_due_datetime': True})
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
 
-    original_due_date = get_date_for_block(course_id, unit.location, published_version=version)
+        student = serializer_data.validated_data.get('student')
+        if not student:
+            response_payload = {
+                'error': f'Could not find student matching identifier: {request.data.get("student")}'
+            }
+            return JsonResponse(response_payload)
 
-    set_due_date_extension(course, unit, student, None, request.user, reason=reason)
-    if not original_due_date:
-        # It's possible the normal due date was deleted after an extension was granted:
-        return JsonResponse(
-            _("Successfully removed invalid due date extension (unit has no due date).")
-        )
+        course = get_course_by_id(CourseKey.from_string(course_id))
+        unit = find_unit(course, serializer_data.validated_data.get('url'))
+        reason = strip_tags(serializer_data.validated_data.get('reason', ''))
+
+        version = getattr(course, 'course_version', None)
+
+        original_due_date = get_date_for_block(course_id, unit.location, published_version=version)
+
+        try:
+            set_due_date_extension(course, unit, student, None, request.user, reason=reason)
+            if not original_due_date:
+                # It's possible the normal due date was deleted after an extension was granted:
+                return JsonResponse(
+                    _("Successfully removed invalid due date extension (unit has no due date).")
+                )
+
+            original_due_date_str = original_due_date.strftime('%Y-%m-%d %H:%M')
+            return JsonResponse(_(
+                'Successfully reset due date for student {0} for {1} '
+                'to {2}').format(student.profile.name, _display_unit(unit),
+                                 original_due_date_str))
 
-    original_due_date_str = original_due_date.strftime('%Y-%m-%d %H:%M')
-    return JsonResponse(_(
-        'Successfully reset due date for student {0} for {1} '
-        'to {2}').format(student.profile.name, _display_unit(unit),
-                         original_due_date_str))
+        except Exception as error:  # pylint: disable=broad-except
+            return JsonResponse({'error': str(error)}, status=400)
 
 
 @handle_dashboard_error
@@ -3107,130 +3246,193 @@ def enable_certificate_generation(request, course_id=None):
     return redirect(_instructor_dash_url(course_key, section='certificates'))
 
 
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.ALLOW_STUDENT_TO_BYPASS_ENTRANCE_EXAM)
-@require_POST
-def mark_student_can_skip_entrance_exam(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+class MarkStudentCanSkipEntranceExam(APIView):
     """
     Mark a student to skip entrance exam.
-    Takes `unique_student_identifier` as required POST parameter.
     """
-    course_id = CourseKey.from_string(course_id)
-    student_identifier = request.POST.get('unique_student_identifier')
-    student = get_student_from_identifier(student_identifier)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.ALLOW_STUDENT_TO_BYPASS_ENTRANCE_EXAM
 
-    __, created = EntranceExamConfiguration.objects.get_or_create(user=student, course_id=course_id)
-    if created:
-        message = _('This student (%s) will skip the entrance exam.') % student_identifier
-    else:
-        message = _('This student (%s) is already allowed to skip the entrance exam.') % student_identifier
-    response_payload = {
-        'message': message,
-    }
-    return JsonResponse(response_payload)
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        Takes `unique_student_identifier` as required POST parameter.
+        """
+        course_id = CourseKey.from_string(course_id)
+        student_identifier = request.data.get("unique_student_identifier")
 
+        serializer_data = UniqueStudentIdentifierSerializer(data=request.data)
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
 
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.START_CERTIFICATE_GENERATION)
-@require_POST
-@common_exceptions_400
-def start_certificate_generation(request, course_id):
+        student = serializer_data.validated_data.get('unique_student_identifier')
+        if not student:
+            response_payload = f'Could not find student matching : {student_identifier}'
+            return JsonResponse({'error': response_payload}, status=400)
+
+        __, created = EntranceExamConfiguration.objects.get_or_create(user=student, course_id=course_id)
+        if created:
+            message = _('This student (%s) will skip the entrance exam.') % student_identifier
+        else:
+            message = _('This student (%s) is already allowed to skip the entrance exam.') % student_identifier
+        response_payload = {
+            'message': message,
+        }
+        return JsonResponse(response_payload)
+
+
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class StartCertificateGeneration(DeveloperErrorViewMixin, APIView):
     """
     Start generating certificates for all students enrolled in given course.
     """
-    course_key = CourseKey.from_string(course_id)
-    task = task_api.generate_certificates_for_students(request, course_key)
-    message = _('Certificate generation task for all students of this course has been started. '
-                'You can view the status of the generation task in the "Pending Tasks" section.')
-    response_payload = {
-        'message': message,
-        'task_id': task.task_id
-    }
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.START_CERTIFICATE_GENERATION
 
-    return JsonResponse(response_payload)
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def post(self, request, course_id):
+        """
+         Generating certificates for all students enrolled in given course.
+        """
+        course_key = CourseKey.from_string(course_id)
+        task = task_api.generate_certificates_for_students(request, course_key)
+        message = _('Certificate generation task for all students of this course has been started. '
+                    'You can view the status of the generation task in the "Pending Tasks" section.')
+        response_payload = {
+            'message': message,
+            'task_id': task.task_id
+        }
 
+        return JsonResponse(response_payload)
 
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.START_CERTIFICATE_REGENERATION)
-@require_POST
-@common_exceptions_400
-def start_certificate_regeneration(request, course_id):
+
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class StartCertificateRegeneration(DeveloperErrorViewMixin, APIView):
     """
     Start regenerating certificates for students whose certificate statuses lie with in 'certificate_statuses'
     entry in POST data.
     """
-    course_key = CourseKey.from_string(course_id)
-    certificates_statuses = request.POST.getlist('certificate_statuses', [])
-    if not certificates_statuses:
-        return JsonResponse(
-            {'message': _('Please select one or more certificate statuses that require certificate regeneration.')},
-            status=400
-        )
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.START_CERTIFICATE_REGENERATION
+    serializer_class = CertificateStatusesSerializer
+    http_method_names = ['post']
 
-    # Check if the selected statuses are allowed
-    allowed_statuses = [
-        CertificateStatuses.downloadable,
-        CertificateStatuses.error,
-        CertificateStatuses.notpassing,
-        CertificateStatuses.audit_passing,
-        CertificateStatuses.audit_notpassing,
-    ]
-    if not set(certificates_statuses).issubset(allowed_statuses):
-        return JsonResponse(
-            {'message': _('Please select certificate statuses from the list only.')},
-            status=400
-        )
+    @method_decorator(transaction.non_atomic_requests, name='dispatch')
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        certificate_statuses 'certificate_statuses' in POST data.
+        """
+        course_key = CourseKey.from_string(course_id)
+        serializer = self.serializer_class(data=request.data)
 
-    task_api.regenerate_certificates(request, course_key, certificates_statuses)
-    response_payload = {
-        'message': _('Certificate regeneration task has been started. '
-                     'You can view the status of the generation task in the "Pending Tasks" section.'),
-        'success': True
-    }
-    return JsonResponse(response_payload)
+        if not serializer.is_valid():
+            return JsonResponse(
+                {'message': _('Please select certificate statuses from the list only.')},
+                status=400
+            )
 
+        certificates_statuses = serializer.validated_data['certificate_statuses']
+        task_api.regenerate_certificates(request, course_key, certificates_statuses)
+        response_payload = {
+            'message': _('Certificate regeneration task has been started. '
+                         'You can view the status of the generation task in the "Pending Tasks" section.'),
+            'success': True
+        }
+        return JsonResponse(response_payload)
 
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CERTIFICATE_EXCEPTION_VIEW)
-@require_http_methods(['POST', 'DELETE'])
-def certificate_exception_view(request, course_id):
+
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class CertificateExceptionView(DeveloperErrorViewMixin, APIView):
     """
     Add/Remove students to/from the certificate allowlist.
-
-    :param request: HttpRequest object
-    :param course_id: course identifier of the course for whom to add/remove certificates exception.
-    :return: JsonResponse object with success/error message or certificate exception data.
     """
-    course_key = CourseKey.from_string(course_id)
-    # Validate request data and return error response in case of invalid data
-    try:
-        certificate_exception, student = parse_request_data_and_get_user(request)
-    except ValueError as error:
-        return JsonResponse({'success': False, 'message': str(error)}, status=400)
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.CERTIFICATE_EXCEPTION_VIEW
+    serializer_class = CertificateSerializer
+    http_method_names = ['post', 'delete']
+
+    @method_decorator(transaction.non_atomic_requests, name='dispatch')
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id):
+        """
+        Add certificate exception for a student.
+        """
+        return self._handle_certificate_exception(request, course_id, action="post")
+
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def delete(self, request, course_id):
+        """
+        Remove certificate exception for a student.
+        """
+        return self._handle_certificate_exception(request, course_id, action="delete")
+
+    def _handle_certificate_exception(self, request, course_id, action):
+        """
+        Handles adding or removing certificate exceptions.
+        """
+        course_key = CourseKey.from_string(course_id)
+        try:
+            data = request.data
+        except Exception:  # pylint: disable=broad-except
+            return JsonResponse(
+                {
+                    'success': False,
+                    'message':
+                        _('The record is not in the correct format. Please add a valid username or email address.')},
+                status=400
+            )
+
+        # Extract and validate the student information
+        student, error_response = self._get_and_validate_user(data)
+
+        if error_response:
+            return error_response
 
-    # Add new Certificate Exception for the student passed in request data
-    if request.method == 'POST':
         try:
-            exception = add_certificate_exception(course_key, student, certificate_exception)
+            if action == "post":
+                exception = add_certificate_exception(course_key, student, data)
+                return JsonResponse(exception)
+            elif action == "delete":
+                remove_certificate_exception(course_key, student)
+                return JsonResponse({}, status=204)
         except ValueError as error:
             return JsonResponse({'success': False, 'message': str(error)}, status=400)
-        return JsonResponse(exception)
 
-    # Remove Certificate Exception for the student passed in request data
-    elif request.method == 'DELETE':
+    def _get_and_validate_user(self, raw_data):
+        """
+        Extracts the user data from the request and validates the student.
+        """
+        # This is only happening in case of delete.
+        # because content-type is coming as x-www-form-urlencoded from front-end.
+        if isinstance(raw_data, QueryDict):
+            raw_data = list(raw_data.keys())[0]
+            try:
+                raw_data = json.loads(raw_data)
+            except Exception as error:  # pylint: disable=broad-except
+                return None, JsonResponse({'success': False, 'message': str(error)}, status=400)
+
         try:
-            remove_certificate_exception(course_key, student)
+            user_data = raw_data.get('user_name', '') or raw_data.get('user_email', '')
         except ValueError as error:
-            return JsonResponse({'success': False, 'message': str(error)}, status=400)
+            return None, JsonResponse({'success': False, 'message': str(error)}, status=400)
 
-        return JsonResponse({}, status=204)
+        serializer_data = self.serializer_class(data={'user': user_data})
+        if not serializer_data.is_valid():
+            return None, JsonResponse({'success': False, 'message': serializer_data.errors}, status=400)
+
+        student = serializer_data.validated_data.get('user')
+        if not student:
+            response_payload = f'{user_data} does not exist in the LMS. Please check your spelling and retry.'
+            return None, JsonResponse({'success': False, 'message': response_payload}, status=400)
+
+        return student, None
 
 
 def add_certificate_exception(course_key, student, certificate_exception):
@@ -3357,48 +3559,52 @@ def get_student(username_or_email):
     return student
 
 
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.GENERATE_CERTIFICATE_EXCEPTIONS)
-@require_POST
-@common_exceptions_400
-def generate_certificate_exceptions(request, course_id, generate_for=None):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class GenerateCertificateExceptions(DeveloperErrorViewMixin, APIView):
     """
     Generate Certificate for students on the allowlist.
-
-    :param request: HttpRequest object,
-    :param course_id: course identifier of the course for whom to generate certificates
-    :param generate_for: string to identify whether to generate certificates for 'all' or 'new'
-            additions to the allowlist
-    :return: JsonResponse object containing success/failure message and certificate exception data
     """
-    course_key = CourseKey.from_string(course_id)
 
-    if generate_for == 'all':
-        # Generate Certificates for all allowlisted students
-        students = 'all_allowlisted'
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.GENERATE_CERTIFICATE_EXCEPTIONS
 
-    elif generate_for == 'new':
-        students = 'allowlisted_not_generated'
+    @method_decorator(transaction.non_atomic_requests)
+    @method_decorator(ensure_csrf_cookie)
+    def post(self, request, course_id, generate_for=None):
+        """
+        :param request: HttpRequest object,
+        :param course_id: course identifier of the course for whom to generate certificates
+        :param generate_for: string to identify whether to generate certificates for 'all' or 'new'
+                additions to the allowlist
+        :return: JsonResponse object containing success/failure message and certificate exception data
+        """
+        course_key = CourseKey.from_string(course_id)
 
-    else:
-        # Invalid data, generate_for must be present for all certificate exceptions
-        return JsonResponse(
-            {
-                'success': False,
-                'message': _('Invalid data, generate_for must be "new" or "all".'),
-            },
-            status=400
-        )
+        if generate_for == 'all':
+            # Generate Certificates for all allowlisted students
+            students = 'all_allowlisted'
 
-    task_api.generate_certificates_for_students(request, course_key, student_set=students)
-    response_payload = {
-        'success': True,
-        'message': _('Certificate generation started for students on the allowlist.'),
-    }
+        elif generate_for == 'new':
+            students = 'allowlisted_not_generated'
 
-    return JsonResponse(response_payload)
+        else:
+            # Invalid data, generate_for must be present for all certificate exceptions
+            return JsonResponse(
+                {
+                    'success': False,
+                    'message': _('Invalid data, generate_for must be "new" or "all".'),
+                },
+                status=400
+            )
+
+        task_api.generate_certificates_for_students(request, course_key, student_set=students)
+        response_payload = {
+            'success': True,
+            'message': _('Certificate generation started for students on the allowlist.'),
+        }
+
+        return JsonResponse(response_payload)
 
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
@@ -3506,12 +3712,9 @@ def build_row_errors(key, _user, row_count):
     return JsonResponse(results)
 
 
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CERTIFICATE_INVALIDATION_VIEW)
-@require_http_methods(['POST', 'DELETE'])
-def certificate_invalidation_view(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class CertificateInvalidationView(APIView):
     """
     Invalidate/Re-Validate students to/from certificate.
 
@@ -3519,17 +3722,39 @@ def certificate_invalidation_view(request, course_id):
     :param course_id: course identifier of the course for whom to add/remove certificates exception.
     :return: JsonResponse object with success/error message or certificate invalidation data.
     """
-    course_key = CourseKey.from_string(course_id)
-    # Validate request data and return error response in case of invalid data
-    try:
-        certificate_invalidation_data = parse_request_data(request)
-        student = _get_student_from_request_data(certificate_invalidation_data)
-        certificate = _get_certificate_for_user(course_key, student)
-    except ValueError as error:
-        return JsonResponse({'message': str(error)}, status=400)
-
-    # Invalidate certificate of the given student for the course course
-    if request.method == 'POST':
+    permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+    permission_name = permissions.CERTIFICATE_INVALIDATION_VIEW
+    serializer_class = CertificateSerializer
+    http_method_names = ['post', 'delete']
+
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def post(self, request, course_id):
+        """
+         Invalidate/Re-Validate students to/from certificate.
+        """
+        course_key = CourseKey.from_string(course_id)
+        # Validate request data and return error response in case of invalid data
+        serializer_data = self.serializer_class(data=request.data)
+        if not serializer_data.is_valid():
+            # return HttpResponseBadRequest(reason=serializer_data.errors)
+            return JsonResponse({'message': serializer_data.errors}, status=400)
+
+        student = serializer_data.validated_data.get('user')
+        notes = serializer_data.validated_data.get('notes')
+
+        if not student:
+            invalid_user = request.data.get('user')
+            response_payload = f'{invalid_user} does not exist in the LMS. Please check your spelling and retry.'
+
+            return JsonResponse({'message': response_payload}, status=400)
+
+        try:
+            certificate = _get_certificate_for_user(course_key, student)
+        except Exception as ex:  # pylint: disable=broad-except
+            return JsonResponse({'message': str(ex)}, status=400)
+
+        # Invalidate certificate of the given student for the course course
         try:
             if certs_api.is_on_allowlist(student, course_key):
                 log.warning(f"Invalidating certificate for student {student.id} in course {course_key} failed. "
@@ -3542,15 +3767,39 @@ def certificate_invalidation_view(request, course_id):
             certificate_invalidation = invalidate_certificate(
                 request,
                 certificate,
-                certificate_invalidation_data,
+                notes,
                 student
             )
+
         except ValueError as error:
             return JsonResponse({'message': str(error)}, status=400)
         return JsonResponse(certificate_invalidation)
 
-    # Re-Validate student certificate for the course course
-    elif request.method == 'DELETE':
+    @method_decorator(ensure_csrf_cookie)
+    @method_decorator(transaction.non_atomic_requests)
+    def delete(self, request, course_id):
+        """
+        Invalidate/Re-Validate students to/from certificate.
+        """
+        # Re-Validate student certificate for the course course
+        course_key = CourseKey.from_string(course_id)
+        try:
+            data = json.loads(self.request.body.decode('utf8') or '{}')
+        except Exception:  # pylint: disable=broad-except
+            data = {}
+
+        serializer_data = self.serializer_class(data=data)
+
+        if not serializer_data.is_valid():
+            return HttpResponseBadRequest(reason=serializer_data.errors)
+
+        student = serializer_data.validated_data.get('user')
+
+        try:
+            certificate = _get_certificate_for_user(course_key, student)
+        except Exception as ex:  # pylint: disable=broad-except
+            return JsonResponse({'message': str(ex)}, status=400)
+
         try:
             re_validate_certificate(request, course_key, certificate, student)
         except ValueError as error:
@@ -3559,13 +3808,13 @@ def certificate_invalidation_view(request, course_id):
         return JsonResponse({}, status=204)
 
 
-def invalidate_certificate(request, generated_certificate, certificate_invalidation_data, student):
+def invalidate_certificate(request, generated_certificate, notes, student):
     """
     Invalidate given GeneratedCertificate and add CertificateInvalidation record for future reference or re-validation.
 
     :param request: HttpRequest object
     :param generated_certificate: GeneratedCertificate object, the certificate we want to invalidate
-    :param certificate_invalidation_data: dict object containing data for CertificateInvalidation.
+    :param notes: notes values.
     :param student: User object, this user is tied to the generated_certificate we are going to invalidate
     :return: dict object containing updated certificate invalidation data.
     """
@@ -3588,7 +3837,7 @@ def invalidate_certificate(request, generated_certificate, certificate_invalidat
     certificate_invalidation = certs_api.create_certificate_invalidation_entry(
         generated_certificate,
         request.user,
-        certificate_invalidation_data.get("notes", ""),
+        notes,
     )
 
     # Invalidate the certificate
@@ -3599,7 +3848,7 @@ def invalidate_certificate(request, generated_certificate, certificate_invalidat
         'user': student.username,
         'invalidated_by': certificate_invalidation.invalidated_by.username,
         'created': certificate_invalidation.created.strftime("%B %d, %Y"),
-        'notes': certificate_invalidation.notes,
+        'notes': notes,
     }
 
 
diff --git a/lms/djangoapps/instructor/views/api_urls.py b/lms/djangoapps/instructor/views/api_urls.py
index 14fe15c83c2e..6f67a1a6863c 100644
--- a/lms/djangoapps/instructor/views/api_urls.py
+++ b/lms/djangoapps/instructor/views/api_urls.py
@@ -25,16 +25,17 @@
     path('register_and_enroll_students', api.RegisterAndEnrollStudents.as_view(), name='register_and_enroll_students'),
     path('list_course_role_members', api.ListCourseRoleMembersView.as_view(), name='list_course_role_members'),
     path('modify_access', api.ModifyAccess.as_view(), name='modify_access'),
-    path('bulk_beta_modify_access', api.bulk_beta_modify_access, name='bulk_beta_modify_access'),
+    path('bulk_beta_modify_access', api.BulkBetaModifyAccess.as_view(), name='bulk_beta_modify_access'),
     path('get_problem_responses', api.get_problem_responses, name='get_problem_responses'),
-    path('get_grading_config', api.get_grading_config, name='get_grading_config'),
-    re_path(r'^get_students_features(?P<csv>/csv)?$', api.get_students_features, name='get_students_features'),
-    path('get_issued_certificates/', api.get_issued_certificates, name='get_issued_certificates'),
+    path('get_issued_certificates/', api.GetIssuedCertificates.as_view(), name='get_issued_certificates'),
+    re_path(r'^get_students_features(?P<csv>/csv)?$', api.GetStudentsFeatures.as_view(), name='get_students_features'),
+    path('get_grading_config', api.GetGradingConfig.as_view(), name='get_grading_config'),
     path('get_students_who_may_enroll', api.GetStudentsWhoMayEnroll.as_view(), name='get_students_who_may_enroll'),
     path('get_anon_ids', api.GetAnonIds.as_view(), name='get_anon_ids'),
-    path('get_student_enrollment_status', api.get_student_enrollment_status, name="get_student_enrollment_status"),
+    path('get_student_enrollment_status', api.GetStudentEnrollmentStatus.as_view(),
+         name="get_student_enrollment_status"),
     path('get_student_progress_url', api.StudentProgressUrl.as_view(), name='get_student_progress_url'),
-    path('reset_student_attempts', api.reset_student_attempts, name='reset_student_attempts'),
+    path('reset_student_attempts', api.ResetStudentAttempts.as_view(), name='reset_student_attempts'),
     path('rescore_problem', api.rescore_problem, name='rescore_problem'),
     path('override_problem_score', api.override_problem_score, name='override_problem_score'),
     path('reset_student_attempts_for_entrance_exam', api.reset_student_attempts_for_entrance_exam,
@@ -42,16 +43,16 @@
     path('rescore_entrance_exam', api.rescore_entrance_exam, name='rescore_entrance_exam'),
     path('list_entrance_exam_instructor_tasks', api.ListEntranceExamInstructorTasks.as_view(),
          name='list_entrance_exam_instructor_tasks'),
-    path('mark_student_can_skip_entrance_exam', api.mark_student_can_skip_entrance_exam,
+    path('mark_student_can_skip_entrance_exam', api.MarkStudentCanSkipEntranceExam.as_view(),
          name='mark_student_can_skip_entrance_exam'),
-    path('list_instructor_tasks', api.list_instructor_tasks, name='list_instructor_tasks'),
+    path('list_instructor_tasks', api.ListInstructorTasks.as_view(), name='list_instructor_tasks'),
     path('list_background_email_tasks', api.list_background_email_tasks, name='list_background_email_tasks'),
     path('list_email_content', api.ListEmailContent.as_view(), name='list_email_content'),
     path('list_forum_members', api.list_forum_members, name='list_forum_members'),
     path('update_forum_role_membership', api.update_forum_role_membership, name='update_forum_role_membership'),
-    path('send_email', api.send_email, name='send_email'),
-    path('change_due_date', api.change_due_date, name='change_due_date'),
-    path('reset_due_date', api.reset_due_date, name='reset_due_date'),
+    path('change_due_date', api.ChangeDueDate.as_view(), name='change_due_date'),
+    path('send_email', api.SendEmail.as_view(), name='send_email'),
+    path('reset_due_date', api.ResetDueDate.as_view(), name='reset_due_date'),
     path('show_unit_extensions', api.show_unit_extensions, name='show_unit_extensions'),
     path('show_student_extensions', api.ShowStudentExtensions.as_view(), name='show_student_extensions'),
 
@@ -59,7 +60,7 @@
     path('get_proctored_exam_results', api.get_proctored_exam_results, name='get_proctored_exam_results'),
 
     # Grade downloads...
-    path('list_report_downloads', api.list_report_downloads, name='list_report_downloads'),
+    path('list_report_downloads', api.ListReportDownloads.as_view(), name='list_report_downloads'),
     path('calculate_grades_csv', api.calculate_grades_csv, name='calculate_grades_csv'),
     path('problem_grade_report', api.problem_grade_report, name='problem_grade_report'),
 
@@ -81,12 +82,17 @@
 
     # Certificates
     path('enable_certificate_generation', api.enable_certificate_generation, name='enable_certificate_generation'),
-    path('start_certificate_generation', api.start_certificate_generation, name='start_certificate_generation'),
-    path('start_certificate_regeneration', api.start_certificate_regeneration, name='start_certificate_regeneration'),
-    path('certificate_exception_view/', api.certificate_exception_view, name='certificate_exception_view'),
-    re_path(r'^generate_certificate_exceptions/(?P<generate_for>[^/]*)', api.generate_certificate_exceptions,
+    path('start_certificate_generation', api.StartCertificateGeneration.as_view(), name='start_certificate_generation'),
+    path('start_certificate_regeneration', api.StartCertificateRegeneration.as_view(),
+         name='start_certificate_regeneration'),
+    path('certificate_exception_view/', api.CertificateExceptionView.as_view(), name='certificate_exception_view'),
+    re_path(r'^generate_certificate_exceptions/(?P<generate_for>[^/]*)', api.GenerateCertificateExceptions.as_view(),
             name='generate_certificate_exceptions'),
     path('generate_bulk_certificate_exceptions', api.generate_bulk_certificate_exceptions,
          name='generate_bulk_certificate_exceptions'),
-    path('certificate_invalidation_view/', api.certificate_invalidation_view, name='certificate_invalidation_view'),
+    path(
+        'certificate_invalidation_view/',
+        api.CertificateInvalidationView.as_view(),
+        name='certificate_invalidation_view'
+    ),
 ]
diff --git a/lms/djangoapps/instructor/views/serializer.py b/lms/djangoapps/instructor/views/serializer.py
index 0697bed6832d..7b20eed32f60 100644
--- a/lms/djangoapps/instructor/views/serializer.py
+++ b/lms/djangoapps/instructor/views/serializer.py
@@ -1,13 +1,16 @@
 """ Instructor apis serializers. """
+import re
 
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
 from rest_framework import serializers
-from .tools import get_student_from_identifier
 
+from lms.djangoapps.certificates.models import CertificateStatuses
 from lms.djangoapps.instructor.access import ROLES
 
+from .tools import get_student_from_identifier
+
 
 class RoleNameSerializer(serializers.Serializer):  # pylint: disable=abstract-method
     """
@@ -31,16 +34,33 @@ class Meta:
         fields = ['username', 'email', 'first_name', 'last_name']
 
 
-class AccessSerializer(serializers.Serializer):
+class UniqueStudentIdentifierSerializer(serializers.Serializer):
     """
-    Serializer for managing user access changes.
-    This serializer validates and processes the data required to modify
-    user access within a system.
+    Serializer for identifying unique_student.
     """
     unique_student_identifier = serializers.CharField(
         max_length=255,
         help_text="Email or username of user to change access"
     )
+
+    def validate_unique_student_identifier(self, value):
+        """
+        Validate that the unique_student_identifier corresponds to an existing user.
+        """
+        try:
+            user = get_student_from_identifier(value)
+        except User.DoesNotExist:
+            return None
+
+        return user
+
+
+class AccessSerializer(UniqueStudentIdentifierSerializer):
+    """
+    Serializer for managing user access changes.
+    This serializer validates and processes the data required to modify
+    user access within a system.
+    """
     rolename = serializers.CharField(
         help_text="Role name to assign to the user"
     )
@@ -49,9 +69,93 @@ class AccessSerializer(serializers.Serializer):
         help_text="Action to perform on the user's access"
     )
 
+
+class ListInstructorTaskInputSerializer(serializers.Serializer):  # pylint: disable=abstract-method
+    """
+    Serializer for handling the input data for the problem response report generation API.
+
+Attributes:
+    unique_student_identifier (str): The email or username of the student.
+                                      This field is optional, but if provided, the `problem_location_str`
+                                      must also be provided.
+    problem_location_str (str): The string representing the location of the problem within the course.
+                                This field is optional, unless `unique_student_identifier` is provided.
+    """
+    unique_student_identifier = serializers.CharField(
+        max_length=255,
+        help_text="Email or username of student",
+        required=False
+    )
+    problem_location_str = serializers.CharField(
+        help_text="Problem location",
+        required=False
+    )
+
+    def validate(self, data):
+        """
+        Validate the data to ensure that if unique_student_identifier is provided,
+        problem_location_str must also be provided.
+        """
+        unique_student_identifier = data.get('unique_student_identifier')
+        problem_location_str = data.get('problem_location_str')
+
+        if unique_student_identifier and not problem_location_str:
+            raise serializers.ValidationError(
+                "unique_student_identifier must accompany problem_location_str"
+            )
+
+        return data
+
+
+class ShowStudentExtensionSerializer(serializers.Serializer):
+    """
+    Serializer for validating and processing the student identifier.
+    """
+    student = serializers.CharField(write_only=True, required=True)
+
+    def validate_student(self, value):
+        """
+        Validate that the student corresponds to an existing user.
+        """
+        try:
+            user = get_student_from_identifier(value)
+        except User.DoesNotExist:
+            return None
+
+        return user
+
+
+class StudentAttemptsSerializer(serializers.Serializer):
+    """
+    Serializer for resetting a students attempts counter or starts a task to reset all students
+    attempts counters.
+    """
+    problem_to_reset = serializers.CharField(
+        help_text="The identifier or description of the problem that needs to be reset."
+    )
+
+    # following are optional params.
+    unique_student_identifier = serializers.CharField(
+        help_text="Email or username of student.", required=False
+    )
+    all_students = serializers.CharField(required=False)
+    delete_module = serializers.CharField(required=False)
+
+    def validate_all_students(self, value):
+        """
+        converts the all_student params value to bool.
+        """
+        return self.verify_bool(value)
+
+    def validate_delete_module(self, value):
+        """
+        converts the all_student params value.
+        """
+        return self.verify_bool(value)
+
     def validate_unique_student_identifier(self, value):
         """
-        Validate that the unique_student_identifier corresponds to an existing user.
+        Validate that the student corresponds to an existing user.
         """
         try:
             user = get_student_from_identifier(value)
@@ -60,12 +164,55 @@ def validate_unique_student_identifier(self, value):
 
         return user
 
+    def verify_bool(self, value):
+        """
+        Returns the value of the boolean parameter with the given
+        name in the POST request. Handles translation from string
+        values to boolean values.
+        """
+        if value is not None:
+            return value in ['true', 'True', True]
 
-class ShowStudentExtensionSerializer(serializers.Serializer):
+        return False
+
+
+class SendEmailSerializer(serializers.Serializer):
     """
-    Serializer for validating and processing the student identifier.
+    Serializer for sending an email with optional scheduling.
+
+    Fields:
+        send_to (str): The email address of the recipient. This field is required.
+        subject (str): The subject line of the email. This field is required.
+        message (str): The body of the email. This field is required.
+        schedule (str, optional):
+        An optional field to specify when the email should be sent.
+        If provided, this should be a string that can be parsed into a
+        datetime format or some other scheduling logic.
     """
-    student = serializers.CharField(write_only=True, required=True)
+    send_to = serializers.CharField(write_only=True, required=True)
+
+    # set max length as per model field.
+    subject = serializers.CharField(max_length=128, write_only=True, required=True)
+    message = serializers.CharField(required=True)
+    schedule = serializers.CharField(required=False)
+
+
+class BlockDueDateSerializer(serializers.Serializer):
+    """
+    Serializer for handling block due date updates for a specific student.
+    Fields:
+        url (str): The URL related to the block that needs the due date update.
+        due_datetime (str): The new due date and time for the block.
+        student (str): The email or username of the student whose access is being modified.
+        reason (str): Reason why updating this.
+    """
+    url = serializers.CharField()
+    due_datetime = serializers.CharField()
+    student = serializers.CharField(
+        max_length=255,
+        help_text="Email or username of user to change access"
+    )
+    reason = serializers.CharField(required=False)
 
     def validate_student(self, value):
         """
@@ -77,3 +224,126 @@ def validate_student(self, value):
             return None
 
         return user
+
+    def __init__(self, *args, **kwargs):
+        # Get context to check if `due_datetime` should be optional
+        disable_due_datetime = kwargs.get('context', {}).get('disable_due_datetime', False)
+        super().__init__(*args, **kwargs)
+        if disable_due_datetime:
+            self.fields['due_datetime'].required = False
+
+
+class ModifyAccessSerializer(serializers.Serializer):
+    """
+    serializers for enroll or un-enroll users in beta testing program.
+    """
+    identifiers = serializers.CharField(
+        help_text="A comma separated list of emails or usernames.",
+        required=True
+    )
+    action = serializers.ChoiceField(
+        choices=["add", "remove"],
+        help_text="Action to perform: add or remove.",
+        required=True
+    )
+
+    email_students = serializers.BooleanField(
+        default=False,
+        help_text="Boolean flag to indicate if students should be emailed."
+    )
+
+    auto_enroll = serializers.BooleanField(
+        default=False,
+        help_text="Boolean flag to indicate if the user should be auto-enrolled."
+    )
+
+    def validate_identifiers(self, value):
+        """
+        Validate the 'identifiers' field which is now a list of strings.
+        """
+        # Iterate over the list of identifiers and validate each one
+        validated_list = _split_input_list(value)
+        if not validated_list:
+            raise serializers.ValidationError("The identifiers list cannot be empty.")
+
+        return validated_list
+
+    def validate_email_students(self, value):
+        """
+        handle string values like 'true' or 'false'.
+        """
+        if isinstance(value, str):
+            return value.lower() == 'true'
+        return bool(value)
+
+    def validate_auto_enroll(self, value):
+        """
+        handle string values like 'true' or 'false'.
+        """
+        if isinstance(value, str):
+            return value.lower() == 'true'
+        return bool(value)
+
+
+def _split_input_list(str_list):
+    """
+    Separate out individual student email from the comma, or space separated string.
+
+    e.g.
+    in: "Lorem@ipsum.dolor, sit@amet.consectetur\nadipiscing@elit.Aenean\r convallis@at.lacus\r, ut@lacinia.Sed"
+    out: ['Lorem@ipsum.dolor', 'sit@amet.consectetur', 'adipiscing@elit.Aenean', 'convallis@at.lacus', 'ut@lacinia.Sed']
+
+    `str_list` is a string coming from an input text area
+    returns a list of separated values
+    """
+    new_list = re.split(r'[,\s\n\r]+', str_list)
+    new_list = [s.strip() for s in new_list]
+    new_list = [s for s in new_list if s != '']
+
+    return new_list
+
+
+class CertificateStatusesSerializer(serializers.Serializer):
+    """
+    Serializer for validating and serializing certificate status inputs.
+
+    This serializer is used to ensure that the provided certificate statuses
+    conform to the predefined set of valid statuses defined in the
+    `CertificateStatuses` enumeration.
+    """
+    certificate_statuses = serializers.ListField(
+        child=serializers.ChoiceField(choices=[
+            CertificateStatuses.downloadable,
+            CertificateStatuses.error,
+            CertificateStatuses.notpassing,
+            CertificateStatuses.audit_passing,
+            CertificateStatuses.audit_notpassing,
+        ]),
+        allow_empty=False  # Set to True if you want to allow empty lists
+    )
+
+
+class CertificateSerializer(serializers.Serializer):
+    """
+    Serializer for multiple operations related with certificates.
+    resetting a students attempts counter or starts a task to reset all students
+    attempts counters
+    Also Add/Remove students to/from the certificate allowlist.
+    Also For resetting a students attempts counter or starts a task to reset all students
+    attempts counters.
+    """
+    user = serializers.CharField(
+        help_text="Email or username of student.", required=True
+    )
+    notes = serializers.CharField(required=False, allow_null=True, allow_blank=True)
+
+    def validate_user(self, value):
+        """
+        Validate that the user corresponds to an existing user.
+        """
+        try:
+            user = get_student_from_identifier(value)
+        except User.DoesNotExist:
+            return None
+
+        return user
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
index 8fa590c37f8c..0a8c5e788bfc 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
@@ -25,6 +25,7 @@
 from pytz import UTC
 
 import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api
+import openedx.core.djangoapps.content.block_structure.api as bs_api
 from xmodule.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory  # lint-amnesty, pylint: disable=wrong-import-order
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed
@@ -396,6 +397,8 @@ def test_query_counts(self):
         )
         _ = CreditCourseFactory(course_key=course.id)
 
+        bs_api.update_course_in_cache(course.id)
+
         num_users = 5
         for _ in range(num_users):
             user = UserFactory.create()
@@ -406,7 +409,7 @@ def test_query_counts(self):
 
         with patch('lms.djangoapps.instructor_task.tasks_helper.runner._get_current_task'):
             with check_mongo_calls(2):
-                with self.assertNumQueries(53):
+                with self.assertNumQueries(46):
                     CourseGradeReport.generate(None, None, course.id, {}, 'graded')
 
     def test_inactive_enrollments(self):
diff --git a/lms/djangoapps/learner_dashboard/tests/test_programs.py b/lms/djangoapps/learner_dashboard/tests/test_programs.py
index c1b699c44afa..0662d09a41ea 100644
--- a/lms/djangoapps/learner_dashboard/tests/test_programs.py
+++ b/lms/djangoapps/learner_dashboard/tests/test_programs.py
@@ -86,15 +86,9 @@ def program_sort_key(cls, program):
     def assert_dict_contains_subset(self, superset, subset):
         """
         Verify that the dict superset contains the dict subset.
-
-        Works like assertDictContainsSubset, deprecated since Python 3.2.
-        See: https://docs.python.org/2.7/library/unittest.html#unittest.TestCase.assertDictContainsSubset.
         """
-        superset_keys = set(superset.keys())
-        subset_keys = set(subset.keys())
-        intersection = {key: superset[key] for key in superset_keys & subset_keys}
-
-        assert subset == intersection
+        for key, value in subset.items():
+            assert key in superset and superset[key] == value, f"{key}: {value} not found in superset or does not match"
 
     def test_login_required(self, mock_get_programs):
         """
diff --git a/lms/djangoapps/learner_home/serializers.py b/lms/djangoapps/learner_home/serializers.py
index b3471715b9dc..c464e0c6a443 100644
--- a/lms/djangoapps/learner_home/serializers.py
+++ b/lms/djangoapps/learner_home/serializers.py
@@ -3,7 +3,7 @@
 """
 
 from datetime import date, timedelta
-from urllib.parse import urljoin
+from urllib.parse import urlencode, urljoin
 
 from django.conf import settings
 from django.urls import reverse
@@ -132,7 +132,13 @@ def get_upgradeUrl(self, instance):
         )
 
         if ecommerce_payment_page and verified_sku:
-            return f"{ecommerce_payment_page}?sku={verified_sku}"
+            query_params = {
+                'sku': verified_sku,
+                'course_run_key': str(instance.course_id)
+            }
+            encoded_params = urlencode(query_params)
+            upgrade_url = f"{ecommerce_payment_page}?{encoded_params}"
+            return upgrade_url
 
     def get_resumeUrl(self, instance):
         return self.context.get("resume_course_urls", {}).get(instance.course_id)
@@ -293,23 +299,20 @@ def get_cert_info(self, enrollment):
     def get_availableDate(self, enrollment):
         """Available date changes based off of Certificate display behavior"""
         course_overview = enrollment.course_overview
-        available_date = course_overview.certificate_available_date
-
-        if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False):
-            if (
-                course_overview.certificates_display_behavior
-                == CertificatesDisplayBehaviors.END_WITH_DATE
-                and course_overview.certificate_available_date
-            ):
-                available_date = course_overview.certificate_available_date
-            elif (
-                course_overview.certificates_display_behavior
-                == CertificatesDisplayBehaviors.END
-                and course_overview.end
-            ):
-                available_date = course_overview.end
-        else:
+        available_date = None
+
+        if (
+            course_overview.certificates_display_behavior
+            == CertificatesDisplayBehaviors.END_WITH_DATE
+            and course_overview.certificate_available_date
+        ):
             available_date = course_overview.certificate_available_date
+        elif (
+            course_overview.certificates_display_behavior
+            == CertificatesDisplayBehaviors.END
+            and course_overview.end
+        ):
+            available_date = course_overview.end
 
         return serializers.DateTimeField().to_representation(available_date)
 
diff --git a/lms/djangoapps/learner_home/test_serializers.py b/lms/djangoapps/learner_home/test_serializers.py
index ac11a8b2990d..e7d22d5e71e2 100644
--- a/lms/djangoapps/learner_home/test_serializers.py
+++ b/lms/djangoapps/learner_home/test_serializers.py
@@ -522,9 +522,12 @@ def test_with_data(self):
         # ... with a certificate
         input_context = self.create_test_context(input_data.course)
 
-        # ... and some data preemptively gathered
+        # ... and some data preemptively gathered, including a certificate display behavior
         available_date = random_date()
         input_data.course.certificate_available_date = available_date
+        input_data.course.certificates_display_behavior = (
+            CertificatesDisplayBehaviors.END_WITH_DATE
+        )
         cert_url = input_context["cert_statuses"][input_data.course.id][
             "cert_web_view_url"
         ]
@@ -544,23 +547,6 @@ def test_with_data(self):
             },
         )
 
-    @mock.patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=False)
-    def test_available_date_old_format(self):
-        # Given new cert display settings are not enabled
-        input_data = self.create_test_enrollment(course_mode=CourseMode.VERIFIED)
-        input_data.course.certificate_available_date = random_date()
-        input_context = self.create_test_context(input_data.course)
-
-        # When I get certificate info
-        output_data = CertificateSerializer(input_data, context=input_context).data
-
-        # Then the available date is defaulted to the certificate available date
-        expected_available_date = datetime_to_django_format(
-            input_data.course.certificate_available_date
-        )
-        self.assertEqual(output_data["availableDate"], expected_available_date)
-
-    @mock.patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
     def test_available_date_course_end(self):
         # Given new cert display settings are enabled
         input_data = self.create_test_enrollment(course_mode=CourseMode.VERIFIED)
@@ -578,7 +564,6 @@ def test_available_date_course_end(self):
         expected_available_date = datetime_to_django_format(input_data.course.end)
         self.assertEqual(output_data["availableDate"], expected_available_date)
 
-    @mock.patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
     def test_available_date_specific_end(self):
         # Given new cert display settings are enabled
         input_data = self.create_test_enrollment(course_mode=CourseMode.VERIFIED)
diff --git a/lms/djangoapps/mobile_api/course_info/views.py b/lms/djangoapps/mobile_api/course_info/views.py
index affefafe5ba0..0a173863db13 100644
--- a/lms/djangoapps/mobile_api/course_info/views.py
+++ b/lms/djangoapps/mobile_api/course_info/views.py
@@ -28,6 +28,7 @@
     MobileCourseEnrollmentSerializer
 )
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.video_pipeline.config.waffle import DEPRECATE_YOUTUBE
 from openedx.core.lib.api.view_utils import view_auth_classes
 from openedx.core.lib.xblock_utils import get_course_update_items
 from openedx.features.course_experience import ENABLE_COURSE_GOALS
@@ -341,6 +342,7 @@ def list(self, request, **kwargs):  # pylint: disable=W0221
                     kwargs={'api_version': api_version, 'course_id': course_id},
                     request=request,
                 ),
+                'deprecate_youtube': DEPRECATE_YOUTUBE.is_enabled(course_key)
             }
 
             course_info_context = {}
diff --git a/cms/djangoapps/maintenance/__init__.py b/lms/djangoapps/mobile_api/notifications/__init__.py
similarity index 100%
rename from cms/djangoapps/maintenance/__init__.py
rename to lms/djangoapps/mobile_api/notifications/__init__.py
diff --git a/lms/djangoapps/mobile_api/notifications/urls.py b/lms/djangoapps/mobile_api/notifications/urls.py
new file mode 100644
index 000000000000..120fa39a975a
--- /dev/null
+++ b/lms/djangoapps/mobile_api/notifications/urls.py
@@ -0,0 +1,12 @@
+"""
+URLs for the mobile_api.notifications APIs.
+"""
+from django.urls import path
+from .views import GCMDeviceViewSet
+
+
+create_gcm_device_post_view = GCMDeviceViewSet.as_view({'post': 'create'})
+
+urlpatterns = [
+    path('create-token/', create_gcm_device_post_view, name='gcmdevice-list'),
+]
diff --git a/lms/djangoapps/mobile_api/notifications/views.py b/lms/djangoapps/mobile_api/notifications/views.py
new file mode 100644
index 000000000000..2621c2a3a2fb
--- /dev/null
+++ b/lms/djangoapps/mobile_api/notifications/views.py
@@ -0,0 +1,53 @@
+"""
+This module contains the view for registering a device for push notifications.
+"""
+from django.conf import settings
+from rest_framework import status
+from rest_framework.response import Response
+
+from edx_ace.push_notifications.views import GCMDeviceViewSet as GCMDeviceViewSetBase
+
+from ..decorators import mobile_view
+
+
+@mobile_view()
+class GCMDeviceViewSet(GCMDeviceViewSetBase):
+    """
+    **Use Case**
+        This endpoint allows clients to register a device for push notifications.
+
+        If the device is already registered, the existing registration will be updated.
+        If setting PUSH_NOTIFICATIONS_SETTINGS is not configured, the endpoint will return a 501 error.
+
+    **Example Request**
+        POST /api/mobile/{version}/notifications/create-token/
+        **POST Parameters**
+          The body of the POST request can include the following parameters.
+          * name (optional) - A name of the device.
+          * registration_id (required) - The device token of the device.
+          * device_id (optional) - ANDROID_ID / TelephonyManager.getDeviceId() (always as hex)
+          * active (optional) - Whether the device is active, default is True.
+            If False, the device will not receive notifications.
+          * cloud_message_type (required) - You should choose FCM or GCM. Currently, only FCM is supported.
+          * application_id (optional) - Opaque application identity, should be filled in for multiple
+            key/certificate access. Should be equal settings.FCM_APP_NAME.
+    **Example Response**
+        ```json
+        {
+            "id": 1,
+            "name": "My Device",
+            "registration_id": "fj3j4",
+            "device_id": 1234,
+            "active": true,
+            "date_created": "2024-04-18T07:39:37.132787Z",
+            "cloud_message_type": "FCM",
+            "application_id": "my_app_id"
+        }
+        ```
+    """
+
+    def create(self, request, *args, **kwargs):
+        if not getattr(settings, 'PUSH_NOTIFICATIONS_SETTINGS', None):
+            return Response('Push notifications are not configured.', status.HTTP_501_NOT_IMPLEMENTED)
+
+        return super().create(request, *args, **kwargs)
diff --git a/lms/djangoapps/mobile_api/urls.py b/lms/djangoapps/mobile_api/urls.py
index 1ad34ced5de9..c7aacc0b669a 100644
--- a/lms/djangoapps/mobile_api/urls.py
+++ b/lms/djangoapps/mobile_api/urls.py
@@ -10,5 +10,6 @@
 urlpatterns = [
     path('users/', include('lms.djangoapps.mobile_api.users.urls')),
     path('my_user_info', my_user_info, name='user-info'),
+    path('notifications/', include('lms.djangoapps.mobile_api.notifications.urls')),
     path('course_info/', include('lms.djangoapps.mobile_api.course_info.urls')),
 ]
diff --git a/lms/djangoapps/mobile_api/users/tests.py b/lms/djangoapps/mobile_api/users/tests.py
index 6cd5e3d29a4e..2cfefaa058d9 100644
--- a/lms/djangoapps/mobile_api/users/tests.py
+++ b/lms/djangoapps/mobile_api/users/tests.py
@@ -9,6 +9,7 @@
 
 import ddt
 import pytz
+from completion.models import BlockCompletion
 from completion.test_utils import CompletionWaffleTestMixin, submit_completions_for_testing
 from django.conf import settings
 from django.db import transaction
@@ -1381,3 +1382,145 @@ def test_discussion_tab_url(self, discussion_tab_enabled):
             assert isinstance(discussion_url, str)
         else:
             assert discussion_url is None
+
+
+@ddt.ddt
+class TestUserEnrollmentsStatus(MobileAPITestCase, MobileAuthUserTestMixin):
+    """
+    Tests for /api/mobile/{api_version}/users/<user_name>/enrollments_status/
+    """
+
+    REVERSE_INFO = {'name': 'user-enrollments-status', 'params': ['username', 'api_version']}
+
+    def test_no_mobile_available_courses(self) -> None:
+        self.login()
+        courses = [CourseFactory.create(org="edx", mobile_available=False) for _ in range(3)]
+        for course in courses:
+            self.enroll(course.id)
+
+        response = self.api_response(api_version=API_V1)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertListEqual(response.data, [])
+
+    def test_no_enrollments(self) -> None:
+        self.login()
+        for _ in range(3):
+            CourseFactory.create(org="edx", mobile_available=True)
+
+        response = self.api_response(api_version=API_V1)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertListEqual(response.data, [])
+
+    def test_user_have_only_active_enrollments_and_no_completions(self) -> None:
+        self.login()
+        courses = [CourseFactory.create(org="edx", mobile_available=True) for _ in range(3)]
+        for course in courses:
+            self.enroll(course.id)
+
+        response = self.api_response(api_version=API_V1)
+
+        expected_response = [
+            {'course_id': str(courses[0].course_id), 'course_name': courses[0].display_name, 'recently_active': True},
+            {'course_id': str(courses[1].course_id), 'course_name': courses[1].display_name, 'recently_active': True},
+            {'course_id': str(courses[2].course_id), 'course_name': courses[2].display_name, 'recently_active': True},
+        ]
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertListEqual(response.data, expected_response)
+
+    def test_user_have_active_and_inactive_enrollments_and_no_completions(self) -> None:
+        self.login()
+        courses = [CourseFactory.create(org="edx", mobile_available=True) for _ in range(3)]
+        for course in courses:
+            self.enroll(course.id)
+        old_course = CourseFactory.create(org="edx", mobile_available=True)
+        self.enroll(old_course.id)
+        old_enrollment = CourseEnrollment.objects.filter(user=self.user, course=old_course.course_id).first()
+        old_enrollment.created = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=31)
+        old_enrollment.save()
+
+        response = self.api_response(api_version=API_V1)
+
+        expected_response = [
+            {'course_id': str(courses[0].course_id), 'course_name': courses[0].display_name, 'recently_active': True},
+            {'course_id': str(courses[1].course_id), 'course_name': courses[1].display_name, 'recently_active': True},
+            {'course_id': str(courses[2].course_id), 'course_name': courses[2].display_name, 'recently_active': True},
+            {'course_id': str(old_course.course_id), 'course_name': old_course.display_name, 'recently_active': False}
+        ]
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertListEqual(response.data, expected_response)
+
+    @ddt.data(
+        (27, True),
+        (28, True),
+        (29, True),
+        (31, False),
+        (32, False),
+    )
+    @ddt.unpack
+    def test_different_enrollment_dates(self, enrolled_days_ago: int, recently_active_status: bool) -> None:
+        self.login()
+        course = CourseFactory.create(org="edx", mobile_available=True, run='1001')
+        self.enroll(course.id)
+        enrollment = CourseEnrollment.objects.filter(user=self.user, course=course.course_id).first()
+        enrollment.created = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=enrolled_days_ago)
+        enrollment.save()
+
+        response = self.api_response(api_version=API_V1)
+
+        expected_response = [
+            {
+                'course_id': str(course.course_id),
+                'course_name': course.display_name,
+                'recently_active': recently_active_status
+            }
+        ]
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertListEqual(response.data, expected_response)
+
+    @ddt.data(
+        (27, True),
+        (28, True),
+        (29, True),
+        (31, False),
+        (32, False),
+    )
+    @ddt.unpack
+    def test_different_completion_dates(self, completed_days_ago: int, recently_active_status: bool) -> None:
+        self.login()
+        course = CourseFactory.create(org="edx", mobile_available=True, run='1010')
+        section = BlockFactory.create(
+            parent=course,
+            category='chapter',
+        )
+        self.enroll(course.id)
+        enrollment = CourseEnrollment.objects.filter(user=self.user, course=course.course_id).first()
+        # make enrollment older 30 days ago
+        enrollment.created = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=50)
+        enrollment.save()
+        completion = BlockCompletion.objects.create(
+            user=self.user,
+            context_key=course.context_key,
+            block_type='course',
+            block_key=section.location,
+            completion=0.5,
+        )
+        completion.created = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=completed_days_ago)
+        completion.save()
+
+        response = self.api_response(api_version=API_V1)
+
+        expected_response = [
+            {
+                'course_id': str(course.course_id),
+                'course_name': course.display_name,
+                'recently_active': recently_active_status
+            }
+        ]
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertListEqual(response.data, expected_response)
diff --git a/lms/djangoapps/mobile_api/users/urls.py b/lms/djangoapps/mobile_api/users/urls.py
index 266644246e88..874730d4d0f0 100644
--- a/lms/djangoapps/mobile_api/users/urls.py
+++ b/lms/djangoapps/mobile_api/users/urls.py
@@ -6,7 +6,7 @@
 from django.conf import settings
 from django.urls import re_path
 
-from .views import UserCourseEnrollmentsList, UserCourseStatus, UserDetail
+from .views import UserCourseEnrollmentsList, UserCourseStatus, UserDetail, UserEnrollmentsStatus
 
 urlpatterns = [
     re_path('^' + settings.USERNAME_PATTERN + '$', UserDetail.as_view(), name='user-detail'),
@@ -17,5 +17,8 @@
     ),
     re_path(f'^{settings.USERNAME_PATTERN}/course_status_info/{settings.COURSE_ID_PATTERN}',
             UserCourseStatus.as_view(),
-            name='user-course-status')
+            name='user-course-status'),
+    re_path(f'^{settings.USERNAME_PATTERN}/enrollments_status/',
+            UserEnrollmentsStatus.as_view(),
+            name='user-enrollments-status')
 ]
diff --git a/lms/djangoapps/mobile_api/users/views.py b/lms/djangoapps/mobile_api/users/views.py
index d959e188b4ee..c86f3add9d36 100644
--- a/lms/djangoapps/mobile_api/users/views.py
+++ b/lms/djangoapps/mobile_api/users/views.py
@@ -3,11 +3,14 @@
 """
 
 
+import datetime
 import logging
 from functools import cached_property
-from typing import Optional
+from typing import Dict, List, Optional, Set
 
+import pytz
 from completion.exceptions import UnavailableCompletionData
+from completion.models import BlockCompletion
 from completion.utilities import get_key_to_last_completed_block
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.contrib.auth.signals import user_logged_in
@@ -17,6 +20,7 @@
 from django.utils.decorators import method_decorator
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import UsageKey
+from opaque_keys.edx.locator import CourseLocator
 from rest_framework import generics, views
 from rest_framework.decorators import api_view
 from rest_framework.permissions import SAFE_METHODS
@@ -530,6 +534,133 @@ def my_user_info(request, api_version):
     return redirect("user-detail", api_version=api_version, username=request.user.username)
 
 
+@mobile_view(is_user=True)
+class UserEnrollmentsStatus(views.APIView):
+    """
+    **Use Case**
+
+        Get information about user's enrolments status.
+
+        Returns active enrolment status if user was enrolled for the course
+        less than 30 days ago or has progressed in the course in the last 30 days.
+        Otherwise, the registration is considered inactive.
+
+        USER_ENROLLMENTS_LIMIT - adds users enrollments query limit to
+        safe API from possible DDOS attacks.
+
+    **Example Request**
+
+        GET /api/mobile/{api_version}/users/<user_name>/enrollments_status/
+
+    **Response Values**
+
+        If the request for information about the user's enrolments is successful, the
+        request returns an HTTP 200 "OK" response.
+
+        The HTTP 200 response has the following values.
+
+        * course_id (str): The course id associated with the user's enrollment.
+        * course_name (str): The course name associated with the user's enrollment.
+        * recently_active (bool): User's course enrolment status.
+
+
+        The HTTP 200 response contains a list of dictionaries that contain info
+        about each user's enrolment status.
+
+    **Example Response**
+
+        ```json
+        [
+            {
+                "course_id": "course-v1:a+a+a",
+                "course_name": "a",
+                "recently_active": true
+            },
+            {
+                "course_id": "course-v1:b+b+b",
+                "course_name": "b",
+                "recently_active": true
+            },
+            {
+                "course_id": "course-v1:c+c+c",
+                "course_name": "c",
+                "recently_active": false
+            },
+            ...
+        ]
+        ```
+    """
+
+    USER_ENROLLMENTS_LIMIT = 500
+
+    def get(self, request, *args, **kwargs) -> Response:
+        """
+        Gets user's enrollments status.
+        """
+        active_status_date = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=30)
+        username = kwargs.get('username')
+        course_ids_where_user_has_completions = self._get_course_ids_where_user_has_completions(
+            username,
+            active_status_date,
+        )
+        enrollments_status = self._build_enrollments_status_dict(
+            username,
+            active_status_date,
+            course_ids_where_user_has_completions
+        )
+        return Response(enrollments_status)
+
+    def _build_enrollments_status_dict(
+        self,
+        username: str,
+        active_status_date: datetime,
+        course_ids: Set[CourseLocator],
+    ) -> List[Dict[str, bool]]:
+        """
+        Builds list with dictionaries with user's enrolments statuses.
+        """
+        user = get_object_or_404(User, username=username)
+        user_enrollments = (
+            CourseEnrollment
+            .enrollments_for_user(user)
+            .select_related('course')
+            [:self.USER_ENROLLMENTS_LIMIT]
+        )
+        mobile_available = [
+            enrollment for enrollment in user_enrollments
+            if is_mobile_available_for_user(user, enrollment.course_overview)
+        ]
+        enrollments_status = []
+        for user_enrollment in mobile_available:
+            course_id = user_enrollment.course_overview.id
+            enrollments_status.append(
+                {
+                    'course_id': str(course_id),
+                    'course_name': user_enrollment.course_overview.display_name,
+                    'recently_active': bool(
+                        course_id in course_ids
+                        or user_enrollment.created > active_status_date
+                    )
+                }
+            )
+        return enrollments_status
+
+    @staticmethod
+    def _get_course_ids_where_user_has_completions(
+        username: str,
+        active_status_date: datetime,
+    ) -> Set[CourseLocator]:
+        """
+        Gets course keys where user has completions.
+        """
+        context_keys = BlockCompletion.objects.filter(
+            user__username=username,
+            created__gte=active_status_date
+        ).values_list('context_key', flat=True).distinct()
+
+        return set(context_keys)
+
+
 class UserCourseEnrollmentsV4Pagination(DefaultPagination):
     """
     Pagination for `UserCourseEnrollments` API v4.
diff --git a/lms/djangoapps/support/models.py b/lms/djangoapps/support/models.py
index 32df989eeddd..d8f6e2b9a1d1 100644
--- a/lms/djangoapps/support/models.py
+++ b/lms/djangoapps/support/models.py
@@ -21,6 +21,8 @@
 class CourseResetCourseOptIn(TimeStampedModel):
     """
     Model that represents a course which has opted in to the course reset feature.
+
+    .. no_pii:
     """
     course_id = CourseKeyField(max_length=255, unique=True)
     active = BooleanField()
@@ -40,6 +42,8 @@ def all_active_course_ids():
 class CourseResetAudit(TimeStampedModel):
     """
     Model which records the course reset action's status and metadata
+
+    .. no_pii:
     """
     class CourseResetStatus(TextChoices):
         IN_PROGRESS = "in_progress"
diff --git a/lms/djangoapps/user_tours/models.py b/lms/djangoapps/user_tours/models.py
index 34bd7b28de27..23baacc15e1c 100644
--- a/lms/djangoapps/user_tours/models.py
+++ b/lms/djangoapps/user_tours/models.py
@@ -30,6 +30,8 @@ class CourseHomeChoices(models.TextChoices):
 class UserDiscussionsTours(models.Model):
     """
     Model to track which discussions tours a user has seen.
+
+    .. no_pii:
     """
     tour_name = models.CharField(max_length=255)
     show_tour = models.BooleanField(default=True)
diff --git a/lms/djangoapps/verify_student/admin.py b/lms/djangoapps/verify_student/admin.py
index 6de066e6f797..1d3124580ad1 100644
--- a/lms/djangoapps/verify_student/admin.py
+++ b/lms/djangoapps/verify_student/admin.py
@@ -2,14 +2,14 @@
 Admin site configurations for verify_student.
 """
 
-
 from django.contrib import admin
 
 from lms.djangoapps.verify_student.models import (
     ManualVerification,
     SoftwareSecurePhotoVerification,
     SSOVerification,
-    SSPVerificationRetryConfig
+    SSPVerificationRetryConfig,
+    VerificationAttempt
 )
 
 
@@ -50,3 +50,13 @@ class SSPVerificationRetryAdmin(admin.ModelAdmin):
     Admin for the SSPVerificationRetryConfig table.
     """
     pass  # lint-amnesty, pylint: disable=unnecessary-pass
+
+
+@admin.register(VerificationAttempt)
+class VerificationAttemptAdmin(admin.ModelAdmin):
+    """
+    Admin for the VerificationAttempt table.
+    """
+    list_display = ('id', 'user', 'name', 'status', 'expiration_datetime',)
+    raw_id_fields = ('user',)
+    search_fields = ('user__username', 'name',)
diff --git a/lms/djangoapps/verify_student/api.py b/lms/djangoapps/verify_student/api.py
index c974fa0c8e5f..7b8310fde030 100644
--- a/lms/djangoapps/verify_student/api.py
+++ b/lms/djangoapps/verify_student/api.py
@@ -1,12 +1,31 @@
 """
 API module.
 """
+import logging
+
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.utils.translation import gettext as _
 
+from datetime import datetime
+from typing import Optional
+
 from lms.djangoapps.verify_student.emails import send_verification_approved_email
+from lms.djangoapps.verify_student.exceptions import VerificationAttemptInvalidStatus
+from lms.djangoapps.verify_student.models import VerificationAttempt
+from lms.djangoapps.verify_student.signals.signals import (
+    emit_idv_attempt_approved_event,
+    emit_idv_attempt_created_event,
+    emit_idv_attempt_denied_event,
+    emit_idv_attempt_pending_event,
+)
+from lms.djangoapps.verify_student.statuses import VerificationAttemptStatus
 from lms.djangoapps.verify_student.tasks import send_verification_status_email
 
+log = logging.getLogger(__name__)
+
+User = get_user_model()
+
 
 def send_approval_email(attempt):
     """
@@ -33,3 +52,123 @@ def send_approval_email(attempt):
     else:
         email_context = {'user': attempt.user, 'expiration_datetime': expiration_datetime.strftime("%m/%d/%Y")}
         send_verification_approved_email(context=email_context)
+
+
+def create_verification_attempt(
+    user: User,
+    name: str,
+    status: str,
+    expiration_datetime: Optional[datetime] = None,
+    hide_status_from_user: Optional[bool] = False,
+):
+    """
+    Create a verification attempt.
+
+    This method is intended to be used by IDV implementation plugins to create VerificationAttempt instances.
+
+    Args:
+        user (User): the user (usually a learner) performing the verification attempt
+        name (string): the name being ID verified
+        status (string): the initial status of the verification attempt
+        expiration_datetime (datetime, optional): When the verification attempt expires. Defaults to None.
+
+    Returns:
+        id (int): The id of the created VerificationAttempt instance
+    """
+    verification_attempt = VerificationAttempt.objects.create(
+        user=user,
+        name=name,
+        status=status,
+        expiration_datetime=expiration_datetime,
+        hide_status_from_user=hide_status_from_user,
+    )
+
+    emit_idv_attempt_created_event(
+        attempt_id=verification_attempt.id,
+        user=user,
+        status=status,
+        name=name,
+        expiration_date=expiration_datetime,
+    )
+
+    return verification_attempt.id
+
+
+def update_verification_attempt(
+    attempt_id: int,
+    name: Optional[str] = None,
+    status: Optional[str] = None,
+    expiration_datetime: Optional[datetime] = None,
+):
+    """
+    Update a verification attempt.
+
+    This method is intended to be used by IDV implementation plugins to update VerificationAttempt instances.
+
+    Arguments:
+        * attempt_id (int): the verification attempt id of the attempt to update
+        * name (string, optional): the new name being ID verified
+        * status (string, optional): the new status of the verification attempt
+        * expiration_datetime (datetime, optional): The new expiration date and time
+
+    Returns:
+        * None
+    """
+    try:
+        attempt = VerificationAttempt.objects.get(id=attempt_id)
+    except VerificationAttempt.DoesNotExist:
+        log.error(
+            f'VerificationAttempt with id {attempt_id} was not found '
+            f'when updating the attempt to status={status}',
+        )
+        raise
+
+    if name is not None:
+        attempt.name = name
+
+    if status is not None:
+        attempt.status = status
+
+        status_list = list(VerificationAttemptStatus)
+        if status not in status_list:
+            log.error(
+                'Attempted to call update_verification_attempt called with invalid status: %(status)s. '
+                'Status must be one of: %(status_list)s',
+                {
+                    'status': status,
+                    'status_list': VerificationAttempt.STATUS,
+                },
+            )
+            raise VerificationAttemptInvalidStatus
+
+    # NOTE: Generally, we only set the expiration date from the time that an IDV attempt is marked approved,
+    # so we allow expiration_datetime to = None for other status updates (e.g. pending).
+    attempt.expiration_datetime = expiration_datetime
+
+    attempt.save()
+
+    user = attempt.user
+    if status == VerificationAttemptStatus.PENDING:
+        emit_idv_attempt_pending_event(
+            attempt_id=attempt_id,
+            user=user,
+            status=status,
+            name=name,
+            expiration_date=expiration_datetime,
+        )
+    elif status == VerificationAttemptStatus.APPROVED:
+        emit_idv_attempt_approved_event(
+            attempt_id=attempt_id,
+            user=user,
+            status=status,
+            name=name,
+            expiration_date=expiration_datetime,
+        )
+    elif status == VerificationAttemptStatus.DENIED:
+        emit_idv_attempt_denied_event(
+            attempt_id=attempt_id,
+            user=user,
+            status=status,
+            name=name,
+            expiration_date=expiration_datetime,
+        )
diff --git a/lms/djangoapps/verify_student/apps.py b/lms/djangoapps/verify_student/apps.py
index f01bdef7e908..1cc499f4972f 100644
--- a/lms/djangoapps/verify_student/apps.py
+++ b/lms/djangoapps/verify_student/apps.py
@@ -17,5 +17,5 @@ def ready(self):
         """
         Connect signal handlers.
         """
-        from lms.djangoapps.verify_student import signals  # pylint: disable=unused-import
+        from lms.djangoapps.verify_student.signals import handlers, signals  # pylint: disable=unused-import
         from lms.djangoapps.verify_student import tasks    # pylint: disable=unused-import
diff --git a/lms/djangoapps/verify_student/exceptions.py b/lms/djangoapps/verify_student/exceptions.py
index 59e7d5623f05..d13e52d3e737 100644
--- a/lms/djangoapps/verify_student/exceptions.py
+++ b/lms/djangoapps/verify_student/exceptions.py
@@ -5,3 +5,7 @@
 
 class WindowExpiredException(Exception):
     pass
+
+
+class VerificationAttemptInvalidStatus(Exception):
+    pass
diff --git a/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py b/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py
index b87b2eee4559..4c45f415cf63 100644
--- a/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py
@@ -8,12 +8,13 @@
 import time
 from pprint import pformat
 
-from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.core.management.base import BaseCommand, CommandError
 
+from common.djangoapps.student.models_api import get_name, get_pending_name_change
 from lms.djangoapps.verify_student.api import send_approval_email
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
 from lms.djangoapps.verify_student.utils import earliest_allowed_verification_date
+from openedx.features.name_affirmation_api.utils import get_name_affirmation_service
 
 
 log = logging.getLogger(__name__)
@@ -150,5 +151,37 @@ def _approve_id_verifications(self, user_ids):
         for verification in existing_id_verifications:
             verification.approve(service='idv_verifications command')
             send_approval_email(verification)
+            self._approve_verified_name_for_software_secure_verification(verification)
 
         return list(failed_user_ids)
+
+    def _approve_verified_name_for_software_secure_verification(self, verification):
+        """
+        This method manually creates a verified name given a SoftwareSecurePhotoVerification object.
+        """
+
+        name_affirmation_service = get_name_affirmation_service()
+
+        if name_affirmation_service:
+            from edx_name_affirmation.exceptions import VerifiedNameDoesNotExist  # pylint: disable=import-error
+
+            pending_name_change = get_pending_name_change(verification.user)
+            if pending_name_change:
+                full_name = pending_name_change.new_name
+            else:
+                full_name = get_name(verification.user.id)
+
+            try:
+                name_affirmation_service.update_verified_name_status(
+                    verification.user,
+                    'approved',
+                    verification_attempt_id=verification.id
+                )
+            except VerifiedNameDoesNotExist:
+                name_affirmation_service.create_verified_name(
+                    verification.user,
+                    verification.name,
+                    full_name,
+                    verification_attempt_id=verification.id,
+                    status='approved',
+                )
diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py b/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py
index e6e580c1d1a6..6eccee194795 100644
--- a/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py
@@ -6,6 +6,8 @@
 import logging
 import os
 import tempfile
+from unittest import skipUnless
+from unittest.mock import MagicMock, patch
 
 import pytest
 from django.core import mail
@@ -15,9 +17,12 @@
 
 from common.djangoapps.student.tests.factories import UserFactory, UserProfileFactory
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
+from openedx.features.name_affirmation_api.utils import get_name_affirmation_service
 
 LOGGER_NAME = 'lms.djangoapps.verify_student.management.commands.approve_id_verifications'
 
+name_affirmation_service = get_name_affirmation_service()
+
 
 @ddt.ddt
 class TestApproveIDVerificationsCommand(TestCase):
@@ -158,3 +163,57 @@ def test_invalid_file_path(self):
         """
         with pytest.raises(CommandError):
             call_command('approve_id_verifications', 'invalid/user_id/file/path')
+
+    @skipUnless(name_affirmation_service is not None, 'Requires Name Affirmation')
+    @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_name_affirmation_service')
+    def test_create_verified_names(self, mock_get_service):
+        mock_service = MagicMock()
+        mock_get_service.return_value = mock_service
+
+        verification = SoftwareSecurePhotoVerification.objects.create(
+            user=self.user1_profile.user,
+            name=self.user1_profile.name,
+            status='submitted',
+        )
+
+        call_command('approve_id_verifications', self.tmp_file_path)
+        mock_service.update_verified_name_status.assert_called_with(
+            self.user1_profile.user,
+            'approved',
+            verification_attempt_id=verification.id,
+        )
+
+    @skipUnless(name_affirmation_service is not None, 'Requires Name Affirmation')
+    @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_name')
+    @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_pending_name_change')
+    @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_name_affirmation_service')
+    @ddt.data(
+        '',
+        MagicMock(new_name='test')
+    )
+    def test_create_update_verified_names(self, pending_name, mock_get_service, mock_get_pending, mock_get_name):
+        from edx_name_affirmation.exceptions import VerifiedNameDoesNotExist  # pylint: disable=import-error
+
+        mock_service = MagicMock()
+        mock_get_service.return_value = mock_service
+        mock_service.update_verified_name_status.side_effect = VerifiedNameDoesNotExist()
+
+        mock_get_pending.return_value = pending_name
+        mock_get_name.return_value = self.user1_profile.name
+
+        verification = SoftwareSecurePhotoVerification.objects.create(
+            user=self.user1_profile.user,
+            name=self.user1_profile.name,
+            status='submitted',
+        )
+
+        expected_name = 'test' if pending_name else self.user1_profile.name
+
+        call_command('approve_id_verifications', self.tmp_file_path)
+        mock_service.create_verified_name.assert_called_with(
+            verification.user,
+            verification.name,
+            expected_name,
+            verification_attempt_id=verification.id,
+            status='approved',
+        )
diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py b/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py
index 4a93aa19f169..d9f356758dd8 100644
--- a/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py
+++ b/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py
@@ -54,7 +54,7 @@ def test_performance(self):
         #self.assertNumQueries(100)
 
     def test_signal_called(self):
-        with patch('openedx.core.djangoapps.signals.signals.LEARNER_NOW_VERIFIED.send_robust') as mock_signal:
+        with patch('openedx.core.djangoapps.signals.signals.LEARNER_SSO_VERIFIED.send_robust') as mock_signal:
             call_command('backfill_sso_verifications_for_old_account_links', '--provider-slug', self.provider.provider_id)  # lint-amnesty, pylint: disable=line-too-long
         assert mock_signal.call_count == 1
 
diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_retry_failed_photo_verifications.py b/lms/djangoapps/verify_student/management/commands/tests/test_retry_failed_photo_verifications.py
index 1c3f22aa30cd..8fa84efe3a85 100644
--- a/lms/djangoapps/verify_student/management/commands/tests/test_retry_failed_photo_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/tests/test_retry_failed_photo_verifications.py
@@ -121,7 +121,7 @@ def _create_attempts(self, num_attempts):
         for _ in range(num_attempts):
             self.create_upload_and_submit_attempt_for_user()
 
-    @patch('lms.djangoapps.verify_student.signals.idv_update_signal.send')
+    @patch('lms.djangoapps.verify_student.signals.signals.idv_update_signal.send')
     def test_resubmit_in_date_range(self, send_idv_update_mock):
         call_command('retry_failed_photo_verifications',
                      status="submitted",
diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_trigger_softwaresecurephotoverifications_post_save_signal.py b/lms/djangoapps/verify_student/management/commands/tests/test_trigger_softwaresecurephotoverifications_post_save_signal.py
index 99fd4ecd3a5f..c9e98a94dec0 100644
--- a/lms/djangoapps/verify_student/management/commands/tests/test_trigger_softwaresecurephotoverifications_post_save_signal.py
+++ b/lms/djangoapps/verify_student/management/commands/tests/test_trigger_softwaresecurephotoverifications_post_save_signal.py
@@ -38,7 +38,7 @@ def _create_attempts(self, num_attempts):
         for _ in range(num_attempts):
             self.create_and_submit_attempt_for_user()
 
-    @patch('lms.djangoapps.verify_student.signals.idv_update_signal.send')
+    @patch('lms.djangoapps.verify_student.signals.signals.idv_update_signal.send')
     def test_command(self, send_idv_update_mock):
         call_command('trigger_softwaresecurephotoverifications_post_save_signal', start_date_time='2021-10-31 06:00:00')
 
diff --git a/lms/djangoapps/verify_student/migrations/0016_remove_verificationattempt_created_and_more.py b/lms/djangoapps/verify_student/migrations/0016_remove_verificationattempt_created_and_more.py
new file mode 100644
index 000000000000..d972dba3dbbd
--- /dev/null
+++ b/lms/djangoapps/verify_student/migrations/0016_remove_verificationattempt_created_and_more.py
@@ -0,0 +1,50 @@
+# Generated by Django 4.2.15 on 2024-09-26 20:08
+
+from django.db import migrations, models
+import django.utils.timezone
+import lms.djangoapps.verify_student.statuses
+import model_utils.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('verify_student', '0015_verificationattempt'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='verificationattempt',
+            name='created',
+        ),
+        migrations.RemoveField(
+            model_name='verificationattempt',
+            name='modified',
+        ),
+        migrations.AddField(
+            model_name='verificationattempt',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, db_index=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='verificationattempt',
+            name='hide_status_from_user',
+            field=models.BooleanField(default=False, null=True),
+        ),
+        migrations.AddField(
+            model_name='verificationattempt',
+            name='status_changed',
+            field=model_utils.fields.MonitorField(default=django.utils.timezone.now, monitor='status', verbose_name='status changed'),
+        ),
+        migrations.AddField(
+            model_name='verificationattempt',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='verificationattempt',
+            name='status',
+            field=model_utils.fields.StatusField(choices=[(lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['CREATED'], lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['CREATED']), (lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['PENDING'], lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['PENDING']), (lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['APPROVED'], lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['APPROVED']), (lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['DENIED'], lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['DENIED'])], default=lms.djangoapps.verify_student.statuses.VerificationAttemptStatus['CREATED'], max_length=100, no_check_for_status=True, verbose_name='status'),
+        ),
+    ]
diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py
index 903d80bf9245..1c10cf7d0a83 100644
--- a/lms/djangoapps/verify_student/models.py
+++ b/lms/djangoapps/verify_student/models.py
@@ -15,9 +15,11 @@
 import logging
 import os.path
 import uuid
+
 from datetime import timedelta
 from email.utils import formatdate
 
+
 import requests
 from config_models.models import ConfigurationModel
 from django.conf import settings
@@ -42,7 +44,7 @@
     rsa_decrypt,
     rsa_encrypt
 )
-from openedx.core.djangoapps.signals.signals import LEARNER_NOW_VERIFIED
+from openedx.core.djangoapps.signals.signals import LEARNER_SSO_VERIFIED, PHOTO_VERIFICATION_APPROVED
 from openedx.core.storage import get_storage
 
 from .utils import auto_verify_for_testing_enabled, earliest_allowed_verification_date, submit_request_to_ss
@@ -249,12 +251,12 @@ def send_approval_signal(self, approved_by='None'):
         ))
 
         # Emit signal to find and generate eligible certificates
-        LEARNER_NOW_VERIFIED.send_robust(
-            sender=SSOVerification,
-            user=self.user
+        LEARNER_SSO_VERIFIED.send_robust(
+            sender=PhotoVerification,
+            user=self.user,
         )
 
-        message = 'LEARNER_NOW_VERIFIED signal fired for {user} from SSOVerification'
+        message = 'LEARNER_SSO_VERIFIED signal fired for {user} from SSOVerification'
         log.info(message.format(user=self.user.username))
 
 
@@ -451,13 +453,14 @@ def approve(self, user_id=None, service=""):
             days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"]
         )
         self.save()
+
         # Emit signal to find and generate eligible certificates
-        LEARNER_NOW_VERIFIED.send_robust(
+        PHOTO_VERIFICATION_APPROVED.send_robust(
             sender=PhotoVerification,
-            user=self.user
+            user=self.user,
         )
 
-        message = 'LEARNER_NOW_VERIFIED signal fired for {user} from PhotoVerification'
+        message = 'PHOTO_VERIFICATION_APPROVED signal fired for {user} from PhotoVerification'
         log.info(message.format(user=self.user.username))
 
     @status_before_must_be("ready", "must_retry")
@@ -1174,8 +1177,10 @@ def deadline_for_course(cls, course_key):
 
 class SSPVerificationRetryConfig(ConfigurationModel):  # pylint: disable=model-missing-unicode, useless-suppression
     """
-        SSPVerificationRetryConfig used to inject arguments
-        to retry_failed_photo_verifications management command
+    SSPVerificationRetryConfig used to inject arguments
+    to retry_failed_photo_verifications management command
+
+    .. no_pii:
     """
 
     class Meta:
@@ -1192,25 +1197,66 @@ def __str__(self):
         return str(self.arguments)
 
 
-class VerificationAttempt(TimeStampedModel):
+class VerificationAttempt(StatusModel):
     """
     The model represents impelementation-agnostic information about identity verification (IDV) attempts.
 
     Plugins that implement forms of IDV can store information about IDV attempts in this model for use across
     the platform.
+
+    .. pii: Contains the name of the user
+    .. pii_types: name
+    .. pii_retirement: local_api
     """
     user = models.ForeignKey(User, db_index=True, on_delete=models.CASCADE)
     name = models.CharField(blank=True, max_length=255)
 
-    STATUS_CHOICES = [
-        VerificationAttemptStatus.created,
-        VerificationAttemptStatus.pending,
-        VerificationAttemptStatus.approved,
-        VerificationAttemptStatus.denied,
-    ]
-    status = models.CharField(max_length=64, choices=[(status, status) for status in STATUS_CHOICES])
+    STATUS = Choices(
+        VerificationAttemptStatus.CREATED,
+        VerificationAttemptStatus.PENDING,
+        VerificationAttemptStatus.APPROVED,
+        VerificationAttemptStatus.DENIED,
+    )
 
     expiration_datetime = models.DateTimeField(
         null=True,
         blank=True,
     )
+
+    hide_status_from_user = models.BooleanField(
+        default=False,
+        null=True,
+    )
+
+    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
+    updated_at = models.DateTimeField(auto_now=True, db_index=True)
+
+    def should_display_status_to_user(self):
+        """When called, returns true or false based on the type of VerificationAttempt"""
+        return not self.hide_status_from_user
+
+    def active_at_datetime(self, deadline):
+        """Check whether the verification was active at a particular datetime.
+
+        Arguments:
+            deadline (datetime): The date at which the verification was active
+                (created before and expiration datetime is after today).
+
+        Returns:
+            bool
+
+        """
+        return (
+            self.created_at <= deadline and
+            (self.expiration_datetime is None or self.expiration_datetime > now())
+        )
+
+    @classmethod
+    def retire_user(cls, user_id):
+        """
+        Retire user as part of GDPR pipeline
+
+        :param user_id: int
+        """
+        verification_attempts = cls.objects.filter(user_id=user_id)
+        verification_attempts.delete()
diff --git a/lms/djangoapps/verify_student/services.py b/lms/djangoapps/verify_student/services.py
index bdfa31fee6d6..95dbccf0d59d 100644
--- a/lms/djangoapps/verify_student/services.py
+++ b/lms/djangoapps/verify_student/services.py
@@ -8,16 +8,16 @@
 from urllib.parse import quote
 
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
 from django.utils.timezone import now
 from django.utils.translation import gettext as _
+from openedx_filters.learning.filters import IDVPageURLRequested
 
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.models import User
 from lms.djangoapps.verify_student.utils import is_verification_expiring_soon
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
-from .models import ManualVerification, SoftwareSecurePhotoVerification, SSOVerification
+from .models import ManualVerification, SoftwareSecurePhotoVerification, SSOVerification, VerificationAttempt
 from .utils import most_recent_verification
 
 log = logging.getLogger(__name__)
@@ -75,7 +75,8 @@ def verifications_for_user(cls, user):
         Return a list of all verifications associated with the given user.
         """
         verifications = []
-        for verification in chain(SoftwareSecurePhotoVerification.objects.filter(user=user).order_by('-created_at'),
+        for verification in chain(VerificationAttempt.objects.filter(user=user).order_by('-created_at'),
+                                  SoftwareSecurePhotoVerification.objects.filter(user=user).order_by('-created_at'),
                                   SSOVerification.objects.filter(user=user).order_by('-created_at'),
                                   ManualVerification.objects.filter(user=user).order_by('-created_at')):
             verifications.append(verification)
@@ -92,6 +93,11 @@ def get_verified_user_ids(cls, users):
             'created_at__gt': now() - timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
         }
         return chain(
+            VerificationAttempt.objects.filter(**{
+                'user__in': users,
+                'status': 'approved',
+                'created_at__gt': now() - timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+            }).values_list('user_id', flat=True),
             SoftwareSecurePhotoVerification.objects.filter(**filter_kwargs).values_list('user_id', flat=True),
             SSOVerification.objects.filter(**filter_kwargs).values_list('user_id', flat=True),
             ManualVerification.objects.filter(**filter_kwargs).values_list('user_id', flat=True)
@@ -117,11 +123,14 @@ def get_expiration_datetime(cls, user, statuses):
             'status__in': statuses,
         }
 
+        id_verifications = VerificationAttempt.objects.filter(**filter_kwargs)
         photo_id_verifications = SoftwareSecurePhotoVerification.objects.filter(**filter_kwargs)
         sso_id_verifications = SSOVerification.objects.filter(**filter_kwargs)
         manual_id_verifications = ManualVerification.objects.filter(**filter_kwargs)
 
-        attempt = most_recent_verification((photo_id_verifications, sso_id_verifications, manual_id_verifications))
+        attempt = most_recent_verification(
+            (photo_id_verifications, sso_id_verifications, manual_id_verifications, id_verifications)
+        )
         return attempt and attempt.expiration_datetime
 
     @classmethod
@@ -167,10 +176,20 @@ def user_status(cls, user):
         if verifications:
             attempt = verifications[0]
             for verification in verifications:
-                if verification.expiration_datetime > now() and verification.status == 'approved':
-                    # Always select the LATEST non-expired approved verification if there is such
-                    if attempt.status != 'approved' or (
-                        attempt.expiration_datetime < verification.expiration_datetime
+                # If a verification has no expiration_datetime, it's implied that it never expires, so we should still
+                # consider verifications in the approved state that have no expiration date.
+                if (
+                    not verification.expiration_datetime or
+                        verification.expiration_datetime > now()
+                ) and verification.status == 'approved':
+                    # Always select the LATEST non-expired approved verification if there is such.
+                    if (
+                        attempt.status != 'approved' or
+                        (
+                            attempt.expiration_datetime and
+                            verification.expiration_datetime and
+                            attempt.expiration_datetime < verification.expiration_datetime
+                        )
                     ):
                         attempt = verification
 
@@ -179,7 +198,7 @@ def user_status(cls, user):
 
         user_status['should_display'] = attempt.should_display_status_to_user()
 
-        if attempt.expiration_datetime < now() and attempt.status == 'approved':
+        if attempt.expiration_datetime and attempt.expiration_datetime < now() and attempt.status == 'approved':
             if user_status['should_display']:
                 user_status['status'] = 'expired'
                 user_status['error'] = _("Your {platform_name} verification has expired.").format(
@@ -235,24 +254,7 @@ def get_verify_location(cls, course_id=None):
         location = f'{settings.ACCOUNT_MICROFRONTEND_URL}/id-verification'
         if course_id:
             location += f'?course_id={quote(str(course_id))}'
-        return location
 
-    @classmethod
-    def get_verification_details_by_id(cls, attempt_id):
-        """
-        Returns a verification attempt object by attempt_id
-        If the verification object cannot be found, returns None
-        """
-        verification = None
-        verification_models = [
-            SoftwareSecurePhotoVerification,
-            SSOVerification,
-            ManualVerification,
-        ]
-        for ver_model in verification_models:
-            if not verification:
-                try:
-                    verification = ver_model.objects.get(id=attempt_id)
-                except ObjectDoesNotExist:
-                    pass
-        return verification
+        # .. filter_implemented_name: IDVPageURLRequested
+        # .. filter_type: org.openedx.learning.idv.page.url.requested.v1
+        return IDVPageURLRequested.run_filter(location)
diff --git a/openedx/core/djangoapps/learner_pathway/__init__.py b/lms/djangoapps/verify_student/signals/__init__.py
similarity index 100%
rename from openedx/core/djangoapps/learner_pathway/__init__.py
rename to lms/djangoapps/verify_student/signals/__init__.py
diff --git a/lms/djangoapps/verify_student/signals.py b/lms/djangoapps/verify_student/signals/handlers.py
similarity index 82%
rename from lms/djangoapps/verify_student/signals.py
rename to lms/djangoapps/verify_student/signals/handlers.py
index d929af68dd06..8a1d7b542b00 100644
--- a/lms/djangoapps/verify_student/signals.py
+++ b/lms/djangoapps/verify_student/signals/handlers.py
@@ -5,23 +5,23 @@
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.signals import post_save
-from django.dispatch import Signal
 from django.dispatch.dispatcher import receiver
 from xmodule.modulestore.django import SignalHandler, modulestore
 
 from common.djangoapps.student.models_api import get_name, get_pending_name_change
-from openedx.core.djangoapps.user_api.accounts.signals import USER_RETIRE_LMS_CRITICAL
+from lms.djangoapps.verify_student.apps import VerifyStudentConfig  # pylint: disable=unused-import
+from lms.djangoapps.verify_student.signals.signals import idv_update_signal
+from openedx.core.djangoapps.user_api.accounts.signals import USER_RETIRE_LMS_CRITICAL, USER_RETIRE_LMS_MISC
 
-from .models import SoftwareSecurePhotoVerification, VerificationDeadline
+from lms.djangoapps.verify_student.models import (
+    SoftwareSecurePhotoVerification,
+    VerificationDeadline,
+    VerificationAttempt
+)
 
 log = logging.getLogger(__name__)
 
 
-# Signal for emitting IDV submission and review updates
-# providing_args = ["attempt_id", "user_id", "status", "full_name", "profile_name"]
-idv_update_signal = Signal()
-
-
 @receiver(SignalHandler.course_published)
 def _listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=unused-argument
     """
@@ -75,3 +75,9 @@ def send_idv_update(sender, instance, **kwargs):  # pylint: disable=unused-argum
         photo_id_name=instance.name,
         full_name=full_name
     )
+
+
+@receiver(USER_RETIRE_LMS_MISC)
+def _listen_for_lms_retire_verification_attempts(sender, **kwargs):  # pylint: disable=unused-argument
+    user = kwargs.get('user')
+    VerificationAttempt.retire_user(user.id)
diff --git a/lms/djangoapps/verify_student/signals/signals.py b/lms/djangoapps/verify_student/signals/signals.py
new file mode 100644
index 000000000000..c03d5f263191
--- /dev/null
+++ b/lms/djangoapps/verify_student/signals/signals.py
@@ -0,0 +1,109 @@
+"""
+Signal definitions and functions to send those signals for the verify_student application.
+"""
+
+from django.dispatch import Signal
+
+from openedx_events.learning.data import UserData, UserPersonalData, VerificationAttemptData
+from openedx_events.learning.signals import (
+    IDV_ATTEMPT_CREATED,
+    IDV_ATTEMPT_PENDING,
+    IDV_ATTEMPT_APPROVED,
+    IDV_ATTEMPT_DENIED,
+)
+
+# Signal for emitting IDV submission and review updates
+# providing_args = ["attempt_id", "user_id", "status", "full_name", "profile_name"]
+idv_update_signal = Signal()
+
+
+def _create_user_data(user):
+    """
+    Helper function to create a UserData object.
+    """
+    user_data = UserData(
+        id=user.id,
+        is_active=user.is_active,
+        pii=UserPersonalData(
+            username=user.username,
+            email=user.email,
+            name=user.get_full_name()
+        )
+    )
+
+    return user_data
+
+
+def emit_idv_attempt_created_event(attempt_id, user, status, name, expiration_date):
+    """
+    Emit the IDV_ATTEMPT_CREATED Open edX event.
+    """
+    user_data = _create_user_data(user)
+
+    # .. event_implemented_name: IDV_ATTEMPT_CREATED
+    IDV_ATTEMPT_CREATED.send_event(
+        idv_attempt=VerificationAttemptData(
+            attempt_id=attempt_id,
+            user=user_data,
+            status=status,
+            name=name,
+            expiration_date=expiration_date,
+        )
+    )
+    return user_data
+
+
+def emit_idv_attempt_pending_event(attempt_id, user, status, name, expiration_date):
+    """
+    Emit the IDV_ATTEMPT_PENDING Open edX event.
+    """
+    user_data = _create_user_data(user)
+
+    # .. event_implemented_name: IDV_ATTEMPT_PENDING
+    IDV_ATTEMPT_PENDING.send_event(
+        idv_attempt=VerificationAttemptData(
+            attempt_id=attempt_id,
+            user=user_data,
+            status=status,
+            name=name,
+            expiration_date=expiration_date,
+        )
+    )
+    return user_data
+
+
+def emit_idv_attempt_approved_event(attempt_id, user, status, name, expiration_date):
+    """
+    Emit the IDV_ATTEMPT_APPROVED Open edX event.
+    """
+    user_data = _create_user_data(user)
+
+    # .. event_implemented_name: IDV_ATTEMPT_APPROVED
+    IDV_ATTEMPT_APPROVED.send_event(
+        idv_attempt=VerificationAttemptData(
+            attempt_id=attempt_id,
+            user=user_data,
+            status=status,
+            name=name,
+            expiration_date=expiration_date,
+        )
+    )
+    return user_data
+
+
+def emit_idv_attempt_denied_event(attempt_id, user, status, name, expiration_date):
+    """
+    Emit the IDV_ATTEMPT_DENIED Open edX event.
+    """
+    user_data = _create_user_data(user)
+
+    # .. event_implemented_name: IDV_ATTEMPT_DENIED
+    IDV_ATTEMPT_DENIED.send_event(
+        idv_attempt=VerificationAttemptData(
+            attempt_id=attempt_id,
+            user=user_data,
+            status=status,
+            name=name,
+            expiration_date=expiration_date,
+        )
+    )
diff --git a/lms/djangoapps/verify_student/statuses.py b/lms/djangoapps/verify_student/statuses.py
index b55a9042e0f6..41ef381cfe06 100644
--- a/lms/djangoapps/verify_student/statuses.py
+++ b/lms/djangoapps/verify_student/statuses.py
@@ -1,21 +1,22 @@
 """
 Status enums for verify_student.
 """
+from enum import StrEnum, auto
 
 
-class VerificationAttemptStatus:
+class VerificationAttemptStatus(StrEnum):
     """This class describes valid statuses for a verification attempt to be in."""
 
     # This is the initial state of a verification attempt, before a learner has started IDV.
-    created = "created"
+    CREATED = auto()
 
     # A verification attempt is pending when it has been started but has not yet been completed.
-    pending = "pending"
+    PENDING = auto()
 
     # A verification attempt is approved when it has been approved by some mechanism (e.g. automatic review, manual
     # review, etc).
-    approved = "approved"
+    APPROVED = auto()
 
     # A verification attempt is denied when it has been denied by some mechanism (e.g. automatic review, manual review,
     # etc).
-    denied = "denied"
+    DENIED = auto()
diff --git a/lms/djangoapps/verify_student/tests/__init__.py b/lms/djangoapps/verify_student/tests/__init__.py
index cea71e52c37d..015cd354aba7 100644
--- a/lms/djangoapps/verify_student/tests/__init__.py
+++ b/lms/djangoapps/verify_student/tests/__init__.py
@@ -9,7 +9,7 @@
 from django.utils.timezone import now
 
 from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
+from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationAttempt
 
 
 class TestVerificationBase(TestCase):
@@ -52,11 +52,14 @@ def verification_active_at_datetime(self, attempt):
 
         # Active immediately before expiration date
         expiration = attempt.expiration_datetime
-        before_expiration = expiration - timedelta(seconds=1)
-        assert attempt.active_at_datetime(before_expiration)
+        if expiration:
+            before_expiration = expiration - timedelta(seconds=1)
+            assert attempt.active_at_datetime(before_expiration)
 
         # Not active after the expiration date
-        attempt.expiration_date = now() - timedelta(days=1)
+        field = 'expiration_datetime' if isinstance(attempt, VerificationAttempt) else 'expiration_date'
+        setattr(attempt, field, now() - timedelta(days=1))
+        # attempt.expiration_date = now() - timedelta(days=1)
         attempt.save()
         assert not attempt.active_at_datetime(now())
 
diff --git a/lms/djangoapps/verify_student/tests/factories.py b/lms/djangoapps/verify_student/tests/factories.py
index da35e98cc53f..d7eaeaf30211 100644
--- a/lms/djangoapps/verify_student/tests/factories.py
+++ b/lms/djangoapps/verify_student/tests/factories.py
@@ -3,7 +3,7 @@
 """
 from factory.django import DjangoModelFactory
 
-from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, SSOVerification
+from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, SSOVerification, VerificationAttempt
 
 
 class SoftwareSecurePhotoVerificationFactory(DjangoModelFactory):
@@ -19,3 +19,8 @@ class Meta:
 class SSOVerificationFactory(DjangoModelFactory):
     class Meta():
         model = SSOVerification
+
+
+class VerificationAttemptFactory(DjangoModelFactory):
+    class Meta:
+        model = VerificationAttempt
diff --git a/lms/djangoapps/verify_student/tests/test_api.py b/lms/djangoapps/verify_student/tests/test_api.py
index acdebaa70c1c..2be7b6580905 100644
--- a/lms/djangoapps/verify_student/tests/test_api.py
+++ b/lms/djangoapps/verify_student/tests/test_api.py
@@ -3,14 +3,21 @@
 """
 from unittest.mock import patch
 
+from datetime import datetime, timezone
 import ddt
 from django.conf import settings
 from django.core import mail
 from django.test import TestCase
 
 from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.verify_student.api import send_approval_email
-from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
+from lms.djangoapps.verify_student.api import (
+    create_verification_attempt,
+    send_approval_email,
+    update_verification_attempt,
+)
+from lms.djangoapps.verify_student.exceptions import VerificationAttemptInvalidStatus
+from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationAttempt
+from lms.djangoapps.verify_student.statuses import VerificationAttemptStatus
 
 
 @ddt.ddt
@@ -18,6 +25,7 @@ class TestSendApprovalEmail(TestCase):
     """
     Test cases for the send_approval_email API method.
     """
+
     def setUp(self):
         super().setUp()
 
@@ -41,3 +49,183 @@ def test_send_approval(self, use_ace):
         with patch.dict(settings.VERIFY_STUDENT, {'USE_DJANGO_MAIL': use_ace}):
             send_approval_email(self.attempt)
             self._assert_verification_approved_email(self.attempt.expiration_datetime)
+
+
+@ddt.ddt
+class CreateVerificationAttempt(TestCase):
+    """
+    Test cases for the create_verification_attempt API method.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.user = UserFactory.create()
+        self.attempt = VerificationAttempt(
+            user=self.user,
+            name='Tester McTest',
+            status=VerificationAttemptStatus.CREATED,
+            expiration_datetime=datetime(2024, 12, 31, tzinfo=timezone.utc)
+        )
+        self.attempt.save()
+
+    @patch('lms.djangoapps.verify_student.api.emit_idv_attempt_created_event')
+    def test_create_verification_attempt(self, mock_created_event):
+        expected_id = 2
+        self.assertEqual(
+            create_verification_attempt(
+                user=self.user,
+                name='Tester McTest',
+                status=VerificationAttemptStatus.CREATED,
+                expiration_datetime=datetime(2024, 12, 31, tzinfo=timezone.utc)
+            ),
+            expected_id
+        )
+        verification_attempt = VerificationAttempt.objects.get(id=expected_id)
+
+        self.assertEqual(verification_attempt.user, self.user)
+        self.assertEqual(verification_attempt.name, 'Tester McTest')
+        self.assertEqual(verification_attempt.status, VerificationAttemptStatus.CREATED)
+        self.assertEqual(verification_attempt.expiration_datetime, datetime(2024, 12, 31, tzinfo=timezone.utc))
+        mock_created_event.assert_called_with(
+            attempt_id=verification_attempt.id,
+            user=self.user,
+            status=VerificationAttemptStatus.CREATED,
+            name='Tester McTest',
+            expiration_date=datetime(2024, 12, 31, tzinfo=timezone.utc),
+        )
+
+    def test_create_verification_attempt_no_expiration_datetime(self):
+        expected_id = 2
+        self.assertEqual(
+            create_verification_attempt(
+                user=self.user,
+                name='Tester McTest',
+                status=VerificationAttemptStatus.CREATED,
+            ),
+            expected_id
+        )
+        verification_attempt = VerificationAttempt.objects.get(id=expected_id)
+
+        self.assertEqual(verification_attempt.user, self.user)
+        self.assertEqual(verification_attempt.name, 'Tester McTest')
+        self.assertEqual(verification_attempt.status, VerificationAttemptStatus.CREATED)
+        self.assertEqual(verification_attempt.expiration_datetime, None)
+
+
+@ddt.ddt
+class UpdateVerificationAttempt(TestCase):
+    """
+    Test cases for the update_verification_attempt API method.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.user = UserFactory.create()
+        self.attempt = VerificationAttempt(
+            user=self.user,
+            name='Tester McTest',
+            status=VerificationAttemptStatus.CREATED,
+            expiration_datetime=datetime(2024, 12, 31, tzinfo=timezone.utc)
+        )
+        self.attempt.save()
+
+    @ddt.data(
+        ('Tester McTest', VerificationAttemptStatus.PENDING, datetime(2024, 12, 31, tzinfo=timezone.utc)),
+        ('Tester McTest2', VerificationAttemptStatus.APPROVED, datetime(2025, 12, 31, tzinfo=timezone.utc)),
+        ('Tester McTest3', VerificationAttemptStatus.DENIED, datetime(2026, 12, 31, tzinfo=timezone.utc)),
+    )
+    @ddt.unpack
+    @patch('lms.djangoapps.verify_student.api.emit_idv_attempt_pending_event')
+    @patch('lms.djangoapps.verify_student.api.emit_idv_attempt_approved_event')
+    @patch('lms.djangoapps.verify_student.api.emit_idv_attempt_denied_event')
+    def test_update_verification_attempt(
+        self,
+        name,
+        status,
+        expiration_datetime,
+        mock_denied_event,
+        mock_approved_event,
+        mock_pending_event,
+    ):
+        update_verification_attempt(
+            attempt_id=self.attempt.id,
+            name=name,
+            status=status,
+            expiration_datetime=expiration_datetime,
+        )
+
+        verification_attempt = VerificationAttempt.objects.get(id=self.attempt.id)
+
+        # Values should change as a result of this update.
+        self.assertEqual(verification_attempt.user, self.user)
+        self.assertEqual(verification_attempt.name, name)
+        self.assertEqual(verification_attempt.status, status)
+        self.assertEqual(verification_attempt.expiration_datetime, expiration_datetime)
+
+        if status == VerificationAttemptStatus.PENDING:
+            mock_pending_event.assert_called_with(
+                attempt_id=verification_attempt.id,
+                user=self.user,
+                status=status,
+                name=name,
+                expiration_date=expiration_datetime,
+            )
+        elif status == VerificationAttemptStatus.APPROVED:
+            mock_approved_event.assert_called_with(
+                attempt_id=verification_attempt.id,
+                user=self.user,
+                status=status,
+                name=name,
+                expiration_date=expiration_datetime,
+            )
+        elif status == VerificationAttemptStatus.DENIED:
+            mock_denied_event.assert_called_with(
+                attempt_id=verification_attempt.id,
+                user=self.user,
+                status=status,
+                name=name,
+                expiration_date=expiration_datetime,
+            )
+
+    def test_update_verification_attempt_none_values(self):
+        update_verification_attempt(
+            attempt_id=self.attempt.id,
+            name=None,
+            status=None,
+            expiration_datetime=None,
+        )
+
+        verification_attempt = VerificationAttempt.objects.get(id=self.attempt.id)
+
+        # Values should not change as a result of the values passed in being None, except for expiration_datetime.
+        self.assertEqual(verification_attempt.user, self.user)
+        self.assertEqual(verification_attempt.name, self.attempt.name)
+        self.assertEqual(verification_attempt.status, self.attempt.status)
+        self.assertEqual(verification_attempt.expiration_datetime, None)
+
+    def test_update_verification_attempt_not_found(self):
+        self.assertRaises(
+            VerificationAttempt.DoesNotExist,
+            update_verification_attempt,
+            attempt_id=999999,
+            name=None,
+            status=VerificationAttemptStatus.APPROVED,
+        )
+
+    @ddt.data(
+        'completed',
+        'failed',
+        'submitted',
+        'expired',
+    )
+    def test_update_verification_attempt_invalid(self, status):
+        self.assertRaises(
+            VerificationAttemptInvalidStatus,
+            update_verification_attempt,
+            attempt_id=self.attempt.id,
+            name=None,
+            status=status,
+            expiration_datetime=None,
+        )
diff --git a/lms/djangoapps/verify_student/tests/test_signals.py b/lms/djangoapps/verify_student/tests/test_handlers.py
similarity index 72%
rename from lms/djangoapps/verify_student/tests/test_signals.py
rename to lms/djangoapps/verify_student/tests/test_handlers.py
index fb32edeccde0..40d80712f19d 100644
--- a/lms/djangoapps/verify_student/tests/test_signals.py
+++ b/lms/djangoapps/verify_student/tests/test_handlers.py
@@ -10,17 +10,28 @@
 
 from common.djangoapps.student.models_api import do_name_change_request
 from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationDeadline
-from lms.djangoapps.verify_student.signals import _listen_for_course_publish, _listen_for_lms_retire
-from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory
+from lms.djangoapps.verify_student.models import (
+    SoftwareSecurePhotoVerification,
+    VerificationDeadline,
+    VerificationAttempt
+)
+from lms.djangoapps.verify_student.signals.handlers import (
+    _listen_for_course_publish,
+    _listen_for_lms_retire,
+    _listen_for_lms_retire_verification_attempts
+)
+from lms.djangoapps.verify_student.tests.factories import (
+    SoftwareSecurePhotoVerificationFactory,
+    VerificationAttemptFactory
+)
 from openedx.core.djangoapps.user_api.accounts.tests.retirement_helpers import fake_completed_retirement
 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 VerificationDeadlineSignalTest(ModuleStoreTestCase):
+class VerificationDeadlineHandlerTest(ModuleStoreTestCase):
     """
-    Tests for the VerificationDeadline signal
+    Tests for the VerificationDeadline handler
     """
 
     def setUp(self):
@@ -30,13 +41,13 @@ def setUp(self):
         VerificationDeadline.objects.all().delete()
 
     def test_no_deadline(self):
-        """ Verify the signal sets deadline to course end when no deadline exists."""
+        """ Verify the handler sets deadline to course end when no deadline exists."""
         _listen_for_course_publish('store', self.course.id)
 
         assert VerificationDeadline.deadline_for_course(self.course.id) == self.course.end
 
     def test_deadline(self):
-        """ Verify deadline is set to course end date by signal when changed. """
+        """ Verify deadline is set to course end date by handler when changed. """
         deadline = now() - timedelta(days=7)
         VerificationDeadline.set_deadline(self.course.id, deadline)
 
@@ -44,7 +55,7 @@ def test_deadline(self):
         assert VerificationDeadline.deadline_for_course(self.course.id) == self.course.end
 
     def test_deadline_explicit(self):
-        """ Verify deadline is unchanged by signal when explicitly set. """
+        """ Verify deadline is unchanged by handler when explicitly set. """
         deadline = now() - timedelta(days=7)
         VerificationDeadline.set_deadline(self.course.id, deadline, is_explicit=True)
 
@@ -55,9 +66,9 @@ def test_deadline_explicit(self):
         assert actual_deadline == deadline
 
 
-class RetirementSignalTest(ModuleStoreTestCase):
+class RetirementHandlerTest(ModuleStoreTestCase):
     """
-    Tests for the VerificationDeadline signal
+    Tests for the VerificationDeadline handler
     """
 
     def _create_entry(self):
@@ -108,8 +119,8 @@ def test_idempotent(self):
 
 class PostSavePhotoVerificationTest(ModuleStoreTestCase):
     """
-    Tests for the post_save signal on the SoftwareSecurePhotoVerification model.
-    This receiver should emit another signal that contains limited data about
+    Tests for the post_save handler on the SoftwareSecurePhotoVerification model.
+    This receiver should emit another handler that contains limited data about
     the verification attempt that was updated.
     """
 
@@ -121,7 +132,7 @@ def setUp(self):
         self.photo_id_image_url = 'https://test.photo'
         self.photo_id_key = 'test+key'
 
-    @patch('lms.djangoapps.verify_student.signals.idv_update_signal.send')
+    @patch('lms.djangoapps.verify_student.signals.signals.idv_update_signal.send')
     def test_post_save_signal(self, mock_signal):
         # create new softwaresecureverification
         attempt = SoftwareSecurePhotoVerification.objects.create(
@@ -154,7 +165,7 @@ def test_post_save_signal(self, mock_signal):
             full_name=attempt.user.profile.name
         )
 
-    @patch('lms.djangoapps.verify_student.signals.idv_update_signal.send')
+    @patch('lms.djangoapps.verify_student.signals.signals.idv_update_signal.send')
     def test_post_save_signal_pending_name(self, mock_signal):
         pending_name_change = do_name_change_request(self.user, 'Pending Name', 'test')[0]
 
@@ -174,3 +185,26 @@ def test_post_save_signal_pending_name(self, mock_signal):
             photo_id_name=attempt.name,
             full_name=pending_name_change.new_name
         )
+
+
+class RetirementHandlerVerificationAttemptsTest(ModuleStoreTestCase):
+    """
+    Tests for the LMS User Retirement signal for Verification Attempts
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.user = UserFactory.create()
+        self.other_user = UserFactory.create()
+        VerificationAttemptFactory.create(user=self.user)
+        VerificationAttemptFactory.create(user=self.other_user)
+
+    def test_retirement_signal(self):
+        _listen_for_lms_retire_verification_attempts(sender=self.__class__, user=self.user)
+        self.assertEqual(len(VerificationAttempt.objects.filter(user=self.user)), 0)
+        self.assertEqual(len(VerificationAttempt.objects.filter(user=self.other_user)), 1)
+
+    def test_retirement_signal_no_attempts(self):
+        no_attempt_user = UserFactory.create()
+        _listen_for_lms_retire_verification_attempts(sender=self.__class__, user=no_attempt_user)
+        self.assertEqual(len(VerificationAttempt.objects.all()), 2)
diff --git a/lms/djangoapps/verify_student/tests/test_models.py b/lms/djangoapps/verify_student/tests/test_models.py
index 9ea45463011d..dfea8081e4d4 100644
--- a/lms/djangoapps/verify_student/tests/test_models.py
+++ b/lms/djangoapps/verify_student/tests/test_models.py
@@ -20,6 +20,7 @@
     PhotoVerification,
     SoftwareSecurePhotoVerification,
     SSOVerification,
+    VerificationAttempt,
     VerificationException
 )
 from lms.djangoapps.verify_student.tests import TestVerificationBase
@@ -437,3 +438,14 @@ def test_active_at_datetime(self):
         user = UserFactory.create()
         verification = ManualVerification.objects.create(user=user)
         self.verification_active_at_datetime(verification)
+
+
+class VerificationAttemptTest(TestVerificationBase):
+    """
+    Tests for the VerificationAttempt model
+    """
+
+    def test_active_at_datetime(self):
+        user = UserFactory.create()
+        attempt = VerificationAttempt.objects.create(user=user)
+        self.verification_active_at_datetime(attempt)
diff --git a/lms/djangoapps/verify_student/tests/test_services.py b/lms/djangoapps/verify_student/tests/test_services.py
index 56f388b7c97e..4bfa8c27d5b3 100644
--- a/lms/djangoapps/verify_student/tests/test_services.py
+++ b/lms/djangoapps/verify_student/tests/test_services.py
@@ -2,24 +2,30 @@
 Tests for the service classes in verify_student.
 """
 
-from datetime import datetime, timedelta, timezone
 import itertools
-from random import randint
+from datetime import datetime, timedelta, timezone
 from unittest.mock import patch
 
 import ddt
 from django.conf import settings
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from django.utils.timezone import now
 from django.utils.translation import gettext as _
 from freezegun import freeze_time
+from openedx_filters import PipelineStep
 from pytz import utc
 
 from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.verify_student.models import ManualVerification, SoftwareSecurePhotoVerification, SSOVerification
+from lms.djangoapps.verify_student.models import (
+    ManualVerification,
+    SoftwareSecurePhotoVerification,
+    SSOVerification,
+    VerificationAttempt
+)
 from lms.djangoapps.verify_student.services import IDVerificationService
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
+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
 
 FAKE_SETTINGS = {
@@ -27,6 +33,16 @@
 }
 
 
+class TestIdvPageUrlRequestedPipelineStep(PipelineStep):
+    """ Utility function to test a configured pipeline step """
+    TEST_URL = 'example.com/verify'
+
+    def run_filter(self, url):  # pylint: disable=arguments-differ
+        return {
+            "url": self.TEST_URL
+        }
+
+
 @patch.dict(settings.VERIFY_STUDENT, FAKE_SETTINGS)
 @ddt.ddt
 class TestIDVerificationService(ModuleStoreTestCase):
@@ -34,12 +50,15 @@ class TestIDVerificationService(ModuleStoreTestCase):
     Tests for IDVerificationService.
     """
 
-    def test_user_is_verified(self):
+    @ddt.data(
+        SoftwareSecurePhotoVerification, VerificationAttempt
+    )
+    def test_user_is_verified(self, verification_model):
         """
         Test to make sure we correctly answer whether a user has been verified.
         """
         user = UserFactory.create()
-        attempt = SoftwareSecurePhotoVerification(user=user)
+        attempt = verification_model(user=user)
         attempt.save()
 
         # If it's any of these, they're not verified...
@@ -49,16 +68,24 @@ def test_user_is_verified(self):
             assert not IDVerificationService.user_is_verified(user), status
 
         attempt.status = "approved"
+        if verification_model == VerificationAttempt:
+            attempt.expiration_datetime = now() + timedelta(days=19)
+        else:
+            attempt.expiration_date = now() + timedelta(days=19)
         attempt.save()
+
         assert IDVerificationService.user_is_verified(user), attempt.status
 
-    def test_user_has_valid_or_pending(self):
+    @ddt.data(
+        SoftwareSecurePhotoVerification, VerificationAttempt
+    )
+    def test_user_has_valid_or_pending(self, verification_model):
         """
         Determine whether we have to prompt this user to verify, or if they've
         already at least initiated a verification submission.
         """
         user = UserFactory.create()
-        attempt = SoftwareSecurePhotoVerification(user=user)
+        attempt = verification_model(user=user)
 
         # If it's any of these statuses, they don't have anything outstanding
         for status in ["created", "ready", "denied"]:
@@ -70,6 +97,10 @@ def test_user_has_valid_or_pending(self):
         # -- must_retry, and submitted both count until we hear otherwise
         for status in ["submitted", "must_retry", "approved"]:
             attempt.status = status
+            if verification_model == VerificationAttempt:
+                attempt.expiration_datetime = now() + timedelta(days=19)
+            else:
+                attempt.expiration_date = now() + timedelta(days=19)
             attempt.save()
             assert IDVerificationService.user_has_valid_or_pending(user), status
 
@@ -102,18 +133,22 @@ def test_get_verified_user_ids(self):
         user_a = UserFactory.create()
         user_b = UserFactory.create()
         user_c = UserFactory.create()
+        user_d = UserFactory.create()
         user_unverified = UserFactory.create()
         user_denied = UserFactory.create()
+        user_denied_b = UserFactory.create()
 
         SoftwareSecurePhotoVerification.objects.create(user=user_a, status='approved')
         ManualVerification.objects.create(user=user_b, status='approved')
         SSOVerification.objects.create(user=user_c, status='approved')
+        VerificationAttempt.objects.create(user=user_d, status='approved')
         SSOVerification.objects.create(user=user_denied, status='denied')
+        VerificationAttempt.objects.create(user=user_denied_b, status='denied')
 
         verified_user_ids = set(IDVerificationService.get_verified_user_ids([
-            user_a, user_b, user_c, user_unverified, user_denied
+            user_a, user_b, user_c, user_d, user_unverified, user_denied
         ]))
-        expected_user_ids = {user_a.id, user_b.id, user_c.id}
+        expected_user_ids = {user_a.id, user_b.id, user_c.id, user_d.id}
 
         assert expected_user_ids == verified_user_ids
 
@@ -142,6 +177,26 @@ def test_get_verify_location_from_string(self):
         expected_path = f'{settings.ACCOUNT_MICROFRONTEND_URL}/id-verification'
         assert path == (expected_path + '?course_id=course-v1%3AedX%2BDemoX%2BDemo_Course')
 
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.idv.page.url.requested.v1": {
+                "pipeline": [
+                    "lms.djangoapps.verify_student.tests.test_services.TestIdvPageUrlRequestedPipelineStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_get_verify_location_with_filter_step(self):
+        """
+        Test IDV flow location can be customized with an openedx filter
+        """
+        url = IDVerificationService.get_verify_location()
+        assert url == TestIdvPageUrlRequestedPipelineStep.TEST_URL
+
+        url = IDVerificationService.get_verify_location('course-v1:edX+DemoX+Demo_Course')
+        assert url == TestIdvPageUrlRequestedPipelineStep.TEST_URL
+
     def test_get_expiration_datetime(self):
         """
         Test that the latest expiration datetime is returned if there are multiple records
@@ -158,51 +213,22 @@ def test_get_expiration_datetime(self):
         expiration_datetime = IDVerificationService.get_expiration_datetime(user_a, ['approved'])
         assert expiration_datetime == newer_record.expiration_datetime
 
-    @ddt.data(
-        {'status': 'denied', 'error_msg': '[{"generalReasons": ["Name mismatch"]}]'},
-        {'status': 'approved', 'error_msg': ''},
-        {'status': 'submitted', 'error_msg': ''},
-    )
-    def test_get_verification_details_by_id(self, kwargs):
+    def test_get_expiration_datetime_mixed_models(self):
+        """
+        Test that the latest expiration datetime is returned if there are both instances of
+        IDVerification models and VerificationAttempt models
+        """
         user = UserFactory.create()
-        kwargs['user'] = user
-        sspv = SoftwareSecurePhotoVerification.objects.create(**kwargs)
-        attempt = IDVerificationService.get_verification_details_by_id(sspv.id)
-        assert attempt.id == sspv.id
-        assert attempt.user.id == user.id
-        assert attempt.status == kwargs['status']
-        assert attempt.error_msg == kwargs['error_msg']
 
-    @ddt.data(
-        *itertools.product(
-            [SSOVerification, ManualVerification],
-            [
-                {'status': 'denied'},
-                {'status': 'approved'},
-                {'status': 'submitted'},
-            ]
+        SoftwareSecurePhotoVerification.objects.create(
+            user=user, status='approved', expiration_date=datetime(2021, 11, 12, 0, 0, tzinfo=timezone.utc)
+        )
+        newest = VerificationAttempt.objects.create(
+            user=user, status='approved', expiration_datetime=datetime(2022, 1, 12, 0, 0, tzinfo=timezone.utc)
         )
-    )
-    @ddt.unpack
-    def test_get_verification_details_other_types(self, verification_model, kwargs):
-        user = UserFactory.create()
-        kwargs['user'] = user
-        model_object = verification_model.objects.create(**kwargs)
 
-        attempt = IDVerificationService.get_verification_details_by_id(model_object.id)
-        assert attempt.id == model_object.id
-        assert attempt.user.id == user.id
-        assert attempt.status == kwargs['status']
-
-    @ddt.data(
-        SoftwareSecurePhotoVerification, SSOVerification, ManualVerification
-    )
-    def test_get_verification_details_not_found(self, verification_model):
-        user = UserFactory.create()
-        model_object = verification_model.objects.create(user=user)
-        not_found_id = model_object.id + randint(100, 200)
-        attempt = IDVerificationService.get_verification_details_by_id(not_found_id)
-        assert attempt is None
+        expiration_datetime = IDVerificationService.get_expiration_datetime(user, ['approved'])
+        assert expiration_datetime == newest.expiration_datetime
 
 
 @patch.dict(settings.VERIFY_STUDENT, FAKE_SETTINGS)
@@ -248,6 +274,29 @@ def test_denied_software_secure_verification(self):
             }
             self.assertDictEqual(status, expected_status)
 
+    def test_approved_verification_attempt_verification(self):
+        with freeze_time('2015-01-02'):
+            # test for when Verification Attempt verification has been created
+            VerificationAttempt.objects.create(user=self.user, status='approved')
+            status = IDVerificationService.user_status(self.user)
+            expected_status = {'status': 'approved', 'error': '', 'should_display': True, 'verification_expiry': '',
+                               'status_date': datetime.now(utc)}
+            self.assertDictEqual(status, expected_status)
+
+    def test_denied_verification_attempt_verification(self):
+        with freeze_time('2015-2-02'):
+            # create denied photo verification for the user, make sure the denial
+            # is handled properly
+            VerificationAttempt.objects.create(
+                user=self.user, status='denied'
+            )
+            status = IDVerificationService.user_status(self.user)
+            expected_status = {
+                'status': 'must_reverify', 'error': '',
+                'should_display': True, 'verification_expiry': '', 'status_date': '',
+            }
+            self.assertDictEqual(status, expected_status)
+
     def test_approved_sso_verification(self):
         with freeze_time('2015-03-02'):
             # test for when sso verification has been created
@@ -278,22 +327,19 @@ def test_manual_verification(self):
                                'status_date': datetime.now(utc)}
             self.assertDictEqual(status, expected_status)
 
-    @ddt.data(
-        'submitted',
-        'denied',
-        'approved',
-        'created',
-        'ready',
-        'must_retry'
+    @ddt.idata(itertools.product(
+        [SoftwareSecurePhotoVerification, VerificationAttempt],
+        ['submitted', 'denied', 'approved', 'created', 'ready', 'must_retry'])
     )
-    def test_expiring_software_secure_verification(self, new_status):
+    def test_expiring_software_secure_verification(self, value):
+        verification_model, new_status = value
         with freeze_time('2015-07-11') as frozen_datetime:
             # create approved photo verification for the user
-            SoftwareSecurePhotoVerification.objects.create(user=self.user, status='approved')
+            verification_model.objects.create(user=self.user, status='approved')
             expiring_datetime = datetime.now(utc)
             frozen_datetime.move_to('2015-07-14')
             # create another according to status passed in.
-            SoftwareSecurePhotoVerification.objects.create(user=self.user, status=new_status)
+            verification_model.objects.create(user=self.user, status=new_status)
             status_date = expiring_datetime
             if new_status == 'approved':
                 status_date = datetime.now(utc)
@@ -302,13 +348,16 @@ def test_expiring_software_secure_verification(self, new_status):
             status = IDVerificationService.user_status(self.user)
             self.assertDictEqual(status, expected_status)
 
-    def test_expired_verification(self):
+    @ddt.data(SoftwareSecurePhotoVerification, VerificationAttempt)
+    def test_expired_verification(self, verification_model):
         with freeze_time('2015-07-11') as frozen_datetime:
-            # create approved photo verification for the user
-            SoftwareSecurePhotoVerification.objects.create(
+            key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+
+            # create approved verification for the user
+            verification_model.objects.create(
                 user=self.user,
                 status='approved',
-                expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+                **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
             )
             frozen_datetime.move_to('2016-07-11')
             expected_status = {
@@ -323,28 +372,28 @@ def test_expired_verification(self):
             status = IDVerificationService.user_status(self.user)
             self.assertDictEqual(status, expected_status)
 
-    @ddt.data(
-        'submitted',
-        'denied',
-        'approved',
-        'created',
-        'ready',
-        'must_retry'
+    @ddt.idata(itertools.product(
+        [SoftwareSecurePhotoVerification, VerificationAttempt],
+        ['submitted', 'denied', 'approved', 'created', 'ready', 'must_retry'])
     )
-    def test_reverify_after_expired(self, new_status):
+    def test_reverify_after_expired(self, value):
+        verification_model, new_status = value
         with freeze_time('2015-07-11') as frozen_datetime:
-            # create approved photo verification for the user
-            SoftwareSecurePhotoVerification.objects.create(
+            key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+
+            # create approved verification for the user
+            verification_model.objects.create(
                 user=self.user,
                 status='approved',
-                expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+                **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
             )
+
             frozen_datetime.move_to('2016-07-12')
             # create another according to status passed in.
-            SoftwareSecurePhotoVerification.objects.create(
+            verification_model.objects.create(
                 user=self.user,
                 status=new_status,
-                expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+                **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
             )
 
             check_status = new_status
@@ -365,9 +414,10 @@ def test_reverify_after_expired(self, new_status):
 
     @ddt.data(
         SSOVerification,
-        ManualVerification
+        ManualVerification,
+        VerificationAttempt
     )
-    def test_override_verification(self, verification_type):
+    def test_override_verification(self, verification_model):
         with freeze_time('2015-07-11') as frozen_datetime:
             # create approved photo verification for the user
             SoftwareSecurePhotoVerification.objects.create(
@@ -376,19 +426,27 @@ def test_override_verification(self, verification_type):
                 expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
             )
             frozen_datetime.move_to('2015-07-14')
-            verification_type.objects.create(
+
+            key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+            verification_model.objects.create(
                 user=self.user,
                 status='approved',
-                expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+                **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
             )
             expected_status = {
-                'status': 'approved', 'error': '', 'should_display': False,
+                'status': 'approved', 'error': '',
+                'should_display': verification_model == VerificationAttempt,
                 'verification_expiry': '', 'status_date': now()
             }
             status = IDVerificationService.user_status(self.user)
             self.assertDictEqual(status, expected_status)
 
-    def test_denied_after_approved_verification(self):
+    @ddt.data(
+        SSOVerification,
+        ManualVerification,
+        VerificationAttempt
+    )
+    def test_denied_after_approved_verification(self, verification_model):
         with freeze_time('2015-07-11') as frozen_datetime:
             # create approved photo verification for the user
             SoftwareSecurePhotoVerification.objects.create(
@@ -398,10 +456,12 @@ def test_denied_after_approved_verification(self):
             )
             expected_date = now()
             frozen_datetime.move_to('2015-07-14')
-            SoftwareSecurePhotoVerification.objects.create(
+
+            key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+            verification_model.objects.create(
                 user=self.user,
                 status='denied',
-                expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+                **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
             )
             expected_status = {
                 'status': 'approved', 'error': '', 'should_display': True,
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 8c1912d9c2f8..1b6a47bee879 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -503,7 +503,8 @@ def _redirect_if_necessary(
             if ecommerce_service.is_enabled(user):
                 url = ecommerce_service.get_checkout_page_url(
                     sku,
-                    catalog=self.request.GET.get('catalog')
+                    catalog=self.request.GET.get('catalog'),
+                    course_run_keys=[str(course_key)]
                 )
 
         # Redirect if necessary, otherwise implicitly return None
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 334669215397..e354f75a8530 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -50,6 +50,7 @@
 from django.utils.translation import gettext_lazy as _
 from enterprise.constants import (
     ENTERPRISE_ADMIN_ROLE,
+    ENTERPRISE_LEARNER_ROLE,
     ENTERPRISE_CATALOG_ADMIN_ROLE,
     ENTERPRISE_DASHBOARD_ADMIN_ROLE,
     ENTERPRISE_ENROLLMENT_API_ADMIN_ROLE,
@@ -60,6 +61,7 @@
     SYSTEM_ENTERPRISE_PROVISIONING_ADMIN_ROLE,
     PROVISIONING_ENTERPRISE_CUSTOMER_ADMIN_ROLE,
     PROVISIONING_PENDING_ENTERPRISE_CUSTOMER_ADMIN_ROLE,
+    DEFAULT_ENTERPRISE_ENROLLMENT_INTENTIONS_ROLE,
 )
 
 from openedx.core.constants import COURSE_KEY_REGEX, COURSE_KEY_PATTERN, COURSE_ID_PATTERN
@@ -949,17 +951,6 @@
     # .. toggle_tickets: 'https://openedx.atlassian.net/browse/OSPR-5290'
     'ENABLE_BULK_USER_RETIREMENT': False,
 
-    # .. toggle_name: FEATURES['ENABLE_V2_CERT_DISPLAY_SETTINGS']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Whether to use the reimagined certificates_display_behavior and certificate_available_date
-    # .. settings. Will eventually become the default.
-    # .. toggle_use_cases: temporary
-    # .. toggle_creation_date: 2021-07-26
-    # .. toggle_target_removal_date: 2021-10-01
-    # .. toggle_tickets: 'https://openedx.atlassian.net/browse/MICROBA-1405'
-    'ENABLE_V2_CERT_DISPLAY_SETTINGS': False,
-
     # .. toggle_name: FEATURES['ENABLE_INTEGRITY_SIGNATURE']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False
@@ -1068,18 +1059,6 @@
     # .. toggle_creation_date: 2024-04-24
     'ENABLE_COURSEWARE_SEARCH_VERIFIED_ENROLLMENT_REQUIRED': False,
 
-    # .. toggle_name: FEATURES['ENABLE_BLAKE2B_HASHING']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Enables the memcache to use the blake2b hash algorithm instead of depreciated md4 for keys
-    #   exceeding 250 characters
-    # .. toggle_use_cases: open_edx
-    # .. toggle_creation_date: 2024-04-02
-    # .. toggle_target_removal_date: 2024-12-09
-    # .. toggle_warning: For consistency, 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/34442
-    'ENABLE_BLAKE2B_HASHING': False,
-
     # .. toggle_name: FEATURES['BADGES_ENABLED']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False
@@ -1943,6 +1922,10 @@ def _make_mako_template_dirs(settings):
     COMMON_ROOT / "static",
     PROJECT_ROOT / "static",
     NODE_MODULES_ROOT / "@edx",
+    # Temporarily adding the following static path as we are migrating the built-in blocks' Sass to vanilla CSS.
+    # Once all of the built-in blocks are extracted from edx-platform, we can remove this static path.
+    # Relevant ticket: https://github.com/openedx/edx-platform/issues/35300
+    XMODULE_ROOT / "static",
 ]
 
 FAVICON_PATH = 'images/favicon.ico'
@@ -3826,6 +3809,16 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 # By default, don't use a file prefix
 ORA2_FILE_PREFIX = None
 
+# .. setting_name: ORA_PEER_LEASE_EXPIRATION_HOURS
+# .. setting_default: 8
+# .. setting_description: Amount of time before a lease on a peer submission expires
+ORA_PEER_LEASE_EXPIRATION_HOURS = 8
+
+# .. setting_name: ORA_STAFF_LEASE_EXPIRATION_HOURS
+# .. setting_default: 8
+# .. setting_description: Amount of time before a lease on a staff submission expires
+ORA_STAFF_LEASE_EXPIRATION_HOURS = 8
+
 # Default File Upload Storage bucket and prefix. Used by the FileUpload Service.
 FILE_UPLOAD_STORAGE_BUCKET_NAME = 'SET-ME-PLEASE (ex. bucket-name)'
 FILE_UPLOAD_STORAGE_PREFIX = 'submissions_attachments'
@@ -4315,13 +4308,6 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 ECOMMERCE_SERVICE_WORKER_USERNAME = 'ecommerce_worker'
 ECOMMERCE_API_SIGNING_KEY = 'SET-ME-PLEASE'
 
-# E-Commerce Commerce Coordinator Configuration
-COMMERCE_COORDINATOR_URL_ROOT = 'http://localhost:8140'
-COMMERCE_COORDINATOR_REFUND_PATH = '/lms/refund/'
-COMMERCE_COORDINATOR_REFUND_SOURCE_SYSTEMS = ('SET-ME-PLEASE',)
-COMMERCE_COORDINATOR_SERVICE_WORKER_USERNAME = 'commerce_coordinator_worker'
-COORDINATOR_CHECKOUT_REDIRECT_PATH = '/lms/payment_page_redirect/'
-
 # Exam Service
 EXAMS_SERVICE_URL = 'http://localhost:18740/api/v1'
 
@@ -4736,11 +4722,15 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 ENTERPRISE_CUSTOMER_COOKIE_NAME = 'enterprise_customer_uuid'
 BASE_COOKIE_DOMAIN = 'localhost'
 SYSTEM_TO_FEATURE_ROLE_MAPPING = {
+    ENTERPRISE_LEARNER_ROLE: [
+        DEFAULT_ENTERPRISE_ENROLLMENT_INTENTIONS_ROLE,
+    ],
     ENTERPRISE_ADMIN_ROLE: [
         ENTERPRISE_DASHBOARD_ADMIN_ROLE,
         ENTERPRISE_CATALOG_ADMIN_ROLE,
         ENTERPRISE_ENROLLMENT_API_ADMIN_ROLE,
         ENTERPRISE_REPORTING_CONFIG_ADMIN_ROLE,
+        DEFAULT_ENTERPRISE_ENROLLMENT_INTENTIONS_ROLE,
     ],
     ENTERPRISE_OPERATOR_ROLE: [
         ENTERPRISE_DASHBOARD_ADMIN_ROLE,
@@ -4749,6 +4739,7 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
         ENTERPRISE_REPORTING_CONFIG_ADMIN_ROLE,
         ENTERPRISE_FULFILLMENT_OPERATOR_ROLE,
         ENTERPRISE_SSO_ORCHESTRATOR_OPERATOR_ROLE,
+        DEFAULT_ENTERPRISE_ENROLLMENT_INTENTIONS_ROLE,
     ],
     SYSTEM_ENTERPRISE_PROVISIONING_ADMIN_ROLE: [
         PROVISIONING_ENTERPRISE_CUSTOMER_ADMIN_ROLE,
@@ -5369,12 +5360,6 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 ############ Settings for externally hosted executive education courses ############
 EXEC_ED_LANDING_PAGE = "https://www.getsmarter.com/account"
 
-############## PLOTLY ##############
-
-ENTERPRISE_PLOTLY_SECRET = "I am a secret"
-
-############## PLOTLY ##############
-
 ############ Internal Enterprise Settings ############
 ENTERPRISE_VSF_UUID = "e815503343644ac7845bc82325c34460"
 ############ Internal Enterprise Settings ############
@@ -5544,3 +5529,102 @@ def _should_send_learning_badge_events(settings):
 # .. setting_default: empty dictionary
 # .. setting_description: Dictionary with additional information that you want to share in the report.
 SURVEY_REPORT_EXTRA_DATA = {}
+
+
+# .. setting_name: DISABLED_COUNTRIES
+# .. setting_default: []
+# .. setting_description: List of country codes that should be disabled
+# .. for now it wil impact country listing in auth flow and user profile.
+# .. eg ['US', 'CA']
+DISABLED_COUNTRIES = []
+
+
+LMS_COMM_DEFAULT_FROM_EMAIL = "no-reply@example.com"
+
+
+####################### Setting for built-in Blocks Extraction #######################
+# The following Django settings flags have been introduced temporarily to facilitate
+# the rollout of the extracted built-in Blocks. Flags will use to toggle between
+# the old and new block quickly without putting course content or user state at risk.
+#
+# Ticket: https://github.com/openedx/edx-platform/issues/35308
+
+# .. toggle_name: USE_EXTRACTED_WORD_CLOUD_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted Word Cloud XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until https://github.com/openedx/edx-platform/issues/34840 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_WORD_CLOUD_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_ANNOTATABLE_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until https://github.com/openedx/edx-platform/issues/34841 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_ANNOTATABLE_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_POLL_QUESTION_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted poll question XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until https://github.com/openedx/edx-platform/issues/34839 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_POLL_QUESTION_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_LTI_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted LTI XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_LTI_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_HTML_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_HTML_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted Discussion XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_DISCUSSION_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_PROBLEM_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted Problem XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_PROBLEM_BLOCK = False
+
+# .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
+# .. toggle_default: False
+# .. toggle_implementation: DjangoSetting
+# .. toggle_description: Enables the use of the extracted Video XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
+# .. toggle_use_cases: temporary
+# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
+# .. toggle_creation_date: 2024-11-10
+# .. toggle_target_removal_date: 2025-06-01
+USE_EXTRACTED_VIDEO_BLOCK = False
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 7a06f717996c..01100e924059 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -546,6 +546,7 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
     'http://localhost:1992',  # frontend-app-ora
     'http://localhost:2002',  # frontend-app-discussions
     'http://localhost:1991',  # frontend-app-admin-portal
+    'http://localhost:8734',  # frontend-app-learner-portal-enterprise
     'http://localhost:1999',  # frontend-app-authn
     'http://localhost:18450',  # frontend-app-support-tools
     'http://localhost:1994',  # frontend-app-gradebook
diff --git a/lms/envs/minimal.yml b/lms/envs/minimal.yml
index d455d1f3dbf8..003bc243764f 100644
--- a/lms/envs/minimal.yml
+++ b/lms/envs/minimal.yml
@@ -2,7 +2,8 @@
 #
 # This is the minimal settings you need to set to be able to get django to
 # load when using the production.py settings files. It's useful to point
-# LMS_CFG and CMS_CFG to this file to be able to run various paver commands
+# LMS_CFG and CMS_CFG to this file to be able to run various npm commands
+# and make targets (e.g.: building assets, pulling translations, etc.)
 # without needing a full docker setup.
 #
 # Follow up work will likely be done as a part of
@@ -36,3 +37,6 @@ LMS_INTERNAL_ROOT_URL: "http://localhost"
 
 # So that Swagger config code doesn't complain
 API_ACCESS_MANAGER_EMAIL: "api-access@example.com"
+
+# So that you can login to studio on bare-metal
+SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT: 'http://localhost:18000'
diff --git a/lms/envs/production.py b/lms/envs/production.py
index a1acd692f4e1..6dc6be634178 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -1124,3 +1124,10 @@ def get_env_setting(setting):
 EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs(EVENT_BUS_PRODUCER_CONFIG,
                                                    ENV_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {}))
 BEAMER_PRODUCT_ID = ENV_TOKENS.get('BEAMER_PRODUCT_ID', BEAMER_PRODUCT_ID)
+
+# .. setting_name: DISABLED_COUNTRIES
+# .. setting_default: []
+# .. setting_description: List of country codes that should be disabled
+# .. for now it wil impact country listing in auth flow and user profile.
+# .. eg ['US', 'CA']
+DISABLED_COUNTRIES = ENV_TOKENS.get('DISABLED_COUNTRIES', [])
diff --git a/lms/static/completion/js/ViewedEvent.js b/lms/static/completion/js/ViewedEvent.js
index 1ad936f8a158..b2b9d5ff5bc4 100644
--- a/lms/static/completion/js/ViewedEvent.js
+++ b/lms/static/completion/js/ViewedEvent.js
@@ -109,7 +109,13 @@ export class ViewedEventTracker {
     constructor() {
         this.elementViewings = new Set();
         this.handlers = [];
-        this.registerDomHandlers();
+        if (window === window.parent) {
+          // Preview (legacy LMS frontend).
+          this.registerDomHandlers();
+        } else {
+          // Learning MFE.
+          window.addEventListener('message', this.handleVisibilityMessage.bind(this));
+        }
     }
 
     /** Add an element to track.  */
@@ -121,7 +127,11 @@ export class ViewedEventTracker {
                 (el, event) => this.callHandlers(el, event),
             ),
         );
-        this.updateVisible();
+        // Update visibility status immediately after adding the element (in case it's already visible).
+        // We don't need this for the Learning MFE because it will send a message once the iframe is loaded.
+        if (window === window.parent) {
+          this.updateVisible();
+        }
     }
 
     /** Register a new handler to be called when an element has been viewed.  */
@@ -177,4 +187,36 @@ export class ViewedEventTracker {
             handler(el, event);
         });
     }
+
+    /** Handle a unit.visibilityStatus message from the Learning MFE. */
+    handleVisibilityMessage(event) {
+        if (event.data.type === 'unit.visibilityStatus') {
+          const { topPosition, viewportHeight } = event.data.data;
+
+          this.elementViewings.forEach((elv) => {
+              const rect = elv.getBoundingRect();
+              let visible = false;
+
+              // Convert iframe-relative rect coordinates to be relative to the parent's viewport.
+              const elTopPosition = rect.top + topPosition;
+              const elBottomPosition = rect.bottom + topPosition;
+
+              // Check if the element is visible in the parent's viewport.
+              if (elTopPosition < viewportHeight && elTopPosition >= 0) {
+                  elv.markTopSeen();
+                  visible = true;
+              }
+              if (elBottomPosition <= viewportHeight && elBottomPosition > 0) {
+                  elv.markBottomSeen();
+                  visible = true;
+              }
+
+              if (visible) {
+                  elv.handleVisible();
+              } else {
+                  elv.handleNotVisible();
+              }
+          });
+      }
+    }
 }
diff --git a/lms/static/js/instructor_dashboard/instructor_dashboard.js b/lms/static/js/instructor_dashboard/instructor_dashboard.js
index 02972a93b6c4..f87e9db8e814 100644
--- a/lms/static/js/instructor_dashboard/instructor_dashboard.js
+++ b/lms/static/js/instructor_dashboard/instructor_dashboard.js
@@ -50,6 +50,12 @@ such that the value can be defined later than this assignment (file load order).
 
     $activeSection = null;
 
+    var usesProctoringLegacyView = function () {
+        // If the element #proctoring-mfe-view is present, then uses the new MFE
+        // and the legacy views should not be initialized.
+        return !document.getElementById('proctoring-mfe-view');
+    }
+
     SafeWaiter = (function() {
         function safeWaiter() {
             this.after_handlers = [];
@@ -200,7 +206,7 @@ such that the value can be defined later than this assignment (file load order).
             }
         ];
         // eslint-disable-next-line no-void
-        if (edx.instructor_dashboard.proctoring !== void 0) {
+        if (usesProctoringLegacyView() && edx.instructor_dashboard.proctoring !== void 0) {
             sectionsToInitialize = sectionsToInitialize.concat([
                 {
                     constructor: edx.instructor_dashboard.proctoring.ProctoredExamAllowanceView,
diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss
index 1171e3d14cdf..7a77eb34ca07 100644
--- a/lms/static/sass/_build-lms-v1.scss
+++ b/lms/static/sass/_build-lms-v1.scss
@@ -68,7 +68,6 @@
 
 // features
 @import 'features/bookmarks-v1';
-@import "features/announcements";
 @import 'features/learner-profile';
 @import 'features/_unsupported-browser-alert';
 @import 'features/content-type-gating';
diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss
index 42a1b037eae7..723664d64126 100644
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -1858,16 +1858,6 @@
 .instructor-dashboard-wrapper-2 section.idash-section#open_response_assessment {
   .open-response-assessment {
     padding-top: 20px;
-
-    .open-response-assessment-content {
-      .open-response-assessment-summary, .open-response-assessment-main-table {
-        line-height: 1;
-
-        table tr td {
-          padding-right: 20px;
-        }
-      }
-    }
   }
 }
 
diff --git a/lms/static/sass/features/_announcements.scss b/lms/static/sass/features/_announcements.scss
deleted file mode 100644
index 0c3c01fe6077..000000000000
--- a/lms/static/sass/features/_announcements.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-// lms - features - announcements
-// ====================
-.announcements-list {
-  display: inline-block;
-  width: 100%;
-
-  .announcement {
-    background-color: $course-profile-bg;
-    align-content: center;
-    text-align: center;
-    padding: 22px 33px;
-    margin-bottom: 15px;
-  }
-
-  .announcement-button {
-    display: inline-block;
-    padding: 3px 10px;
-    font-size: 0.75rem;
-  }
-
-  .prev {
-    float: left;
-  }
-
-  .next {
-    float: right;
-  }
-}
diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss
index 629b3065778e..a8a34ccec589 100644
--- a/lms/static/sass/multicourse/_course_about.scss
+++ b/lms/static/sass/multicourse/_course_about.scss
@@ -44,6 +44,11 @@
       > div.table {
         display: table;
         width: 100%;
+
+        @include media-breakpoint-down(sm) {
+          display: flex;
+          flex-direction: column;
+        }
       }
 
       .intro {
@@ -51,6 +56,11 @@
 
         @include clearfix();
 
+        @include media-breakpoint-down(sm) {
+            width: auto;
+            order: 2;
+        }
+
         display: table-cell;
         vertical-align: middle;
         padding: $baseline;
@@ -127,6 +137,10 @@
           a.add-to-cart {
             @include button(shiny, $button-color);
 
+            @include media-breakpoint-down(md) {
+              width: 100%;
+            }
+
             box-sizing: border-box;
             border-radius: 3px;
             display: block;
@@ -189,6 +203,11 @@
             @include float(left);
             @include margin(1px, flex-gutter(8), 0, 0);
             @include transition(none);
+            @include media-breakpoint-down(md) {
+              width: 100%;
+              margin-right: 0;
+              margin-bottom: 10px;
+            }
 
             width: flex-grid(5, 8);
           }
@@ -213,6 +232,11 @@
         width: flex-grid(4);
         z-index: 2;
 
+        @include media-breakpoint-down(sm) {
+          width: auto;
+          order: 1;
+        }
+
         .hero {
           border: 1px solid $border-color-3;
           height: 100%;
diff --git a/lms/templates/course_modes/track_selection.html b/lms/templates/course_modes/track_selection.html
index 557bd18844ca..39a5f5440325 100644
--- a/lms/templates/course_modes/track_selection.html
+++ b/lms/templates/course_modes/track_selection.html
@@ -35,9 +35,9 @@
             $('.popover-icon').click(function(e){
                 e.stopPropagation();
                 if ($('.popover').css("visibility") == "hidden" || $('.popover').css("visibility") == "" ) {
-                    $('.popover').css({"visibility":"visible", "opacity": 1});   
+                    $('.popover').css({"visibility":"visible", "opacity": 1});
                 } else {
-                    $('.popover').css({"visibility":"hidden", "opacity": 0});   
+                    $('.popover').css({"visibility":"hidden", "opacity": 0});
                 }
             });
         });
@@ -52,7 +52,7 @@
         }
         window.addEventListener("resize", onresize);
 
-        // responsive: show more 
+        // responsive: show more
         $(function(){
             if($(window).width() <= 768) {
             $('.collapsible-item').css({"display":"none"});
@@ -64,7 +64,7 @@
                 e.preventDefault();
                 $('.collapsible').css({"display":"none"});
             $('.collapsible-item').css({"display":"list-item"});
-            }); 
+            });
         });
     </script>
 </%block>
@@ -112,7 +112,7 @@ <h3 class="py-md-3">
                                     </span>
                                     <p class="price-display upgrade-price-string">${currency_symbol}${min_price} ${currency}</p>
                                     <div class="choice-title"><h4>${_("Earn a certificate")}</h4></div>
-                                    <%block name="track_selection_certificate_bullets"/> 
+                                    <%block name="track_selection_certificate_bullets"/>
                                     <ul class="list-actions">
                                         <li class="action action-select track-selection-button">
                                             <input type="hidden" name="contribution" value="${price_before_discount or min_price}" />
diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html
index 91d7a2a28e57..eec9caeadbec 100644
--- a/lms/templates/courseware/course_about.html
+++ b/lms/templates/courseware/course_about.html
@@ -62,11 +62,10 @@
       <div class="table">
       <section class="intro">
         <div class="heading-group">
-          <h1>
-            ${course.display_name_with_default}
-          </h1>
+          <p><small>${course.display_org_with_default}</small></p>
+          <h1>${course.display_name_with_default}</h1>
           <br />
-          <span>${course.display_org_with_default}</span>
+          <p>${get_course_about_section(request, course, 'short_description')}</p>
         </div>
 
         <div class="main-cta">
@@ -160,7 +159,11 @@ <h1>
 
         <%block name="course_about_important_dates">
         <ol class="important-dates">
-          <li class="important-dates-item"><span class="icon fa fa-info-circle" aria-hidden="true"></span><p class="important-dates-item-title">${_("Course Number")}</p><span class="important-dates-item-text course-number">${course.display_number_with_default}</span></li>
+          <li class="important-dates-item">
+              <span class="icon fa fa-info-circle" aria-hidden="true"></span>
+              <p class="important-dates-item-title">${_("Course Number")}</p>
+              <span class="important-dates-item-text course-number">${course.display_number_with_default}</span>
+          </li>
           % if not course.start_date_is_still_default:
               <%
                   course_start_date = course.advertised_start or course.start
@@ -231,7 +234,11 @@ <h1>
           % endif
 
           % if get_course_about_section(request, course, "prerequisites"):
-            <li class="important-dates-item"><span class="icon fa fa-book" aria-hidden="true"></span><p class="important-dates-item-title">${_("Requirements")}</p><span class="important-dates-item-text prerequisites">${get_course_about_section(request, course, "prerequisites")}</span></li>
+            <li class="important-dates-item">
+              <span class="icon fa fa-book" aria-hidden="true"></span>
+              <p class="important-dates-item-title">${_("Requirements")}</p>
+              <span class="important-dates-item-text prerequisites">${get_course_about_section(request, course, "prerequisites")}</span>
+            </li>
           % endif
         </ol>
         </%block>
diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index e8411c9e4217..deeda26c431d 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -144,10 +144,12 @@
                 // to stay in relatively the same position so viewing of the video
                 // is not disrupted.
                 if ($(this).attr('class') === 'transcript-start'||$(this).attr('class') === 'transcript-end') {
+                  var target = $(targetId)[0];
                   event.preventDefault();
-                  $(targetId)[0].scrollIntoView({
+                  target.scrollIntoView({
                     block: 'nearest',
                   });
+                  target.focus();
                 } else {
                   var targetName = $(this).attr('href').slice(1);
                   // Checks if the target uses an id or name.
@@ -159,6 +161,7 @@
                     target.scrollIntoView({
                       block: 'start',
                     });
+                    target.focus();
                   }
                 }
               }
diff --git a/lms/templates/courseware/static_tab.html b/lms/templates/courseware/static_tab.html
index 38b08f85ee76..cf79fb8948f7 100644
--- a/lms/templates/courseware/static_tab.html
+++ b/lms/templates/courseware/static_tab.html
@@ -33,7 +33,6 @@
       lang=${course.language}
     % endif
     >
-    <section class="container">
       <div class="static_tab_wrapper">
         ${HTML(fragment.body_html())}
       </div>
diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html
index 5f3436a7f718..5e8225bdcb8b 100644
--- a/lms/templates/dashboard/_dashboard_certificate_information.html
+++ b/lms/templates/dashboard/_dashboard_certificate_information.html
@@ -44,14 +44,11 @@
     <div class="message message-status ${status_css_class} is-shown">
       <p class="message-copy">
         <%
-          if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False):
-            certificate_available_date_string = ""
-            if course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE and course_overview.certificate_available_date:
-              certificate_available_date_string = course_overview.certificate_available_date.strftime('%Y-%m-%dT%H:%M:%S%z')
-            elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END and course_overview.end:
-              certificate_available_date_string = course_overview.end.strftime('%Y-%m-%dT%H:%M:%S%z')
-          else:
+          certificate_available_date_string = ""
+          if course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE and course_overview.certificate_available_date:
             certificate_available_date_string = course_overview.certificate_available_date.strftime('%Y-%m-%dT%H:%M:%S%z')
+          elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END and course_overview.end:
+            certificate_available_date_string = course_overview.end.strftime('%Y-%m-%dT%H:%M:%S%z')
           container_string = _("Your grade and certificate will be ready after {date}.")
           format = 'shortDate'
         %>
diff --git a/lms/templates/instructor/edx_ace/addbetatester/push/body.txt b/lms/templates/instructor/edx_ace/addbetatester/push/body.txt
new file mode 100644
index 000000000000..8373638fb41f
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/addbetatester/push/body.txt
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Dear {{ full_name }},{% endblocktrans %}
+{% blocktrans %}You have been invited to be a beta tester for {{ course_name }} at {{ site_name }}.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/addbetatester/push/title.txt b/lms/templates/instructor/edx_ace/addbetatester/push/title.txt
new file mode 100644
index 000000000000..f1c4c6826cfa
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/addbetatester/push/title.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been invited to a beta test for {{ course_name }} at {{ site_name }}.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/allowedenroll/push/body.txt b/lms/templates/instructor/edx_ace/allowedenroll/push/body.txt
new file mode 100644
index 000000000000..41ff994310e3
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/allowedenroll/push/body.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been enrolled in {{ course_name }} at {{ site_name }}. This course will now appear on your {{ site_name }} dashboard.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/allowedenroll/push/title.txt b/lms/templates/instructor/edx_ace/allowedenroll/push/title.txt
new file mode 100644
index 000000000000..865657f1fcb1
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/allowedenroll/push/title.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been invited to register for {{ course_name }}.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/allowedunenroll/push/body.txt b/lms/templates/instructor/edx_ace/allowedunenroll/push/body.txt
new file mode 100644
index 000000000000..c7342b6830b5
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/allowedunenroll/push/body.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been unenrolled from the course {{ course_name }}. Please disregard the invitation previously sent.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/allowedunenroll/push/title.txt b/lms/templates/instructor/edx_ace/allowedunenroll/push/title.txt
new file mode 100644
index 000000000000..99aaa1a9c305
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/allowedunenroll/push/title.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been unenrolled from {{ course_name }}{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/enrolledunenroll/push/body.txt b/lms/templates/instructor/edx_ace/enrolledunenroll/push/body.txt
new file mode 100644
index 000000000000..2bc61a840b48
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/enrolledunenroll/push/body.txt
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Dear {{ full_name }},{% endblocktrans %}
+{% blocktrans %}You have been unenrolled from {{ course_name }} at {{ site_name }}. This course will no longer appear on your {{ site_name }} dashboard.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/enrolledunenroll/push/title.txt b/lms/templates/instructor/edx_ace/enrolledunenroll/push/title.txt
new file mode 100644
index 000000000000..99aaa1a9c305
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/enrolledunenroll/push/title.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been unenrolled from {{ course_name }}{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/enrollenrolled/push/body.txt b/lms/templates/instructor/edx_ace/enrollenrolled/push/body.txt
new file mode 100644
index 000000000000..e5ef12dc5f75
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/enrollenrolled/push/body.txt
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Dear {{ full_name }},{% endblocktrans %}
+{% blocktrans %}You have been invited to join {{ course_name }} at {{ site_name }}.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/enrollenrolled/push/title.txt b/lms/templates/instructor/edx_ace/enrollenrolled/push/title.txt
new file mode 100644
index 000000000000..ebe884b30f08
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/enrollenrolled/push/title.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been enrolled in {{ course_name }}{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/removebetatester/push/body.txt b/lms/templates/instructor/edx_ace/removebetatester/push/body.txt
new file mode 100644
index 000000000000..89573aa4be1d
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/removebetatester/push/body.txt
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Dear {{ full_name }},{% endblocktrans %}
+{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }}. This course will remain on your dashboard, but you will no longer be part of the beta testing group.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/instructor/edx_ace/removebetatester/push/title.txt b/lms/templates/instructor/edx_ace/removebetatester/push/title.txt
new file mode 100644
index 000000000000..c09febbb455c
--- /dev/null
+++ b/lms/templates/instructor/edx_ace/removebetatester/push/title.txt
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }}.{% endblocktrans %}
+{% endautoescape %}
diff --git a/lms/templates/vert_module.html b/lms/templates/vert_module.html
index 7df5b8b5b46e..909e7db829c1 100644
--- a/lms/templates/vert_module.html
+++ b/lms/templates/vert_module.html
@@ -62,7 +62,7 @@ <h2 class="hd hd-2 unit-title">${unit_title}</h2>
 <div class="vert-mod">
 % for idx, item in enumerate(items):
   % if item['content']:
-    <div class="vert vert-${idx}" data-id="${item['id']}">
+    <div class="vert vert-${idx}" data-id="${item['id']}" id="${item['id']}">
         ${HTML(item['content'])}
     </div>
   %endif
diff --git a/lms/templates/video.html b/lms/templates/video.html
index 1d1a374f6379..d770b7178501 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -83,21 +83,33 @@ <h4 class="hd hd-5">${_('Video')}</h4>
                                     <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>
+                                    <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"
+                                    >
+                                        % if (sharing_site_info['name'] == 'twitter'):
+                                            <!--
+                                                Twitter now uses the X brand icon, but Font Awesome does not include fa-x-twitter until 6.0
+                                                Upgrading to 6.0 would require lots of leg work becuase all square icons have new name patterns
+                                                ex: fa-facebook-square is now fa-square-facebook
+                                            -->
+                                            <span style="display: inline-block; vertical-align: middle; padding-left: 1px;">
+                                                <svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" height="15" width="12.86" viewBox="0 0 448 512">
+                                                    <!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
+                                                    <path d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zm297.1 84L257.3 234.6 379.4 396H283.8L209 298.1 123.3 396H75.8l111-126.9L69.7 116h98l67.7 89.5L313.6 116h47.5zM323.3 367.6L153.4 142.9H125.1L296.9 367.6h26.3z"/>
+                                                </svg>
+                                            </span>
+                                        % else:
+                                            <span class="icon fa ${sharing_site_info['fa_icon_name']}" aria-hidden="true"></span>
+                                        % endif
+                                        <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
diff --git a/mypy.ini b/mypy.ini
index 5027c3bb5595..c0d739e8468b 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -6,13 +6,16 @@ plugins =
     mypy_django_plugin.main,
     mypy_drf_plugin.main
 files =
-    openedx/core/djangoapps/content/learning_sequences/,
+    cms/lib/xblock/upstream_sync.py,
+    cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py,
+    openedx/core/djangoapps/content/learning_sequences,
     openedx/core/djangoapps/content_staging,
     openedx/core/djangoapps/content_libraries,
     openedx/core/djangoapps/xblock,
     openedx/core/types,
     openedx/core/djangoapps/content_tagging,
-    xmodule/util/keys.py
+    xmodule/util/keys.py,
+    xmodule/item_bank_block.py
 
 [mypy.plugins.django-stubs]
 # content_staging only works with CMS; others work with either, so we run mypy with CMS settings.
diff --git a/openedx.yaml b/openedx.yaml
deleted file mode 100644
index 867c05595977..000000000000
--- a/openedx.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file describes this Open edX repo, as described in OEP-2:
-# https://open-edx-proposals.readthedocs.io/en/latest/oep-0002-bp-repo-metadata.html#specification
-
-nick: edx
-openedx-release: {ref: "2u/release"}
-
-oeps:
-    oep-2: true
-    oep-18: true
-    oep-7: true
-
-tags:
-    - core
-    - webservice
diff --git a/openedx/core/djangoapps/ace_common/settings/common.py b/openedx/core/djangoapps/ace_common/settings/common.py
index 11bfbce5c59f..634ab328ba6b 100644
--- a/openedx/core/djangoapps/ace_common/settings/common.py
+++ b/openedx/core/djangoapps/ace_common/settings/common.py
@@ -1,11 +1,14 @@
 """
 Settings for ace_common app.
 """
+from openedx.core.djangoapps.ace_common.utils import setup_firebase_app
 
 ACE_ROUTING_KEY = 'edx.lms.core.default'
 
 
 def plugin_settings(settings):  # lint-amnesty, pylint: disable=missing-function-docstring, missing-module-docstring
+    if 'push_notifications' not in settings.INSTALLED_APPS:
+        settings.INSTALLED_APPS.append('push_notifications')
     settings.ACE_ENABLED_CHANNELS = [
         'django_email'
     ]
@@ -22,3 +25,30 @@ def plugin_settings(settings):  # lint-amnesty, pylint: disable=missing-function
     settings.ACE_ROUTING_KEY = ACE_ROUTING_KEY
 
     settings.FEATURES['test_django_plugin'] = True
+    settings.FCM_APP_NAME = 'fcm-edx-platform'
+
+    settings.ACE_CHANNEL_DEFAULT_PUSH = 'push_notification'
+    # Note: To local development with Firebase, you must set FIREBASE_CREDENTIALS_PATH
+    # (path to json file with FIREBASE_CREDENTIALS)
+    # or FIREBASE_CREDENTIALS dictionary.
+    settings.FIREBASE_CREDENTIALS_PATH = None
+    settings.FIREBASE_CREDENTIALS = None
+
+    settings.FIREBASE_APP = setup_firebase_app(
+        settings.FIREBASE_CREDENTIALS_PATH or settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME
+    )
+
+    if getattr(settings, 'FIREBASE_APP', None):
+        settings.ACE_ENABLED_CHANNELS.append(settings.ACE_CHANNEL_DEFAULT_PUSH)
+        settings.ACE_ENABLED_POLICIES.append('course_push_notification_optout')
+
+        settings.PUSH_NOTIFICATIONS_SETTINGS = {
+            'CONFIG': 'push_notifications.conf.AppConfig',
+            'APPLICATIONS': {
+                settings.FCM_APP_NAME: {
+                    'PLATFORM': 'FCM',
+                    'FIREBASE_APP': settings.FIREBASE_APP,
+                },
+            },
+            'UPDATE_ON_DUPLICATE_REG_ID': True,
+        }
diff --git a/openedx/core/djangoapps/ace_common/settings/production.py b/openedx/core/djangoapps/ace_common/settings/production.py
index cc4da91c18db..9ff56292012e 100644
--- a/openedx/core/djangoapps/ace_common/settings/production.py
+++ b/openedx/core/djangoapps/ace_common/settings/production.py
@@ -1,4 +1,5 @@
 """Common environment variables unique to the ace_common plugin."""
+from openedx.core.djangoapps.ace_common.utils import setup_firebase_app
 
 
 def plugin_settings(settings):
@@ -26,3 +27,26 @@ def plugin_settings(settings):
     settings.ACE_CHANNEL_TRANSACTIONAL_EMAIL = settings.ENV_TOKENS.get(
         'ACE_CHANNEL_TRANSACTIONAL_EMAIL', settings.ACE_CHANNEL_TRANSACTIONAL_EMAIL
     )
+    settings.FCM_APP_NAME = settings.ENV_TOKENS.get('FCM_APP_NAME', settings.FCM_APP_NAME)
+    settings.FIREBASE_CREDENTIALS_PATH = settings.ENV_TOKENS.get(
+        'FIREBASE_CREDENTIALS_PATH', settings.FIREBASE_CREDENTIALS_PATH
+    )
+    settings.FIREBASE_CREDENTIALS = settings.ENV_TOKENS.get('FIREBASE_CREDENTIALS', settings.FIREBASE_CREDENTIALS)
+
+    settings.FIREBASE_APP = setup_firebase_app(
+        settings.FIREBASE_CREDENTIALS_PATH or settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME
+    )
+    if settings.FIREBASE_APP:
+        settings.ACE_ENABLED_CHANNELS.append(settings.ACE_CHANNEL_DEFAULT_PUSH)
+        settings.ACE_ENABLED_POLICIES.append('course_push_notification_optout')
+
+        settings.PUSH_NOTIFICATIONS_SETTINGS = {
+            'CONFIG': 'push_notifications.conf.AppConfig',
+            'APPLICATIONS': {
+                settings.FCM_APP_NAME: {
+                    'PLATFORM': 'FCM',
+                    'FIREBASE_APP': settings.FIREBASE_APP,
+                },
+            },
+            'UPDATE_ON_DUPLICATE_REG_ID': True,
+        }
diff --git a/openedx/core/djangoapps/ace_common/utils.py b/openedx/core/djangoapps/ace_common/utils.py
new file mode 100644
index 000000000000..7cf38c821976
--- /dev/null
+++ b/openedx/core/djangoapps/ace_common/utils.py
@@ -0,0 +1,21 @@
+"""
+Utility functions for edx-ace.
+"""
+import logging
+
+log = logging.getLogger(__name__)
+
+
+def setup_firebase_app(firebase_credentials, app_name='fcm-app'):
+    """
+    Returns a Firebase app instance if the Firebase credentials are provided.
+    """
+    import firebase_admin  # pylint: disable=import-outside-toplevel
+
+    if firebase_credentials:
+        try:
+            app = firebase_admin.get_app(app_name)
+        except ValueError:
+            certificate = firebase_admin.credentials.Certificate(firebase_credentials)
+            app = firebase_admin.initialize_app(certificate, name=app_name)
+        return app
diff --git a/openedx/core/djangoapps/agreements/models.py b/openedx/core/djangoapps/agreements/models.py
index 461d7936c4bb..2672a4f47b24 100644
--- a/openedx/core/djangoapps/agreements/models.py
+++ b/openedx/core/djangoapps/agreements/models.py
@@ -27,6 +27,8 @@ class Meta:
 class LTIPIITool(TimeStampedModel):
     """
     This model stores the relationship between a course and the LTI tools in the course that share PII.
+
+    .. no_pii:
     """
     course_key = CourseKeyField(max_length=255, unique=True, db_index=True)
     lti_tools = models.JSONField()
@@ -39,6 +41,8 @@ class Meta:
 class LTIPIISignature(TimeStampedModel):
     """
     This model stores a user's acknowledgement to share PII via LTI tools in a particular course.
+
+    .. no_pii:
     """
     user = models.ForeignKey(User, db_index=True, on_delete=models.CASCADE)
     course_key = CourseKeyField(max_length=255, db_index=True)
@@ -57,6 +61,8 @@ class Meta:
 class ProctoringPIISignature(TimeStampedModel):
     """
     This model stores a user's acknowledgment to share PII via proctoring in a particular course.
+
+    .. no_pii:
     """
     user = models.ForeignKey(User, db_index=True, on_delete=models.CASCADE)
     course_key = CourseKeyField(max_length=255, db_index=True)
diff --git a/openedx/core/djangoapps/auth_exchange/tests/test_views.py b/openedx/core/djangoapps/auth_exchange/tests/test_views.py
index 9d8f21e6eed5..0ab08ffe37d8 100644
--- a/openedx/core/djangoapps/auth_exchange/tests/test_views.py
+++ b/openedx/core/djangoapps/auth_exchange/tests/test_views.py
@@ -168,11 +168,15 @@ def _verify_response(self, access_token, expected_status_code, token_type='Beare
         if expected_cookie_name:
             assert expected_cookie_name in response.cookies
 
-    def _create_dot_access_token(self, grant_type='Client credentials'):
+    def _create_dot_access_token(self, grant_type='Client credentials', skip_authorization=False):
         """
         Create dot based access token
         """
-        dot_application = dot_factories.ApplicationFactory(user=self.user, authorization_grant_type=grant_type)
+        dot_application = dot_factories.ApplicationFactory(
+            user=self.user,
+            authorization_grant_type=grant_type,
+            skip_authorization=skip_authorization,
+        )
         return dot_factories.AccessTokenFactory(user=self.user, application=dot_application)
 
     def test_failure_with_invalid_token(self):
@@ -189,6 +193,10 @@ def test_failure_with_dot_client_credentials_unsupported(self):
         access_token = self._create_dot_access_token()
         self._verify_response(access_token, expected_status_code=401)
 
+    def test_dot_client_credentials_supported_if_authorization_skipped(self):
+        access_token = self._create_dot_access_token(skip_authorization=True)
+        self._verify_response(access_token, expected_status_code=204, expected_cookie_name='sessionid')
+
     def _create_jwt_token(self, grant_type='password', scope='email profile', use_asymmetric_key=True):
         """
         Create jwt token
diff --git a/openedx/core/djangoapps/auth_exchange/views.py b/openedx/core/djangoapps/auth_exchange/views.py
index e4b302595277..60470aeba520 100644
--- a/openedx/core/djangoapps/auth_exchange/views.py
+++ b/openedx/core/djangoapps/auth_exchange/views.py
@@ -132,9 +132,10 @@ def _get_path_of_arbitrary_backend_for_user(user):
                 return backend_path
 
     @staticmethod
-    def _ensure_access_token_has_password_grant(request):
+    def _ensure_access_token_has_password_grant_or_privileged_application(request):
         """
-        Ensures the access token provided has password type grant.
+        Ensures the access token provided has password type grant, or if 'skip_authorization'
+        has been enabled, implying this is a trusted application.
         """
         if is_jwt_authenticated(request):
             jwt_payload = get_decoded_jwt_from_auth(request)
@@ -143,12 +144,17 @@ def _ensure_access_token_has_password_grant(request):
         else:
             token_query = dot_models.AccessToken.objects.select_related('user')
             dot_token = token_query.filter(token=request.auth).first()
-            if dot_token and dot_token.application.authorization_grant_type == dot_models.Application.GRANT_PASSWORD:
+            if dot_token and (
+                dot_token.application.authorization_grant_type == dot_models.Application.GRANT_PASSWORD
+                or dot_token.application.skip_authorization
+            ):
                 return
 
         raise AuthenticationFailed({
             'error_code': 'non_supported_token',
-            'developer_message': 'Only access tokens with grant type password are supported.'
+            'developer_message': 'Only Django Oauth Toolkit access tokens for applications which '
+                                 'are trusted (with "skip_authentication" set to True, or with grant type '
+                                 'password) are supported.'
         })
 
     @staticmethod
@@ -194,7 +200,7 @@ def post(self, request):
             request.user.backend = self._get_path_of_arbitrary_backend_for_user(request.user)
 
         self._ensure_user_is_not_disabled(request)
-        self._ensure_access_token_has_password_grant(request)
+        self._ensure_access_token_has_password_grant_or_privileged_application(request)
         self._ensure_jwt_is_asymmetric(request)
 
         login(request, request.user)  # login generates and stores the user's cookies in the session
diff --git a/openedx/core/djangoapps/content/block_structure/__init__.py b/openedx/core/djangoapps/content/block_structure/__init__.py
index f77cf27f041f..00ed1b12d2ef 100644
--- a/openedx/core/djangoapps/content/block_structure/__init__.py
+++ b/openedx/core/djangoapps/content/block_structure/__init__.py
@@ -59,4 +59,10 @@
 Note: A partial subset (as an ordered list) of the registered
 transformers can be requested during the Transform phase, allowing
 the client to manipulate exactly which transformers to call.
+
+Links to Other Block Structure Related Documentation:
+
+  * https://openedx.atlassian.net/wiki/spaces/AC/pages/154861855/Block+Structure+Cache+Invalidation+Proposal
+  * https://openedx.atlassian.net/wiki/spaces/AC/pages/34734111/Course+Block+Transformers
+  * https://openedx.atlassian.net/wiki/spaces/AC/pages/41910826/Course+Blocks+API+Storage+Cache+Requirements
 """
diff --git a/openedx/core/djangoapps/content/block_structure/config/__init__.py b/openedx/core/djangoapps/content/block_structure/config/__init__.py
index df82bfb068e2..79837df86be6 100644
--- a/openedx/core/djangoapps/content/block_structure/config/__init__.py
+++ b/openedx/core/djangoapps/content/block_structure/config/__init__.py
@@ -9,37 +9,6 @@
 
 from .models import BlockStructureConfiguration
 
-# Switches
-# .. toggle_name: block_structure.storage_backing_for_cache
-# .. toggle_implementation: WaffleSwitch
-# .. toggle_default: False
-# .. toggle_description: When enabled, block structures are stored in a more permanent storage,
-#   like a database, which provides an additional backup for cache misses, instead having them
-#   regenerated. The regenration of block structures is a time consuming process. Therefore,
-#   enabling this switch is recommended for Production.
-# .. toggle_warning: Depends on `BLOCK_STRUCTURES_SETTINGS['STORAGE_CLASS']` and
-#   `BLOCK_STRUCTURES_SETTINGS['STORAGE_KWARGS']`.
-#   This switch will likely be deprecated and removed.
-#   The annotation will be updated with the DEPR ticket once that process has started.
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2017-02-23
-# .. toggle_target_removal_date: 2017-05-23
-# .. toggle_tickets: https://github.com/openedx/edx-platform/pull/14512,
-#   https://github.com/openedx/edx-platform/pull/14770,
-#   https://openedx.atlassian.net/browse/DEPR-145
-STORAGE_BACKING_FOR_CACHE = WaffleSwitch(
-    "block_structure.storage_backing_for_cache", __name__
-)
-
-
-def enable_storage_backing_for_cache_in_request():
-    """
-    Manually override the value of the STORAGE_BACKING_FOR_CACHE switch in the context of the request.
-    This function should not be replicated, as it accesses a protected member, and it shouldn't.
-    """
-    # pylint: disable=protected-access
-    STORAGE_BACKING_FOR_CACHE._cached_switches[STORAGE_BACKING_FOR_CACHE.name] = True
-
 
 @request_cached()
 def num_versions_to_keep():
diff --git a/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py b/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py
index 4da85f5c52bb..047c945fe406 100644
--- a/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py
+++ b/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py
@@ -10,7 +10,6 @@
 import openedx.core.djangoapps.content.block_structure.api as api
 import openedx.core.djangoapps.content.block_structure.store as store
 import openedx.core.djangoapps.content.block_structure.tasks as tasks
-from openedx.core.djangoapps.content.block_structure.config import enable_storage_backing_for_cache_in_request
 from openedx.core.lib.command_utils import (
     get_mutually_exclusive_required_option,
     parse_course_keys,
@@ -75,12 +74,6 @@ def add_arguments(self, parser):
             default=0,
             type=int,
         )
-        parser.add_argument(
-            '--with_storage',
-            help='Store the course blocks in Storage, overriding value of the storage_backing_for_cache waffle switch',
-            action='store_true',
-            default=False,
-        )
 
     def handle(self, *args, **options):
 
@@ -129,9 +122,6 @@ def _generate_course_blocks(self, options, course_keys):
         """
         Generates course blocks for the given course_keys per the given options.
         """
-        if options.get('with_storage'):
-            enable_storage_backing_for_cache_in_request()
-
         for course_key in course_keys:
             try:
                 self._generate_for_course(options, course_key)
@@ -150,7 +140,7 @@ def _generate_for_course(self, options, course_key):
             action = tasks.update_course_in_cache_v2 if options.get('force_update') else tasks.get_course_in_cache_v2
             task_options = {'routing_key': options['routing_key']} if options.get('routing_key') else {}
             result = action.apply_async(
-                kwargs=dict(course_id=str(course_key), with_storage=options.get('with_storage')),
+                kwargs=dict(course_id=str(course_key)),
                 **task_options
             )
             log.info('BlockStructure: ENQUEUED generating for course: %s, task_id: %s.', course_key, result.id)
diff --git a/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py b/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py
index 5b08c5e95df7..430f374b07cc 100644
--- a/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py
+++ b/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py
@@ -85,15 +85,8 @@ def test_all_courses(self, force_update):
             assert mock_update_from_store.call_count == (self.num_courses if force_update else 0)
 
     def test_one_course(self):
-        self._assert_courses_not_in_block_cache(*self.course_keys)
         self.command.handle(courses=[str(self.course_keys[0])])
         self._assert_courses_in_block_cache(self.course_keys[0])
-        self._assert_courses_not_in_block_cache(*self.course_keys[1:])
-        self._assert_courses_not_in_block_storage(*self.course_keys)
-
-    def test_with_storage(self):
-        self.command.handle(with_storage=True, courses=[str(self.course_keys[0])])
-        self._assert_courses_in_block_cache(self.course_keys[0])
         self._assert_courses_in_block_storage(self.course_keys[0])
         self._assert_courses_not_in_block_storage(*self.course_keys[1:])
 
diff --git a/openedx/core/djangoapps/content/block_structure/manager.py b/openedx/core/djangoapps/content/block_structure/manager.py
index 2f8a041c3163..49f423ce7ac3 100644
--- a/openedx/core/djangoapps/content/block_structure/manager.py
+++ b/openedx/core/djangoapps/content/block_structure/manager.py
@@ -35,7 +35,7 @@ def __init__(self, root_block_usage_key, modulestore, cache):
         self.modulestore = modulestore
         self.store = BlockStructureStore(cache)
 
-    def get_transformed(self, transformers, starting_block_usage_key=None, collected_block_structure=None):
+    def get_transformed(self, transformers, starting_block_usage_key=None, collected_block_structure=None, user=None):
         """
         Returns the transformed Block Structure for the root_block_usage_key,
         starting at starting_block_usage_key, getting block data from the cache
@@ -57,11 +57,14 @@ def get_transformed(self, transformers, starting_block_usage_key=None, collected
                 get_collected.  Can be optionally provided if already available,
                 for optimization.
 
+            user (django.contrib.auth.models.User) - User object for
+                which the block structure is to be transformed.
+
         Returns:
             BlockStructureBlockData - A transformed block structure,
                 starting at starting_block_usage_key.
         """
-        block_structure = collected_block_structure.copy() if collected_block_structure else self.get_collected()
+        block_structure = collected_block_structure.copy() if collected_block_structure else self.get_collected(user)
 
         if starting_block_usage_key:
             # Override the root_block_usage_key so traversals start at the
@@ -77,7 +80,7 @@ def get_transformed(self, transformers, starting_block_usage_key=None, collected
         transformers.transform(block_structure)
         return block_structure
 
-    def get_collected(self):
+    def get_collected(self, user=None):
         """
         Returns the collected Block Structure for the root_block_usage_key,
         getting block data from the cache and modulestore, as needed.
@@ -86,6 +89,10 @@ def get_collected(self):
         the modulestore is accessed if needed (at cache miss), and the
         transformers data is collected if needed.
 
+        In the case of a cache miss, the function bypasses runtime access checks for the current
+        user. This is done to prevent inconsistencies in the data, which can occur when
+        certain blocks are inaccessible due to access restrictions.
+
         Returns:
             BlockStructureBlockData - A collected block structure,
                 starting at root_block_usage_key, with collected data
@@ -99,7 +106,15 @@ def get_collected(self):
             BlockStructureTransformers.verify_versions(block_structure)
 
         except (BlockStructureNotFound, TransformerDataIncompatible):
-            block_structure = self._update_collected()
+            if user and getattr(user, "known", True):
+                # This bypasses the runtime access checks. When we are populating the course blocks cache,
+                # we do not want to perform access checks. Access checks result in inconsistent blocks where
+                # inaccessible blocks are missing from the cache. Cached course blocks are then used for all the users.
+                user.known = False
+                block_structure = self._update_collected()
+                user.known = True
+            else:
+                block_structure = self._update_collected()
 
         return block_structure
 
diff --git a/openedx/core/djangoapps/content/block_structure/models.py b/openedx/core/djangoapps/content/block_structure/models.py
index 4872e09346d9..b3a8439ca169 100644
--- a/openedx/core/djangoapps/content/block_structure/models.py
+++ b/openedx/core/djangoapps/content/block_structure/models.py
@@ -41,8 +41,7 @@ def _directory_name(data_usage_key):
     # .. setting_description: Specifies the path in storage where block structures would be saved,
     #   for storage-backed block structure cache.
     #   For more information, check https://github.com/openedx/edx-platform/pull/14571.
-    # .. setting_warnings: Depends on `BLOCK_STRUCTURES_SETTINGS['STORAGE_CLASS']` and on
-    #   `block_structure.storage_backing_for_cache`.
+    # .. setting_warnings: Depends on `BLOCK_STRUCTURES_SETTINGS['STORAGE_CLASS']`
     directory_prefix = settings.BLOCK_STRUCTURES_SETTINGS.get('DIRECTORY_PREFIX', '')
 
     # replace any '/' in the usage key so they aren't interpreted
@@ -74,7 +73,6 @@ def _bs_model_storage():
     # .. setting_default: None
     # .. setting_description: Specifies the storage used for storage-backed block structure cache.
     #   For more information, check https://github.com/openedx/edx-platform/pull/14571.
-    # .. setting_warnings: Depends on `block_structure.storage_backing_for_cache`.
     storage_class = settings.BLOCK_STRUCTURES_SETTINGS.get('STORAGE_CLASS')
 
     # .. setting_name: BLOCK_STRUCTURES_SETTINGS['STORAGE_KWARGS']
@@ -82,8 +80,7 @@ def _bs_model_storage():
     # .. setting_description: Specifies the keyword arguments needed to setup the storage, which
     #   would be used for storage-backed block structure cache.
     #   For more information, check https://github.com/openedx/edx-platform/pull/14571.
-    # .. setting_warnings: Depends on `BLOCK_STRUCTURES_SETTINGS['STORAGE_CLASS']` and on
-    #   `block_structure.storage_backing_for_cache`.
+    # .. setting_warnings: Depends on `BLOCK_STRUCTURES_SETTINGS['STORAGE_CLASS']`
     storage_kwargs = settings.BLOCK_STRUCTURES_SETTINGS.get('STORAGE_KWARGS', {})
 
     return get_storage(storage_class, **storage_kwargs)
diff --git a/openedx/core/djangoapps/content/block_structure/store.py b/openedx/core/djangoapps/content/block_structure/store.py
index 2342079bdc6e..37a2b57449c0 100644
--- a/openedx/core/djangoapps/content/block_structure/store.py
+++ b/openedx/core/djangoapps/content/block_structure/store.py
@@ -19,26 +19,6 @@
 logger = getLogger(__name__)  # pylint: disable=C0103
 
 
-class StubModel:
-    """
-    Stub model to use when storage backing is disabled.
-    By using this stub, we eliminate the need for extra
-    conditional statements in the code.
-    """
-
-    def __init__(self, root_block_usage_key):
-        self.data_usage_key = root_block_usage_key
-
-    def __str__(self):
-        return str(self.data_usage_key)
-
-    def delete(self):
-        """
-        Noop delete method.
-        """
-        pass  # lint-amnesty, pylint: disable=unnecessary-pass
-
-
 class BlockStructureStore:
     """
     Storage for BlockStructure objects.
@@ -120,13 +100,12 @@ def is_up_to_date(self, root_block_usage_key, modulestore):
         Returns whether the data in storage for the given key is
         already up-to-date with the version in the given modulestore.
         """
-        if config.STORAGE_BACKING_FOR_CACHE.is_enabled():
-            try:
-                bs_model = self._get_model(root_block_usage_key)
-                root_block = modulestore.get_item(root_block_usage_key)
-                return self._version_data_of_model(bs_model) == self._version_data_of_block(root_block)
-            except BlockStructureNotFound:
-                pass
+        try:
+            bs_model = self._get_model(root_block_usage_key)
+            root_block = modulestore.get_item(root_block_usage_key)
+            return self._version_data_of_model(bs_model) == self._version_data_of_block(root_block)
+        except BlockStructureNotFound:
+            pass
 
         return False
 
@@ -134,26 +113,20 @@ def _get_model(self, root_block_usage_key):
         """
         Returns the model associated with the given key.
         """
-        if config.STORAGE_BACKING_FOR_CACHE.is_enabled():
-            return BlockStructureModel.get(root_block_usage_key)
-        else:
-            return StubModel(root_block_usage_key)
+        return BlockStructureModel.get(root_block_usage_key)
 
     def _update_or_create_model(self, block_structure, serialized_data):
         """
         Updates or creates the model for the given block_structure
         and serialized_data.
         """
-        if config.STORAGE_BACKING_FOR_CACHE.is_enabled():
-            root_block = block_structure[block_structure.root_block_usage_key]
-            bs_model, _ = BlockStructureModel.update_or_create(
-                serialized_data,
-                data_usage_key=block_structure.root_block_usage_key,
-                **self._version_data_of_block(root_block)
-            )
-            return bs_model
-        else:
-            return StubModel(block_structure.root_block_usage_key)
+        root_block = block_structure[block_structure.root_block_usage_key]
+        bs_model, _ = BlockStructureModel.update_or_create(
+            serialized_data,
+            data_usage_key=block_structure.root_block_usage_key,
+            **self._version_data_of_block(root_block)
+        )
+        return bs_model
 
     def _add_to_cache(self, serialized_data, bs_model):
         """
@@ -186,9 +159,6 @@ def _get_from_store(self, bs_model):
         Raises:
              BlockStructureNotFound if not found.
         """
-        if not config.STORAGE_BACKING_FOR_CACHE.is_enabled():
-            raise BlockStructureNotFound(bs_model.data_usage_key)
-
         return bs_model.get_serialized_data()
 
     def _serialize(self, block_structure):
@@ -226,14 +196,9 @@ def _deserialize(self, serialized_data, root_block_usage_key):
     def _encode_root_cache_key(bs_model):
         """
         Returns the cache key to use for the given
-        BlockStructureModel or StubModel.
+        BlockStructureModel.
         """
-        if config.STORAGE_BACKING_FOR_CACHE.is_enabled():
-            return str(bs_model)
-        return "v{version}.root.key.{root_usage_key}".format(
-            version=str(BlockStructureBlockData.VERSION),
-            root_usage_key=str(bs_model.data_usage_key),
-        )
+        return str(bs_model)
 
     @staticmethod
     def _version_data_of_block(root_block):
diff --git a/openedx/core/djangoapps/content/block_structure/tasks.py b/openedx/core/djangoapps/content/block_structure/tasks.py
index 7c3c2805fb10..5796b8167b2b 100644
--- a/openedx/core/djangoapps/content/block_structure/tasks.py
+++ b/openedx/core/djangoapps/content/block_structure/tasks.py
@@ -14,7 +14,6 @@
 
 from xmodule.capa.responsetypes import LoncapaProblemError
 from openedx.core.djangoapps.content.block_structure import api
-from openedx.core.djangoapps.content.block_structure.config import enable_storage_backing_for_cache_in_request
 from xmodule.modulestore.exceptions import ItemNotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
 
 log = logging.getLogger('edx.celery.task')
@@ -43,8 +42,6 @@ def update_course_in_cache_v2(self, **kwargs):
     Updates the course blocks (mongo -> BlockStructure) for the specified course.
     Keyword Arguments:
         course_id (string) - The string serialized value of the course key.
-        with_storage (boolean) - Whether or not storage backing should be
-            enabled for the generated block structure(s).
     """
     _update_course_in_cache(self, **kwargs)
 
@@ -62,8 +59,6 @@ def _update_course_in_cache(self, **kwargs):
     """
     Updates the course blocks (mongo -> BlockStructure) for the specified course.
     """
-    if kwargs.get('with_storage'):
-        enable_storage_backing_for_cache_in_request()
     _call_and_retry_if_needed(self, api.update_course_in_cache, **kwargs)
 
 
@@ -74,8 +69,6 @@ def get_course_in_cache_v2(self, **kwargs):
     Gets the course blocks for the specified course, updating the cache if needed.
     Keyword Arguments:
         course_id (string) - The string serialized value of the course key.
-        with_storage (boolean) - Whether or not storage backing should be
-            enabled for any generated block structure(s).
     """
     _get_course_in_cache(self, **kwargs)
 
@@ -93,8 +86,6 @@ def _get_course_in_cache(self, **kwargs):
     """
     Gets the course blocks for the specified course, updating the cache if needed.
     """
-    if kwargs.get('with_storage'):
-        enable_storage_backing_for_cache_in_request()
     _call_and_retry_if_needed(self, api.get_course_in_cache, **kwargs)
 
 
diff --git a/openedx/core/djangoapps/content/block_structure/tests/helpers.py b/openedx/core/djangoapps/content/block_structure/tests/helpers.py
index 93655c79e16e..f0a20554e6d2 100644
--- a/openedx/core/djangoapps/content/block_structure/tests/helpers.py
+++ b/openedx/core/djangoapps/content/block_structure/tests/helpers.py
@@ -274,10 +274,14 @@ def create_block_structure(self, children_map, block_structure_cls=BlockStructur
         # create empty block structure
         block_structure = block_structure_cls(root_block_usage_key=self.block_key_factory(0))
 
-        # _add_relation
+        # _add_relation and blocks
         for parent, children in enumerate(children_map):
+            if isinstance(block_structure, BlockStructureBlockData):
+                block_structure._get_or_create_block(self.block_key_factory(parent))  # pylint: disable=protected-access
             for child in children:
                 block_structure._add_relation(self.block_key_factory(parent), self.block_key_factory(child))  # pylint: disable=protected-access
+                if isinstance(block_structure, BlockStructureBlockData):
+                    block_structure._get_or_create_block(self.block_key_factory(child))  # pylint: disable=protected-access
         return block_structure
 
     def get_parents_map(self, children_map):
diff --git a/openedx/core/djangoapps/content/block_structure/tests/test_factory.py b/openedx/core/djangoapps/content/block_structure/tests/test_factory.py
index b9fb8c5e1077..00efa393d8fa 100644
--- a/openedx/core/djangoapps/content/block_structure/tests/test_factory.py
+++ b/openedx/core/djangoapps/content/block_structure/tests/test_factory.py
@@ -5,6 +5,7 @@
 import pytest
 from django.test import TestCase
 
+from opaque_keys.edx.keys import CourseKey
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
 from ..exceptions import BlockStructureNotFound
@@ -18,14 +19,22 @@ class TestBlockStructureFactory(TestCase, ChildrenMapTestMixin):
     Tests for BlockStructureFactory
     """
 
+    def block_key_factory(self, block_id):
+        """
+        Returns a usage_key object for the given block_id.
+        This overrides the method in the ChildrenMapTestMixin.
+        """
+        return CourseKey.from_string("course-v1:org+course+run").make_usage_key("html", str(block_id))
+
     def setUp(self):
         super().setUp()
         self.children_map = self.SIMPLE_CHILDREN_MAP
         self.modulestore = MockModulestoreFactory.create(self.children_map, self.block_key_factory)
 
     def test_from_modulestore(self):
+        usage_key = CourseKey.from_string("course-v1:org+course+run").make_usage_key("html", "0")
         block_structure = BlockStructureFactory.create_from_modulestore(
-            root_block_usage_key=0, modulestore=self.modulestore
+            root_block_usage_key=usage_key, modulestore=self.modulestore
         )
         self.assert_block_structure(block_structure, self.children_map)
 
@@ -48,15 +57,18 @@ def test_from_cache(self):
 
     def test_from_cache_none(self):
         store = BlockStructureStore(MockCache())
+        # Non-existent usage key
+        usage_key = CourseKey.from_string("course-v1:org+course+run").make_usage_key("html", "0")
         with pytest.raises(BlockStructureNotFound):
             BlockStructureFactory.create_from_store(
-                root_block_usage_key=0,
+                root_block_usage_key=usage_key,
                 block_structure_store=store,
             )
 
     def test_new(self):
+        usage_key = CourseKey.from_string("course-v1:org+course+run").make_usage_key("html", "0")
         block_structure = BlockStructureFactory.create_from_modulestore(
-            root_block_usage_key=0, modulestore=self.modulestore
+            root_block_usage_key=usage_key, modulestore=self.modulestore
         )
         new_structure = BlockStructureFactory.create_new(
             block_structure.root_block_usage_key,
diff --git a/openedx/core/djangoapps/content/block_structure/tests/test_manager.py b/openedx/core/djangoapps/content/block_structure/tests/test_manager.py
index 8e5b585ca879..493e4c34714f 100644
--- a/openedx/core/djangoapps/content/block_structure/tests/test_manager.py
+++ b/openedx/core/djangoapps/content/block_structure/tests/test_manager.py
@@ -5,10 +5,8 @@
 import pytest
 import ddt
 from django.test import TestCase
-from edx_toggles.toggles.testutils import override_waffle_switch
 
 from ..block_structure import BlockStructureBlockData
-from ..config import STORAGE_BACKING_FOR_CACHE
 from ..exceptions import UsageKeyNotInBlockStructure
 from ..manager import BlockStructureManager
 from ..transformers import BlockStructureTransformers
@@ -177,20 +175,18 @@ def test_get_collected_cached(self):
         self.collect_and_verify(expect_modulestore_called=False, expect_cache_updated=False)
         assert TestTransformer1.collect_call_count == 1
 
-    @ddt.data(True, False)
-    def test_update_collected_if_needed(self, with_storage_backing):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=with_storage_backing):
-            with mock_registered_transformers(self.registered_transformers):
-                assert TestTransformer1.collect_call_count == 0
+    def test_update_collected_if_needed(self):
+        with mock_registered_transformers(self.registered_transformers):
+            assert TestTransformer1.collect_call_count == 0
 
-                self.bs_manager.update_collected_if_needed()
-                assert TestTransformer1.collect_call_count == 1
+            self.bs_manager.update_collected_if_needed()
+            assert TestTransformer1.collect_call_count == 1
 
-                self.bs_manager.update_collected_if_needed()
-                expected_count = 1 if with_storage_backing else 2
-                assert TestTransformer1.collect_call_count == expected_count
+            self.bs_manager.update_collected_if_needed()
+            expected_count = 1
+            assert TestTransformer1.collect_call_count == expected_count
 
-                self.collect_and_verify(expect_modulestore_called=False, expect_cache_updated=False)
+            self.collect_and_verify(expect_modulestore_called=False, expect_cache_updated=False)
 
     def test_get_collected_transformer_version(self):
         self.collect_and_verify(expect_modulestore_called=True, expect_cache_updated=True)
@@ -212,8 +208,8 @@ def test_get_collected_transformer_version(self):
     def test_get_collected_structure_version(self):
         self.collect_and_verify(expect_modulestore_called=True, expect_cache_updated=True)
         BlockStructureBlockData.VERSION += 1
-        self.collect_and_verify(expect_modulestore_called=True, expect_cache_updated=True)
-        assert TestTransformer1.collect_call_count == 2
+        self.collect_and_verify(expect_modulestore_called=False, expect_cache_updated=False)
+        assert TestTransformer1.collect_call_count == 1
 
     def test_clear(self):
         self.collect_and_verify(expect_modulestore_called=True, expect_cache_updated=True)
diff --git a/openedx/core/djangoapps/content/block_structure/tests/test_store.py b/openedx/core/djangoapps/content/block_structure/tests/test_store.py
index 8d6fc8017d0f..63a02efa7af8 100644
--- a/openedx/core/djangoapps/content/block_structure/tests/test_store.py
+++ b/openedx/core/djangoapps/content/block_structure/tests/test_store.py
@@ -4,11 +4,9 @@
 
 import pytest
 import ddt
-from edx_toggles.toggles.testutils import override_waffle_switch
 
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
 
-from ..config import STORAGE_BACKING_FOR_CACHE
 from ..config.models import BlockStructureConfiguration
 from ..exceptions import BlockStructureNotFound
 from ..store import BlockStructureStore
@@ -46,40 +44,27 @@ def add_transformers(self):
                 value=f'{transformer.name()} val',
             )
 
-    @ddt.data(True, False)
-    def test_get_none(self, with_storage_backing):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=with_storage_backing):
-            with pytest.raises(BlockStructureNotFound):
-                self.store.get(self.block_structure.root_block_usage_key)
-
-    @ddt.data(True, False)
-    def test_add_and_get(self, with_storage_backing):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=with_storage_backing):
-            self.store.add(self.block_structure)
-            stored_value = self.store.get(self.block_structure.root_block_usage_key)
-            assert stored_value is not None
-            self.assert_block_structure(stored_value, self.children_map)
+    def test_get_none(self):
+        with pytest.raises(BlockStructureNotFound):
+            self.store.get(self.block_structure.root_block_usage_key)
 
-    @ddt.data(True, False)
-    def test_delete(self, with_storage_backing):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=with_storage_backing):
-            self.store.add(self.block_structure)
-            self.store.delete(self.block_structure.root_block_usage_key)
-            with pytest.raises(BlockStructureNotFound):
-                self.store.get(self.block_structure.root_block_usage_key)
+    def test_add_and_get(self):
+        self.store.add(self.block_structure)
+        stored_value = self.store.get(self.block_structure.root_block_usage_key)
+        assert stored_value is not None
+        self.assert_block_structure(stored_value, self.children_map)
 
-    def test_uncached_without_storage(self):
+    def test_delete(self):
         self.store.add(self.block_structure)
-        self.mock_cache.map.clear()
+        self.store.delete(self.block_structure.root_block_usage_key)
         with pytest.raises(BlockStructureNotFound):
             self.store.get(self.block_structure.root_block_usage_key)
 
     def test_uncached_with_storage(self):
-        with override_waffle_switch(STORAGE_BACKING_FOR_CACHE, active=True):
-            self.store.add(self.block_structure)
-            self.mock_cache.map.clear()
-            stored_value = self.store.get(self.block_structure.root_block_usage_key)
-            self.assert_block_structure(stored_value, self.children_map)
+        self.store.add(self.block_structure)
+        self.mock_cache.map.clear()
+        stored_value = self.store.get(self.block_structure.root_block_usage_key)
+        self.assert_block_structure(stored_value, self.children_map)
 
     @ddt.data(1, 5, None)
     def test_cache_timeout(self, timeout):
diff --git a/openedx/core/djangoapps/content/learning_sequences/models.py b/openedx/core/djangoapps/content/learning_sequences/models.py
index de0881abe5f6..924403f408aa 100644
--- a/openedx/core/djangoapps/content/learning_sequences/models.py
+++ b/openedx/core/djangoapps/content/learning_sequences/models.py
@@ -37,6 +37,8 @@
 yourself to the LearningContext and LearningSequence models. Other tables are
 not guaranteed to stick around, and values may be deleted unexpectedly.
 """
+from __future__ import annotations
+
 from django.db import models
 from model_utils.models import TimeStampedModel
 
@@ -53,6 +55,8 @@ class LearningContext(TimeStampedModel):
     because this table can contain things that are not courses.
 
     It is okay to make a foreign key against this table.
+
+    .. no_pii:
     """
     id = models.BigAutoField(primary_key=True)
     context_key = LearningContextKeyField(
@@ -74,6 +78,8 @@ def __str__(self):
 class CourseContext(TimeStampedModel):
     """
     A model containing course specific information e.g course_visibility
+
+    .. no_pii:
     """
     learning_context = models.OneToOneField(
         LearningContext, on_delete=models.CASCADE, primary_key=True, related_name="course_context"
@@ -106,6 +112,8 @@ class LearningSequence(TimeStampedModel):
     CourseSectionSequence.
 
     It is okay to make a foreign key against this table.
+
+    .. no_pii:
     """
     id = models.BigAutoField(primary_key=True)
     learning_context = models.ForeignKey(
@@ -131,6 +139,8 @@ class CourseContentVisibilityMixin(models.Model):
 
     We keep the XBlock field names here, even if they're somewhat misleading.
     Please read the comments carefully for each field.
+
+    .. no_pii:
     """
     # This is an obscure, OLX-only flag (there is no UI for it in Studio) that
     # lets you define a Sequence that is reachable by direct URL but not shown
@@ -174,6 +184,8 @@ class UserPartitionGroup(models.Model):
     UserPartitionGroups are not associated with LearningSequence directly
     because User Partitions often carry course-level assumptions (e.g.
     Enrollment Track) that don't make sense outside of a Course.
+
+    .. no_pii:
     """
     id = models.BigAutoField(primary_key=True)
     partition_id = models.BigIntegerField(null=False)
@@ -191,6 +203,8 @@ class Meta:
 class CourseSection(CourseContentVisibilityMixin, TimeStampedModel):
     """
     Course Section data, mapping to the 'chapter' block type.
+
+    .. no_pii:
     """
     id = models.BigAutoField(primary_key=True)
     course_context = models.ForeignKey(
@@ -202,7 +216,7 @@ class CourseSection(CourseContentVisibilityMixin, TimeStampedModel):
     # What is our position within the Course? (starts with 0)
     ordering = models.PositiveIntegerField(null=False)
 
-    new_user_partition_groups = models.ManyToManyField(
+    new_user_partition_groups: models.ManyToManyField[UserPartitionGroup, models.Model] = models.ManyToManyField(
         UserPartitionGroup,
         db_index=True,
         related_name='sec_user_partition_groups',
@@ -225,6 +239,8 @@ class SectionPartitionGroup(models.Model):
     Used for the user_partition_groups ManyToManyField field in the CourseSection model above.
     Adds a cascading delete which will delete these many-to-many relations
     whenever a UserPartitionGroup or CourseSection object is deleted.
+
+    .. no_pii:
     """
     class Meta:
         unique_together = [
@@ -249,6 +265,8 @@ class CourseSectionSequence(CourseContentVisibilityMixin, TimeStampedModel):
 
     Do NOT make a foreign key against this table, as the values are deleted and
     re-created on course publish.
+
+    .. no_pii:
     """
     id = models.BigAutoField(primary_key=True)
     course_context = models.ForeignKey(
@@ -264,7 +282,7 @@ class CourseSectionSequence(CourseContentVisibilityMixin, TimeStampedModel):
     # sequences across 20 sections, the numbering here would be 0-199.
     ordering = models.PositiveIntegerField(null=False)
 
-    new_user_partition_groups = models.ManyToManyField(
+    new_user_partition_groups: models.ManyToManyField[UserPartitionGroup, models.Model] = models.ManyToManyField(
         UserPartitionGroup,
         db_index=True,
         related_name='secseq_user_partition_groups',
@@ -289,6 +307,8 @@ class SectionSequencePartitionGroup(models.Model):
     Used for the user_partition_groups ManyToManyField field in the CourseSectionSequence model above.
     Adds a cascading delete which will delete these many-to-many relations
     whenever a UserPartitionGroup or CourseSectionSequence object is deleted.
+
+    .. no_pii:
     """
     class Meta:
         unique_together = [
@@ -303,6 +323,8 @@ class CourseSequenceExam(TimeStampedModel):
     """
     This model stores XBlock information that affects outline level information
     pertaining to special exams
+
+    .. no_pii:
     """
     course_section_sequence = models.OneToOneField(CourseSectionSequence, on_delete=models.CASCADE, related_name='exam')
 
@@ -318,6 +340,8 @@ class PublishReport(models.Model):
     All these fields could be derived with aggregate SQL functions, but it would
     be slower and make the admin code more complex. Since we only write at
     publish time, keeping things in sync is less of a concern.
+
+    .. no_pii:
     """
     learning_context = models.OneToOneField(
         LearningContext, on_delete=models.CASCADE, related_name='publish_report'
@@ -350,6 +374,8 @@ class ContentError(models.Model):
     freeform messages. It is quite possible that at some point we will come up
     with a more comprehensive taxonomy of error messages, at which point we
     could do a backfill to regenerate this data in a more normalized way.
+
+    .. no_pii:
     """
     id = models.BigAutoField(primary_key=True)
     publish_report = models.ForeignKey(
diff --git a/openedx/core/djangoapps/content/search/api.py b/openedx/core/djangoapps/content/search/api.py
index 9fb49b24b6d1..a18c55bd3d22 100644
--- a/openedx/core/djangoapps/content/search/api.py
+++ b/openedx/core/djangoapps/content/search/api.py
@@ -5,7 +5,7 @@
 
 import logging
 import time
-from contextlib import contextmanager
+from contextlib import contextmanager, nullcontext
 from datetime import datetime, timedelta, timezone
 from functools import wraps
 from typing import Callable, Generator
@@ -15,16 +15,23 @@
 from django.core.cache import cache
 from django.core.paginator import Paginator
 from meilisearch import Client as MeilisearchClient
-from meilisearch.errors import MeilisearchError
+from meilisearch.errors import MeilisearchApiError, MeilisearchError
 from meilisearch.models.task import TaskInfo
 from opaque_keys.edx.keys import UsageKey
-from opaque_keys.edx.locator import LibraryLocatorV2
+from opaque_keys.edx.locator import LibraryLocatorV2, LibraryCollectionLocator
 from openedx_learning.api import authoring as authoring_api
 from common.djangoapps.student.roles import GlobalStaff
 from rest_framework.request import Request
 from common.djangoapps.student.role_helpers import get_course_roles
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
-from openedx.core.djangoapps.content.search.models import get_access_ids_for_request
+from openedx.core.djangoapps.content.search.models import get_access_ids_for_request, IncrementalIndexCompleted
+from openedx.core.djangoapps.content.search.index_config import (
+    INDEX_DISTINCT_ATTRIBUTE,
+    INDEX_FILTERABLE_ATTRIBUTES,
+    INDEX_SEARCHABLE_ATTRIBUTES,
+    INDEX_SORTABLE_ATTRIBUTES,
+    INDEX_RANKING_RULES,
+)
 from openedx.core.djangoapps.content_libraries import api as lib_api
 from xmodule.modulestore.django import modulestore
 
@@ -34,7 +41,10 @@
     searchable_doc_for_course_block,
     searchable_doc_for_collection,
     searchable_doc_for_library_block,
+    searchable_doc_for_usage_key,
+    searchable_doc_collections,
     searchable_doc_tags,
+    searchable_doc_tags_for_collection,
 )
 
 log = logging.getLogger(__name__)
@@ -214,6 +224,42 @@ def _using_temp_index(status_cb: Callable[[str], None] | None = None) -> Generat
         _wait_for_meili_task(client.delete_index(temp_index_name))
 
 
+def _index_is_empty(index_name: str) -> bool:
+    """
+    Check if an index is empty
+
+    Args:
+        index_name (str): The name of the index to check
+    """
+    client = _get_meilisearch_client()
+    index = client.get_index(index_name)
+    return index.get_stats().number_of_documents == 0
+
+
+def _configure_index(index_name):
+    """
+    Configure the index. The following index settings are best changed on an empty index.
+    Changing them on a populated index will "re-index all documents in the index", which can take some time.
+
+    Args:
+        index_name (str): The name of the index to configure
+    """
+    client = _get_meilisearch_client()
+
+    # Mark usage_key as unique (it's not the primary key for the index, but nevertheless must be unique):
+    client.index(index_name).update_distinct_attribute(INDEX_DISTINCT_ATTRIBUTE)
+    # Mark which attributes can be used for filtering/faceted search:
+    client.index(index_name).update_filterable_attributes(INDEX_FILTERABLE_ATTRIBUTES)
+    # Mark which attributes are used for keyword search, in order of importance:
+    client.index(index_name).update_searchable_attributes(INDEX_SEARCHABLE_ATTRIBUTES)
+    # Mark which attributes can be used for sorting search results:
+    client.index(index_name).update_sortable_attributes(INDEX_SORTABLE_ATTRIBUTES)
+
+    # Update the search ranking rules to let the (optional) "sort" parameter take precedence over keyword relevance.
+    # cf https://www.meilisearch.com/docs/learn/core_concepts/relevancy
+    client.index(index_name).update_ranking_rules(INDEX_RANKING_RULES)
+
+
 def _recurse_children(block, fn, status_cb: Callable[[str], None] | None = None) -> None:
     """
     Recurse the children of an XBlock and call the given function for each
@@ -276,8 +322,75 @@ def is_meilisearch_enabled() -> bool:
     return False
 
 
-# pylint: disable=too-many-statements
-def rebuild_index(status_cb: Callable[[str], None] | None = None) -> None:
+def reset_index(status_cb: Callable[[str], None] | None = None) -> None:
+    """
+    Reset the Meilisearch index, deleting all documents and reconfiguring it
+    """
+    if status_cb is None:
+        status_cb = log.info
+
+    status_cb("Creating new empty index...")
+    with _using_temp_index(status_cb) as temp_index_name:
+        _configure_index(temp_index_name)
+        status_cb("Index recreated!")
+    status_cb("Index reset complete.")
+
+
+def _is_index_configured(index_name: str) -> bool:
+    """
+    Check if an index is completely configured
+
+    Args:
+        index_name (str): The name of the index to check
+    """
+    client = _get_meilisearch_client()
+    index = client.get_index(index_name)
+    index_settings = index.get_settings()
+    for k, v in (
+        ("distinctAttribute", INDEX_DISTINCT_ATTRIBUTE),
+        ("filterableAttributes", INDEX_FILTERABLE_ATTRIBUTES),
+        ("searchableAttributes", INDEX_SEARCHABLE_ATTRIBUTES),
+        ("sortableAttributes", INDEX_SORTABLE_ATTRIBUTES),
+        ("rankingRules", INDEX_RANKING_RULES),
+    ):
+        setting = index_settings.get(k, [])
+        if isinstance(v, list):
+            v = set(v)
+            setting = set(setting)
+        if setting != v:
+            return False
+    return True
+
+
+def init_index(status_cb: Callable[[str], None] | None = None, warn_cb: Callable[[str], None] | None = None) -> None:
+    """
+    Initialize the Meilisearch index, creating it and configuring it if it doesn't exist
+    """
+    if status_cb is None:
+        status_cb = log.info
+    if warn_cb is None:
+        warn_cb = log.warning
+
+    if _index_exists(STUDIO_INDEX_NAME):
+        if _index_is_empty(STUDIO_INDEX_NAME):
+            warn_cb(
+                "The studio search index is empty. Please run ./manage.py cms reindex_studio"
+                " --experimental [--incremental]"
+            )
+            return
+        if not _is_index_configured(STUDIO_INDEX_NAME):
+            warn_cb(
+                "A rebuild of the index is required. Please run ./manage.py cms reindex_studio"
+                " --experimental [--incremental]"
+            )
+            return
+        status_cb("Index already exists and is configured.")
+        return
+
+    reset_index(status_cb)
+
+
+def rebuild_index(status_cb: Callable[[str], None] | None = None, incremental=False) -> None:  # lint-amnesty, pylint: disable=too-many-statements
     """
     Rebuild the Meilisearch index from scratch
     """
@@ -289,89 +402,40 @@ def rebuild_index(status_cb: Callable[[str], None] | None = None) -> None:
 
     # Get the lists of libraries
     status_cb("Counting libraries...")
-    lib_keys = [lib.library_key for lib in lib_api.ContentLibrary.objects.select_related('org').only('org', 'slug')]
+    keys_indexed = []
+    if incremental:
+        keys_indexed = list(IncrementalIndexCompleted.objects.values_list("context_key", flat=True))
+    lib_keys = [
+        lib.library_key
+        for lib in lib_api.ContentLibrary.objects.select_related("org").only("org", "slug").order_by("-id")
+        if lib.library_key not in keys_indexed
+    ]
     num_libraries = len(lib_keys)
 
     # Get the list of courses
     status_cb("Counting courses...")
     num_courses = CourseOverview.objects.count()
 
-    # Get the list of collections
-    status_cb("Counting collections...")
-    num_collections = authoring_api.get_collections().count()
-
     # Some counters so we can track our progress as indexing progresses:
-    num_contexts = num_courses + num_libraries + num_collections
-    num_contexts_done = 0  # How many courses/libraries we've indexed
+    num_libs_skipped = len(keys_indexed)
+    num_contexts = num_courses + num_libraries + num_libs_skipped
+    num_contexts_done = 0 + num_libs_skipped  # How many courses/libraries we've indexed
     num_blocks_done = 0  # How many individual components/XBlocks we've indexed
 
-    status_cb(f"Found {num_courses} courses, {num_libraries} libraries and {num_collections} collections.")
-    with _using_temp_index(status_cb) as temp_index_name:
+    status_cb(f"Found {num_courses} courses, {num_libraries} libraries.")
+    with _using_temp_index(status_cb) if not incremental else nullcontext(STUDIO_INDEX_NAME) as index_name:
         ############## Configure the index ##############
 
-        # The following index settings are best changed on an empty index.
-        # Changing them on a populated index will "re-index all documents in the index, which can take some time"
+        # The index settings are best changed on an empty index.
+        # Changing them on a populated index will "re-index all documents in the index", which can take some time
         # and use more RAM. Instead, we configure an empty index then populate it one course/library at a time.
-
-        # Mark usage_key as unique (it's not the primary key for the index, but nevertheless must be unique):
-        client.index(temp_index_name).update_distinct_attribute(Fields.usage_key)
-        # Mark which attributes can be used for filtering/faceted search:
-        client.index(temp_index_name).update_filterable_attributes([
-            Fields.block_type,
-            Fields.context_key,
-            Fields.org,
-            Fields.tags,
-            Fields.tags + "." + Fields.tags_taxonomy,
-            Fields.tags + "." + Fields.tags_level0,
-            Fields.tags + "." + Fields.tags_level1,
-            Fields.tags + "." + Fields.tags_level2,
-            Fields.tags + "." + Fields.tags_level3,
-            Fields.type,
-            Fields.access_id,
-            Fields.last_published,
-            Fields.content + "." + Fields.problem_types,
-        ])
-        # Mark which attributes are used for keyword search, in order of importance:
-        client.index(temp_index_name).update_searchable_attributes([
-            # Keyword search does _not_ search the course name, course ID, breadcrumbs, block type, or other fields.
-            Fields.display_name,
-            Fields.block_id,
-            Fields.content,
-            Fields.tags,
-            Fields.description,
-            # If we don't list the following sub-fields _explicitly_, they're only sometimes searchable - that is, they
-            # are searchable only if at least one document in the index has a value. If we didn't list them here and,
-            # say, there were no tags.level3 tags in the index, the client would get an error if trying to search for
-            # these sub-fields: "Attribute `tags.level3` is not searchable."
-            Fields.tags + "." + Fields.tags_taxonomy,
-            Fields.tags + "." + Fields.tags_level0,
-            Fields.tags + "." + Fields.tags_level1,
-            Fields.tags + "." + Fields.tags_level2,
-            Fields.tags + "." + Fields.tags_level3,
-        ])
-        # Mark which attributes can be used for sorting search results:
-        client.index(temp_index_name).update_sortable_attributes([
-            Fields.display_name,
-            Fields.created,
-            Fields.modified,
-            Fields.last_published,
-        ])
-
-        # Update the search ranking rules to let the (optional) "sort" parameter take precedence over keyword relevance.
-        # cf https://www.meilisearch.com/docs/learn/core_concepts/relevancy
-        client.index(temp_index_name).update_ranking_rules([
-            "sort",
-            "words",
-            "typo",
-            "proximity",
-            "attribute",
-            "exactness",
-        ])
+        if not incremental:
+            _configure_index(index_name)
 
         ############## Libraries ##############
         status_cb("Indexing libraries...")
 
-        def index_library(lib_key: str) -> list:
+        def index_library(lib_key: LibraryLocatorV2) -> list:
             docs = []
             for component in lib_api.get_library_components(lib_key):
                 try:
@@ -379,21 +443,60 @@ def index_library(lib_key: str) -> list:
                     doc = {}
                     doc.update(searchable_doc_for_library_block(metadata))
                     doc.update(searchable_doc_tags(metadata.usage_key))
+                    doc.update(searchable_doc_collections(metadata.usage_key))
                     docs.append(doc)
                 except Exception as err:  # pylint: disable=broad-except
                     status_cb(f"Error indexing library component {component}: {err}")
             if docs:
                 try:
                     # Add all the docs in this library at once (usually faster than adding one at a time):
-                    _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
+                    _wait_for_meili_task(client.index(index_name).add_documents(docs))
                 except (TypeError, KeyError, MeilisearchError) as err:
                     status_cb(f"Error indexing library {lib_key}: {err}")
             return docs
 
+        ############## Collections ##############
+        def index_collection_batch(batch, num_done, library_key) -> int:
+            docs = []
+            for collection in batch:
+                try:
+                    doc = searchable_doc_for_collection(library_key, collection.key, collection=collection)
+                    doc.update(searchable_doc_tags_for_collection(library_key, collection.key))
+                    docs.append(doc)
+                except Exception as err:  # pylint: disable=broad-except
+                    status_cb(f"Error indexing collection {collection}: {err}")
+                num_done += 1
+
+            if docs:
+                try:
+                    # Add docs in batch of 100 at once (usually faster than adding one at a time):
+                    _wait_for_meili_task(client.index(index_name).add_documents(docs))
+                except (TypeError, KeyError, MeilisearchError) as err:
+                    status_cb(f"Error indexing collection batch {p}: {err}")
+            return num_done
+
         for lib_key in lib_keys:
-            status_cb(f"{num_contexts_done + 1}/{num_contexts}. Now indexing library {lib_key}")
+            status_cb(f"{num_contexts_done + 1}/{num_contexts}. Now indexing blocks in library {lib_key}")
             lib_docs = index_library(lib_key)
             num_blocks_done += len(lib_docs)
+
+            # To reduce memory usage on large instances, split up the Collections into pages of 100 collections:
+            library = lib_api.get_library(lib_key)
+            collections = authoring_api.get_collections(library.learning_package.id, enabled=True)
+            num_collections = collections.count()
+            num_collections_done = 0
+            status_cb(f"{num_collections_done + 1}/{num_collections}. Now indexing collections in library {lib_key}")
+            paginator = Paginator(collections, 100)
+            for p in paginator.page_range:
+                num_collections_done = index_collection_batch(
+                    paginator.page(p).object_list,
+                    num_collections_done,
+                    lib_key,
+                )
+            if incremental:
+                IncrementalIndexCompleted.objects.get_or_create(context_key=lib_key)
+            status_cb(f"{num_collections_done}/{num_collections} collections indexed for library {lib_key}")
+
             num_contexts_done += 1
 
         ############## Courses ##############
@@ -417,7 +520,7 @@ def add_with_children(block):
 
             if docs:
                 # Add all the docs in this course at once (usually faster than adding one at a time):
-                _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
+                _wait_for_meili_task(client.index(index_name).add_documents(docs))
             return docs
 
         paginator = Paginator(CourseOverview.objects.only('id', 'display_name'), 1000)
@@ -426,43 +529,16 @@ def add_with_children(block):
                 status_cb(
                     f"{num_contexts_done + 1}/{num_contexts}. Now indexing course {course.display_name} ({course.id})"
                 )
+                if course.id in keys_indexed:
+                    num_contexts_done += 1
+                    continue
                 course_docs = index_course(course)
+                if incremental:
+                    IncrementalIndexCompleted.objects.get_or_create(context_key=course.id)
                 num_contexts_done += 1
                 num_blocks_done += len(course_docs)
 
-        ############## Collections ##############
-        status_cb("Indexing collections...")
-
-        def index_collection_batch(batch, num_contexts_done) -> int:
-            docs = []
-            for collection in batch:
-                status_cb(
-                    f"{num_contexts_done + 1}/{num_contexts}. "
-                    f"Now indexing collection {collection.title} ({collection.id})"
-                )
-                try:
-                    doc = searchable_doc_for_collection(collection)
-                    # Uncomment below line once collections are tagged.
-                    # doc.update(searchable_doc_tags(collection.id))
-                    docs.append(doc)
-                except Exception as err:  # pylint: disable=broad-except
-                    status_cb(f"Error indexing collection {collection}: {err}")
-                finally:
-                    num_contexts_done += 1
-
-            if docs:
-                try:
-                    # Add docs in batch of 100 at once (usually faster than adding one at a time):
-                    _wait_for_meili_task(client.index(temp_index_name).add_documents(docs))
-                except (TypeError, KeyError, MeilisearchError) as err:
-                    status_cb(f"Error indexing collection batch {p}: {err}")
-            return num_contexts_done
-
-        # To reduce memory usage on large instances, split up the Collections into pages of 100 collections:
-        paginator = Paginator(authoring_api.get_collections(enabled=True), 100)
-        for p in paginator.page_range:
-            num_contexts_done = index_collection_batch(paginator.page(p).object_list, num_contexts_done)
-
+    IncrementalIndexCompleted.objects.all().delete()
     status_cb(f"Done! {num_blocks_done} blocks indexed across {num_contexts_done} courses, collections and libraries.")
 
 
@@ -502,15 +578,28 @@ def delete_index_doc(usage_key: UsageKey) -> None:
     Args:
         usage_key (UsageKey): The usage key of the XBlock to be removed from the index
     """
-    current_rebuild_index_name = _get_running_rebuild_index_name()
+    doc = searchable_doc_for_usage_key(usage_key)
+    _delete_index_doc(doc[Fields.id])
+
+
+def _delete_index_doc(doc_id) -> None:
+    """
+    Helper function that deletes the document with the given ID from the search index
+
+    If there is a rebuild in progress, the document will also be removed from the new index.
+    """
+    if not doc_id:
+        return
 
     client = _get_meilisearch_client()
+    current_rebuild_index_name = _get_running_rebuild_index_name()
 
     tasks = []
     if current_rebuild_index_name:
-        # If there is a rebuild in progress, the document will also be deleted from the new index.
-        tasks.append(client.index(current_rebuild_index_name).delete_document(meili_id_from_opaque_key(usage_key)))
-    tasks.append(client.index(STUDIO_INDEX_NAME).delete_document(meili_id_from_opaque_key(usage_key)))
+        # If there is a rebuild in progress, the document will also be removed from the new index.
+        tasks.append(client.index(current_rebuild_index_name).delete_document(doc_id))
+
+    tasks.append(client.index(STUDIO_INDEX_NAME).delete_document(doc_id))
 
     _wait_for_meili_tasks(tasks)
 
@@ -553,6 +642,96 @@ def upsert_library_block_index_doc(usage_key: UsageKey) -> None:
     _update_index_docs(docs)
 
 
+def _get_document_from_index(document_id: str) -> dict:
+    """
+    Returns the Document identified by the given ID, from the given index.
+
+    Returns None if the document or index do not exist.
+    """
+    client = _get_meilisearch_client()
+    document = None
+    index_name = STUDIO_INDEX_NAME
+    try:
+        index = client.get_index(index_name)
+        document = index.get_document(document_id)
+    except (MeilisearchError, MeilisearchApiError) as err:
+        # The index or document doesn't exist
+        log.warning(f"Unable to fetch document {document_id} from {index_name}: {err}")
+
+    return document
+
+
+def upsert_library_collection_index_doc(library_key: LibraryLocatorV2, collection_key: str) -> None:
+    """
+    Creates, updates, or deletes the document for the given Library Collection in the search index.
+
+    If the Collection is not found or disabled (i.e. soft-deleted), then delete it from the search index.
+    """
+    doc = searchable_doc_for_collection(library_key, collection_key)
+    update_components = False
+
+    # Soft-deleted/disabled collections are removed from the index
+    # and their components updated.
+    if doc.get('_disabled'):
+
+        _delete_index_doc(doc[Fields.id])
+
+        update_components = True
+
+    # Hard-deleted collections are also deleted from the index,
+    # but their components are automatically updated as part of the deletion process, so we don't have to.
+    elif not doc.get(Fields.type):
+
+        _delete_index_doc(doc[Fields.id])
+
+    # Otherwise, upsert the collection.
+    # Newly-added/restored collection get their components updated too.
+    else:
+        already_indexed = _get_document_from_index(doc[Fields.id])
+        if not already_indexed:
+            update_components = True
+
+        _update_index_docs([doc])
+
+    # Asynchronously update the collection's components "collections" field
+    if update_components:
+        from .tasks import update_library_components_collections as update_task
+
+        update_task.delay(str(library_key), collection_key)
+
+
+def update_library_components_collections(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+    batch_size: int = 1000,
+) -> None:
+    """
+    Updates the "collections" field for all components associated with a given Library Collection.
+
+    Because there may be a lot of components, we send these updates to Meilisearch in batches.
+    """
+    library = lib_api.get_library(library_key)
+    components = authoring_api.get_collection_components(library.learning_package.id, collection_key)
+
+    paginator = Paginator(components, batch_size)
+    for page in paginator.page_range:
+        docs = []
+
+        for component in paginator.page(page).object_list:
+            usage_key = lib_api.library_component_usage_key(
+                library_key,
+                component,
+            )
+            doc = searchable_doc_collections(usage_key)
+            docs.append(doc)
+
+        log.info(
+            f"Updating document.collections for library {library_key} components"
+            f" page {page} / {paginator.num_pages}"
+        )
+        _update_index_docs(docs)
+
+
 def upsert_content_library_index_docs(library_key: LibraryLocatorV2) -> None:
     """
     Creates or updates the documents for the given Content Library in the search index
@@ -575,6 +754,24 @@ def upsert_block_tags_index_docs(usage_key: UsageKey):
     _update_index_docs([doc])
 
 
+def upsert_block_collections_index_docs(usage_key: UsageKey):
+    """
+    Updates the collections data in documents for the given Course/Library block
+    """
+    doc = {Fields.id: meili_id_from_opaque_key(usage_key)}
+    doc.update(searchable_doc_collections(usage_key))
+    _update_index_docs([doc])
+
+
+def upsert_collection_tags_index_docs(collection_usage_key: LibraryCollectionLocator):
+    """
+    Updates the tags data in documents for the given library collection
+    """
+
+    doc = searchable_doc_tags_for_collection(collection_usage_key.library_key, collection_usage_key.collection_id)
+    _update_index_docs([doc])
+
+
 def _get_user_orgs(request: Request) -> list[str]:
     """
     Get the org.short_names for the organizations that the requesting user has OrgStaffRole or OrgInstructorRole.
diff --git a/openedx/core/djangoapps/content/search/documents.py b/openedx/core/djangoapps/content/search/documents.py
index a45b37ab2ad2..40fe4529272b 100644
--- a/openedx/core/djangoapps/content/search/documents.py
+++ b/openedx/core/djangoapps/content/search/documents.py
@@ -7,13 +7,18 @@
 from hashlib import blake2b
 
 from django.utils.text import slugify
+from django.core.exceptions import ObjectDoesNotExist
 from opaque_keys.edx.keys import LearningContextKey, UsageKey
+from openedx_learning.api import authoring as authoring_api
+from opaque_keys.edx.locator import LibraryLocatorV2
+from rest_framework.exceptions import NotFound
 
 from openedx.core.djangoapps.content.search.models import SearchAccess
 from openedx.core.djangoapps.content_libraries import api as lib_api
 from openedx.core.djangoapps.content_tagging import api as tagging_api
 from openedx.core.djangoapps.xblock import api as xblock_api
-from openedx_learning.api.authoring_models import LearningPackage
+from openedx.core.djangoapps.xblock.data import LatestVersion
+from openedx_learning.api.authoring_models import Collection
 
 log = logging.getLogger(__name__)
 
@@ -26,7 +31,11 @@ class Fields:
     id = "id"
     usage_key = "usage_key"
     type = "type"  # DocType.course_block or DocType.library_block (see below)
-    block_id = "block_id"  # The block_id part of the usage key. Sometimes human-readable, sometimes a random hex ID
+    # The block_id part of the usage key for course or library blocks.
+    # If it's a collection, the collection.key is stored here.
+    # Sometimes human-readable, sometimes a random hex ID
+    # Is only unique within the given context_key.
+    block_id = "block_id"
     display_name = "display_name"
     description = "description"
     modified = "modified"
@@ -52,11 +61,27 @@ class Fields:
     tags_level1 = "level1"
     tags_level2 = "level2"
     tags_level3 = "level3"
+    # Collections (dictionary) that this object belongs to.
+    # Similarly to tags above, we collect the collection.titles and collection.keys into hierarchical facets.
+    collections = "collections"
+    collections_display_name = "display_name"
+    collections_key = "key"
+
     # The "content" field is a dictionary of arbitrary data, depending on the block_type.
     # It comes from each XBlock's index_dictionary() method (if present) plus some processing.
     # Text (html) blocks have an "html_content" key in here, capa has "capa_content" and "problem_types", and so on.
     content = "content"
 
+    # Collections use this field to communicate how many entities/components they contain.
+    # Structural XBlocks may use this one day to indicate how many child blocks they ocntain.
+    num_children = "num_children"
+
+    # Published data (dictionary) of this object
+    published = "published"
+    published_display_name = "display_name"
+    published_description = "description"
+    published_num_children = "num_children"
+
     # Note: new fields or values can be added at any time, but if they need to be indexed for filtering or keyword
     # search, the index configuration will need to be changed, which is only done as part of the 'reindex_studio'
     # command (changing those settings on an large active index is not recommended).
@@ -82,9 +107,12 @@ def meili_id_from_opaque_key(usage_key: UsageKey) -> str:
     we could use PublishableEntity's primary key / UUID instead.
     """
     # The slugified key _may_ not be unique so we append a hashed string to make it unique:
-    key_bin = str(usage_key).encode()
-    suffix = blake2b(key_bin, digest_size=4).hexdigest()  # When we use Python 3.9+, should add usedforsecurity=False
-    return slugify(str(usage_key)) + "-" + suffix
+    key_str = str(usage_key)
+    key_bin = key_str.encode()
+
+    suffix = blake2b(key_bin, digest_size=4, usedforsecurity=False).hexdigest()
+
+    return f"{slugify(key_str)}-{suffix}"
 
 
 def _meili_access_id_from_context_key(context_key: LearningContextKey) -> int:
@@ -95,6 +123,57 @@ def _meili_access_id_from_context_key(context_key: LearningContextKey) -> int:
     return access.id
 
 
+def searchable_doc_for_usage_key(usage_key: UsageKey) -> dict:
+    """
+    Generates a base document identified by its usage key.
+    """
+    return {
+        Fields.id: meili_id_from_opaque_key(usage_key),
+    }
+
+
+def _get_content_from_block(block) -> dict:
+    """
+    Get the content from block
+    """
+    try:
+        content_data = block.index_dictionary()
+        # Will be something like:
+        # {
+        #     'content': {'display_name': '...', 'capa_content': '...'},
+        #     'content_type': 'CAPA',
+        #     'problem_types': ['multiplechoiceresponse']
+        # }
+        # Which we need to flatten:
+        if "content_type" in content_data:
+            del content_data["content_type"]  # Redundant with our standard Fields.block_type field.
+        if "content" in content_data and isinstance(content_data["content"], dict):
+            content = content_data["content"]
+            if "display_name" in content:
+                del content["display_name"]
+            del content_data["content"]
+            content_data.update(content)
+
+        return content_data
+
+    except Exception as err:  # pylint: disable=broad-except
+        log.exception(f"Failed to process index_dictionary for {block.usage_key}: {err}")
+
+
+def _get_description_from_block_content(block_type, block_content) -> str:
+    """
+    Generate description from block content
+    """
+    result = None
+
+    if block_type == 'html' and 'html_content' in block_content:
+        result = block_content['html_content']
+    elif block_type == 'problem' and 'capa_content' in block_content:
+        result = block_content['capa_content']
+
+    return result
+
+
 def _fields_from_block(block) -> dict:
     """
     Given an XBlock instance, call its index_dictionary() method to load any
@@ -104,16 +183,17 @@ def _fields_from_block(block) -> dict:
     class implementation returns only:
         {"content": {"display_name": "..."}, "content_type": "..."}
     """
+    block_type = block.scope_ids.block_type
     block_data = {
         Fields.usage_key: str(block.usage_key),
         Fields.block_id: str(block.usage_key.block_id),
         Fields.display_name: xblock_api.get_block_display_name(block),
-        Fields.block_type: block.scope_ids.block_type,
+        Fields.block_type: block_type,
         # This is called context_key so it's the same for courses and libraries
         Fields.context_key: str(block.usage_key.context_key),  # same as lib_key
         Fields.org: str(block.usage_key.context_key.org),
         Fields.access_id: _meili_access_id_from_context_key(block.usage_key.context_key),
-        Fields.breadcrumbs: []
+        Fields.breadcrumbs: [],
     }
     # Get the breadcrumbs (course, section, subsection, etc.):
     if block.usage_key.context_key.is_course:  # Getting parent is not yet implemented in Learning Core (for libraries).
@@ -134,25 +214,14 @@ class implementation returns only:
                 parent_data,
             )
     try:
-        content_data = block.index_dictionary()
-        # Will be something like:
-        # {
-        #     'content': {'display_name': '...', 'capa_content': '...'},
-        #     'content_type': 'CAPA',
-        #     'problem_types': ['multiplechoiceresponse']
-        # }
-        # Which we need to flatten:
-        if "content_type" in content_data:
-            del content_data["content_type"]  # Redundant with our standard Fields.block_type field.
-        if "content" in content_data and isinstance(content_data["content"], dict):
-            content = content_data["content"]
-            if "display_name" in content:
-                del content["display_name"]
-            del content_data["content"]
-            content_data.update(content)
-        # Now we have something like:
-        # { 'capa_content': '...', 'problem_types': ['multiplechoiceresponse'] }
+        content_data = _get_content_from_block(block)
         block_data[Fields.content] = content_data
+
+        # Generate description from the content
+        description = _get_description_from_block_content(block_type, content_data)
+        if description:
+            block_data[Fields.description] = description
+
     except Exception as err:  # pylint: disable=broad-except
         log.exception(f"Failed to process index_dictionary for {block.usage_key}: {err}")
     return block_data
@@ -223,6 +292,81 @@ def _tags_for_content_object(object_id: UsageKey | LearningContextKey) -> dict:
     return {Fields.tags: result}
 
 
+def _collections_for_content_object(object_id: UsageKey | LearningContextKey) -> dict:
+    """
+    Given an XBlock, course, library, etc., get the collections for its index doc.
+
+    e.g. for something in Collections "COL_A" and "COL_B", this would return:
+        {
+            "collections":  {
+                "display_name": ["Collection A", "Collection B"],
+                "key": ["COL_A", "COL_B"],
+            }
+        }
+
+    If the object is in no collections, returns:
+        {
+            "collections":  {
+                "display_name": [],
+                "key": [],
+            },
+        }
+
+    """
+    result = {
+        Fields.collections: {
+            Fields.collections_display_name: [],
+            Fields.collections_key: [],
+        }
+    }
+
+    # Gather the collections associated with this object
+    collections = None
+    try:
+        component = lib_api.get_component_from_usage_key(object_id)
+        collections = authoring_api.get_entity_collections(
+            component.learning_package_id,
+            component.key,
+        )
+    except ObjectDoesNotExist:
+        log.warning(f"No component found for {object_id}")
+
+    if not collections:
+        return result
+
+    for collection in collections:
+        result[Fields.collections][Fields.collections_display_name].append(collection.title)
+        result[Fields.collections][Fields.collections_key].append(collection.key)
+
+    return result
+
+
+def _published_data_from_block(block_published) -> dict:
+    """
+    Given an library block get the published data.
+    """
+    result = {
+        Fields.published: {
+            Fields.published_display_name: xblock_api.get_block_display_name(block_published),
+        }
+    }
+
+    try:
+        content_data = _get_content_from_block(block_published)
+
+        description = _get_description_from_block_content(
+            block_published.scope_ids.block_type,
+            content_data,
+        )
+
+        if description:
+            result[Fields.published][Fields.published_description] = description
+    except Exception as err:  # pylint: disable=broad-except
+        log.exception(f"Failed to process index_dictionary for {block_published.usage_key}: {err}")
+
+    return result
+
+
 def searchable_doc_for_library_block(xblock_metadata: lib_api.LibraryXBlockMetadata) -> dict:
     """
     Generate a dictionary document suitable for ingestion into a search engine
@@ -235,17 +379,26 @@ def searchable_doc_for_library_block(xblock_metadata: lib_api.LibraryXBlockMetad
     library_name = lib_api.get_library(xblock_metadata.usage_key.context_key).title
     block = xblock_api.load_block(xblock_metadata.usage_key, user=None)
 
-    doc = {
-        Fields.id: meili_id_from_opaque_key(xblock_metadata.usage_key),
+    try:
+        block_published = xblock_api.load_block(xblock_metadata.usage_key, user=None, version=LatestVersion.PUBLISHED)
+    except NotFound:
+        # Never published
+        block_published = None
+
+    doc = searchable_doc_for_usage_key(xblock_metadata.usage_key)
+    doc.update({
         Fields.type: DocType.library_block,
         Fields.breadcrumbs: [],
         Fields.created: xblock_metadata.created.timestamp(),
         Fields.modified: xblock_metadata.modified.timestamp(),
         Fields.last_published: xblock_metadata.last_published.timestamp() if xblock_metadata.last_published else None,
-    }
+    })
 
     doc.update(_fields_from_block(block))
 
+    if block_published:
+        doc.update(_published_data_from_block(block_published))
+
     # Add the breadcrumbs. In v2 libraries, the library itself is not a "parent" of the XBlocks so we add it here:
     doc[Fields.breadcrumbs] = [{"display_name": library_name}]
 
@@ -257,60 +410,118 @@ def searchable_doc_tags(usage_key: UsageKey) -> dict:
     Generate a dictionary document suitable for ingestion into a search engine
     like Meilisearch or Elasticsearch, with the tags data for the given content object.
     """
-    doc = {
-        Fields.id: meili_id_from_opaque_key(usage_key),
-    }
+    doc = searchable_doc_for_usage_key(usage_key)
     doc.update(_tags_for_content_object(usage_key))
 
     return doc
 
 
+def searchable_doc_collections(usage_key: UsageKey) -> dict:
+    """
+    Generate a dictionary document suitable for ingestion into a search engine
+    like Meilisearch or Elasticsearch, with the collections data for the given content object.
+    """
+    doc = searchable_doc_for_usage_key(usage_key)
+    doc.update(_collections_for_content_object(usage_key))
+
+    return doc
+
+
+def searchable_doc_tags_for_collection(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+) -> dict:
+    """
+    Generate a dictionary document suitable for ingestion into a search engine
+    like Meilisearch or Elasticsearch, with the tags data for the given library collection.
+    """
+    collection_usage_key = lib_api.get_library_collection_usage_key(
+        library_key,
+        collection_key,
+    )
+    doc = searchable_doc_for_usage_key(collection_usage_key)
+    doc.update(_tags_for_content_object(collection_usage_key))
+
+    return doc
+
+
 def searchable_doc_for_course_block(block) -> dict:
     """
     Generate a dictionary document suitable for ingestion into a search engine
     like Meilisearch or Elasticsearch, so that the given course block can be
     found using faceted search.
     """
-    doc = {
-        Fields.id: meili_id_from_opaque_key(block.usage_key),
+    doc = searchable_doc_for_usage_key(block.usage_key)
+    doc.update({
         Fields.type: DocType.course_block,
-    }
+    })
 
     doc.update(_fields_from_block(block))
 
     return doc
 
 
-def searchable_doc_for_collection(collection) -> dict:
+def searchable_doc_for_collection(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+    *,
+    # Optionally provide the collection if we've already fetched one
+    collection: Collection | None = None,
+) -> dict:
     """
     Generate a dictionary document suitable for ingestion into a search engine
     like Meilisearch or Elasticsearch, so that the given collection can be
     found using faceted search.
+
+    If no collection is found for the given library_key + collection_key, the returned document will contain only basic
+    information derived from the collection usage key, and no Fields.type value will be included in the returned dict.
     """
-    doc = {
-        Fields.id: collection.id,
-        Fields.type: DocType.collection,
-        Fields.display_name: collection.title,
-        Fields.description: collection.description,
-        Fields.created: collection.created.timestamp(),
-        Fields.modified: collection.modified.timestamp(),
-        # Add related learning_package.key as context_key by default.
-        # If related contentlibrary is found, it will override this value below.
-        # Mostly contentlibrary.library_key == learning_package.key
-        Fields.context_key: collection.learning_package.key,
-    }
-    # Just in case learning_package is not related to a library
+    collection_usage_key = lib_api.get_library_collection_usage_key(
+        library_key,
+        collection_key,
+    )
+
+    doc = searchable_doc_for_usage_key(collection_usage_key)
+
     try:
-        context_key = collection.learning_package.contentlibrary.library_key
-        org = str(context_key.org)
+        collection = collection or lib_api.get_library_collection_from_usage_key(collection_usage_key)
+    except lib_api.ContentLibraryCollectionNotFound:
+        # Collection not found, so we can only return the base doc
+        pass
+
+    if collection:
+        assert collection.key == collection_key
+
+        draft_num_children = authoring_api.filter_publishable_entities(
+            collection.entities,
+            has_draft=True,
+        ).count()
+        published_num_children = authoring_api.filter_publishable_entities(
+            collection.entities,
+            has_published=True,
+        ).count()
+
         doc.update({
-            Fields.context_key: str(context_key),
-            Fields.org: org,
+            Fields.context_key: str(library_key),
+            Fields.org: str(library_key.org),
+            Fields.usage_key: str(collection_usage_key),
+            Fields.block_id: collection.key,
+            Fields.type: DocType.collection,
+            Fields.display_name: collection.title,
+            Fields.description: collection.description,
+            Fields.created: collection.created.timestamp(),
+            Fields.modified: collection.modified.timestamp(),
+            Fields.num_children: draft_num_children,
+            Fields.published: {
+                Fields.published_num_children: published_num_children,
+            },
+            Fields.access_id: _meili_access_id_from_context_key(library_key),
+            Fields.breadcrumbs: [{"display_name": collection.learning_package.title}],
         })
-    except LearningPackage.contentlibrary.RelatedObjectDoesNotExist:
-        log.warning(f"Related library not found for {collection}")
-    doc[Fields.access_id] = _meili_access_id_from_context_key(doc[Fields.context_key])
-    # Add the breadcrumbs.
-    doc[Fields.breadcrumbs] = [{"display_name": collection.learning_package.title}]
+
+        # Disabled collections should be removed from the search index,
+        # so we mark them as _disabled
+        if not collection.enabled:
+            doc['_disabled'] = True
 
     return doc
diff --git a/openedx/core/djangoapps/content/search/handlers.py b/openedx/core/djangoapps/content/search/handlers.py
index 94ac02ea1606..24add6748d7d 100644
--- a/openedx/core/djangoapps/content/search/handlers.py
+++ b/openedx/core/djangoapps/content/search/handlers.py
@@ -6,30 +6,47 @@
 
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
-from openedx_events.content_authoring.data import ContentLibraryData, ContentObjectData, LibraryBlockData, XBlockData
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import UsageKey
+from opaque_keys.edx.locator import LibraryCollectionLocator
+from openedx_events.content_authoring.data import (
+    ContentLibraryData,
+    ContentObjectChangedData,
+    LibraryBlockData,
+    LibraryCollectionData,
+    XBlockData,
+)
 from openedx_events.content_authoring.signals import (
     CONTENT_LIBRARY_DELETED,
     CONTENT_LIBRARY_UPDATED,
     LIBRARY_BLOCK_CREATED,
     LIBRARY_BLOCK_DELETED,
     LIBRARY_BLOCK_UPDATED,
+    LIBRARY_COLLECTION_CREATED,
+    LIBRARY_COLLECTION_DELETED,
+    LIBRARY_COLLECTION_UPDATED,
     XBLOCK_CREATED,
     XBLOCK_DELETED,
     XBLOCK_UPDATED,
-    CONTENT_OBJECT_TAGS_CHANGED,
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
 )
-from openedx.core.djangoapps.content_tagging.utils import get_content_key_from_string
 
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.content.search.models import SearchAccess
 
-from .api import only_if_meilisearch_enabled, upsert_block_tags_index_docs
+from .api import (
+    only_if_meilisearch_enabled,
+    upsert_block_collections_index_docs,
+    upsert_block_tags_index_docs,
+    upsert_collection_tags_index_docs,
+)
 from .tasks import (
     delete_library_block_index_doc,
     delete_xblock_index_doc,
     update_content_library_index_docs,
+    update_library_collection_index_doc,
     upsert_library_block_index_doc,
-    upsert_xblock_index_doc
+    upsert_xblock_index_doc,
 )
 
 log = logging.getLogger(__name__)
@@ -108,7 +125,9 @@ def library_block_updated_handler(**kwargs) -> None:
         log.error("Received null or incorrect data for event")
         return
 
-    upsert_library_block_index_doc.delay(str(library_block_data.usage_key))
+    # Update content library index synchronously to make sure that search index is updated before
+    # the frontend invalidates/refetches results. This is only a single document update so is very fast.
+    upsert_library_block_index_doc.apply(args=[str(library_block_data.usage_key)])
 
 
 @receiver(LIBRARY_BLOCK_DELETED)
@@ -122,7 +141,9 @@ def library_block_deleted(**kwargs) -> None:
         log.error("Received null or incorrect data for event")
         return
 
-    delete_library_block_index_doc.delay(str(library_block_data.usage_key))
+    # Update content library index synchronously to make sure that search index is updated before
+    # the frontend invalidates/refetches results. This is only a single document update so is very fast.
+    delete_library_block_index_doc.apply(args=[str(library_block_data.usage_key)])
 
 
 @receiver(CONTENT_LIBRARY_UPDATED)
@@ -145,22 +166,62 @@ def content_library_updated_handler(**kwargs) -> None:
     update_content_library_index_docs.apply(args=[str(content_library_data.library_key)])
 
 
-@receiver(CONTENT_OBJECT_TAGS_CHANGED)
+@receiver(LIBRARY_COLLECTION_CREATED)
+@receiver(LIBRARY_COLLECTION_DELETED)
+@receiver(LIBRARY_COLLECTION_UPDATED)
 @only_if_meilisearch_enabled
-def content_object_tags_changed_handler(**kwargs) -> None:
+def library_collection_updated_handler(**kwargs) -> None:
     """
-    Update the tags data in the index for the Content Object
+    Create or update the index for the content library collection
     """
-    content_object_tags = kwargs.get("content_object", None)
-    if not content_object_tags or not isinstance(content_object_tags, ContentObjectData):
+    library_collection = kwargs.get("library_collection", None)
+    if not library_collection or not isinstance(library_collection, LibraryCollectionData):  # pragma: no cover
         log.error("Received null or incorrect data for event")
         return
 
-    try:
-        # Check if valid if course or library block
-        get_content_key_from_string(content_object_tags.object_id)
-    except ValueError:
-        log.error("Received invalid content object id")
+    if library_collection.background:
+        update_library_collection_index_doc.delay(
+            str(library_collection.library_key),
+            library_collection.collection_key,
+        )
+    else:
+        # Update collection index synchronously to make sure that search index is updated before
+        # the frontend invalidates/refetches index.
+        # See content_library_updated_handler for more details.
+        update_library_collection_index_doc.apply(args=[
+            str(library_collection.library_key),
+            library_collection.collection_key,
+        ])
+
+
+@receiver(CONTENT_OBJECT_ASSOCIATIONS_CHANGED)
+@only_if_meilisearch_enabled
+def content_object_associations_changed_handler(**kwargs) -> None:
+    """
+    Update the collections/tags data in the index for the Content Object
+    """
+    content_object = kwargs.get("content_object", None)
+    if not content_object or not isinstance(content_object, ContentObjectChangedData):
+        log.error("Received null or incorrect data for event")
         return
 
-    upsert_block_tags_index_docs(content_object_tags.object_id)
+    try:
+        # Check if valid if course or library block
+        usage_key = UsageKey.from_string(str(content_object.object_id))
+    except InvalidKeyError:
+        try:
+            # Check if valid if library collection
+            usage_key = LibraryCollectionLocator.from_string(str(content_object.object_id))
+        except InvalidKeyError:
+            log.error("Received invalid content object id")
+            return
+
+    # This event's changes may contain both "tags" and "collections", but this will happen rarely, if ever.
+    # So we allow a potential double "upsert" here.
+    if not content_object.changes or "tags" in content_object.changes:
+        if isinstance(usage_key, LibraryCollectionLocator):
+            upsert_collection_tags_index_docs(usage_key)
+        else:
+            upsert_block_tags_index_docs(usage_key)
+    if not content_object.changes or "collections" in content_object.changes:
+        upsert_block_collections_index_docs(usage_key)
diff --git a/openedx/core/djangoapps/content/search/index_config.py b/openedx/core/djangoapps/content/search/index_config.py
new file mode 100644
index 000000000000..9570956e425e
--- /dev/null
+++ b/openedx/core/djangoapps/content/search/index_config.py
@@ -0,0 +1,70 @@
+"""Configuration for the search index."""
+from .documents import Fields
+
+
+INDEX_DISTINCT_ATTRIBUTE = "usage_key"
+
+# Mark which attributes can be used for filtering/faceted search:
+INDEX_FILTERABLE_ATTRIBUTES = [
+    # Get specific block/collection using combination of block_id and context_key
+    Fields.block_id,
+    Fields.block_type,
+    Fields.context_key,
+    Fields.usage_key,
+    Fields.org,
+    Fields.tags,
+    Fields.tags + "." + Fields.tags_taxonomy,
+    Fields.tags + "." + Fields.tags_level0,
+    Fields.tags + "." + Fields.tags_level1,
+    Fields.tags + "." + Fields.tags_level2,
+    Fields.tags + "." + Fields.tags_level3,
+    Fields.collections,
+    Fields.collections + "." + Fields.collections_display_name,
+    Fields.collections + "." + Fields.collections_key,
+    Fields.type,
+    Fields.access_id,
+    Fields.last_published,
+    Fields.content + "." + Fields.problem_types,
+]
+
+# Mark which attributes are used for keyword search, in order of importance:
+INDEX_SEARCHABLE_ATTRIBUTES = [
+    # Keyword search does _not_ search the course name, course ID, breadcrumbs, block type, or other fields.
+    Fields.display_name,
+    Fields.block_id,
+    Fields.content,
+    Fields.description,
+    Fields.tags,
+    Fields.collections,
+    # If we don't list the following sub-fields _explicitly_, they're only sometimes searchable - that is, they
+    # are searchable only if at least one document in the index has a value. If we didn't list them here and,
+    # say, there were no tags.level3 tags in the index, the client would get an error if trying to search for
+    # these sub-fields: "Attribute `tags.level3` is not searchable."
+    Fields.tags + "." + Fields.tags_taxonomy,
+    Fields.tags + "." + Fields.tags_level0,
+    Fields.tags + "." + Fields.tags_level1,
+    Fields.tags + "." + Fields.tags_level2,
+    Fields.tags + "." + Fields.tags_level3,
+    Fields.collections + "." + Fields.collections_display_name,
+    Fields.collections + "." + Fields.collections_key,
+    Fields.published + "." + Fields.display_name,
+    Fields.published + "." + Fields.published_description,
+]
+
+# Mark which attributes can be used for sorting search results:
+INDEX_SORTABLE_ATTRIBUTES = [
+    Fields.display_name,
+    Fields.created,
+    Fields.modified,
+    Fields.last_published,
+]
+
+# Update the search ranking rules to let the (optional) "sort" parameter take precedence over keyword relevance.
+INDEX_RANKING_RULES = [
+    "sort",
+    "words",
+    "typo",
+    "proximity",
+    "attribute",
+    "exactness",
+]
diff --git a/openedx/core/djangoapps/content/search/management/commands/reindex_studio.py b/openedx/core/djangoapps/content/search/management/commands/reindex_studio.py
index 3767ebcba6c9..2d8bb29f7a1f 100644
--- a/openedx/core/djangoapps/content/search/management/commands/reindex_studio.py
+++ b/openedx/core/djangoapps/content/search/management/commands/reindex_studio.py
@@ -18,8 +18,11 @@ class Command(BaseCommand):
     """
 
     def add_arguments(self, parser):
-        parser.add_argument('--experimental', action='store_true')
-        parser.set_defaults(experimental=False)
+        parser.add_argument("--experimental", action="store_true")
+        parser.add_argument("--reset", action="store_true")
+        parser.add_argument("--init", action="store_true")
+        parser.add_argument("--incremental", action="store_true")
+        parser.set_defaults(experimental=False, reset=False, init=False, incremental=False)
 
     def handle(self, *args, **options):
         """
@@ -34,4 +37,11 @@ def handle(self, *args, **options):
                 "Use the --experimental argument to acknowledge and run it."
             )
 
-        api.rebuild_index(self.stdout.write)
+        if options["reset"]:
+            api.reset_index(self.stdout.write)
+        elif options["init"]:
+            api.init_index(self.stdout.write, self.stderr.write)
+        elif options["incremental"]:
+            api.rebuild_index(self.stdout.write, incremental=True)
+        else:
+            api.rebuild_index(self.stdout.write)
diff --git a/openedx/core/djangoapps/content/search/migrations/0002_incrementalindexcompleted.py b/openedx/core/djangoapps/content/search/migrations/0002_incrementalindexcompleted.py
new file mode 100644
index 000000000000..a316c35a7dfe
--- /dev/null
+++ b/openedx/core/djangoapps/content/search/migrations/0002_incrementalindexcompleted.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.16 on 2024-11-15 12:40
+
+from django.db import migrations, models
+import opaque_keys.edx.django.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('search', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IncrementalIndexCompleted',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('context_key', opaque_keys.edx.django.models.LearningContextKeyField(max_length=255, unique=True)),
+            ],
+        ),
+    ]
diff --git a/openedx/core/djangoapps/content/search/models.py b/openedx/core/djangoapps/content/search/models.py
index 711c493ff895..6fa53ef17b34 100644
--- a/openedx/core/djangoapps/content/search/models.py
+++ b/openedx/core/djangoapps/content/search/models.py
@@ -65,3 +65,15 @@ def get_access_ids_for_request(request: Request, omit_orgs: list[str] = None) ->
             course_clause | library_clause
         ).order_by('-id').values_list("id", flat=True)
     )
+
+
+class IncrementalIndexCompleted(models.Model):
+    """
+    Stores the contex keys of aleady indexed courses and libraries for incremental indexing.
+    """
+
+    context_key = LearningContextKeyField(
+        max_length=255,
+        unique=True,
+        null=False,
+    )
diff --git a/openedx/core/djangoapps/content/search/tasks.py b/openedx/core/djangoapps/content/search/tasks.py
index dfd603776981..98390a12f3b3 100644
--- a/openedx/core/djangoapps/content/search/tasks.py
+++ b/openedx/core/djangoapps/content/search/tasks.py
@@ -84,3 +84,29 @@ def update_content_library_index_docs(library_key_str: str) -> None:
     # Delete all documents in this library that were not published by above function
     # as this task is also triggered on discard event.
     api.delete_all_draft_docs_for_library(library_key)
+
+
+@shared_task(base=LoggedTask, autoretry_for=(MeilisearchError, ConnectionError))
+@set_code_owner_attribute
+def update_library_collection_index_doc(library_key_str: str, collection_key: str) -> None:
+    """
+    Celery task to update the content index document for a library collection
+    """
+    library_key = LibraryLocatorV2.from_string(library_key_str)
+
+    log.info("Updating content index documents for collection %s in library%s", collection_key, library_key)
+
+    api.upsert_library_collection_index_doc(library_key, collection_key)
+
+
+@shared_task(base=LoggedTask, autoretry_for=(MeilisearchError, ConnectionError))
+@set_code_owner_attribute
+def update_library_components_collections(library_key_str: str, collection_key: str) -> None:
+    """
+    Celery task to update the "collections" field for components in the given content library collection.
+    """
+    library_key = LibraryLocatorV2.from_string(library_key_str)
+
+    log.info("Updating document.collections for library %s collection %s components", library_key, collection_key)
+
+    api.update_library_components_collections(library_key, collection_key)
diff --git a/openedx/core/djangoapps/content/search/tests/test_api.py b/openedx/core/djangoapps/content/search/tests/test_api.py
index 549817700370..c9c2b2589a31 100644
--- a/openedx/core/djangoapps/content/search/tests/test_api.py
+++ b/openedx/core/djangoapps/content/search/tests/test_api.py
@@ -10,8 +10,10 @@
 from opaque_keys.edx.keys import UsageKey
 
 import ddt
+import pytest
 from django.test import override_settings
 from freezegun import freeze_time
+from meilisearch.errors import MeilisearchApiError
 from openedx_learning.api import authoring as authoring_api
 from organizations.tests.factories import OrganizationFactory
 
@@ -26,7 +28,7 @@
 try:
     # This import errors in the lms because content.search is not an installed app there.
     from .. import api
-    from ..models import SearchAccess
+    from ..models import SearchAccess, IncrementalIndexCompleted
 except RuntimeError:
     SearchAccess = {}
 
@@ -115,7 +117,6 @@ def setUp(self):
 
         # Create a content library:
         self.library = library_api.create_library(
-            library_type=library_api.COMPLEX,
             org=OrganizationFactory.create(short_name="org1"),
             slug="lib",
             title="Library",
@@ -141,7 +142,7 @@ def setUp(self):
             "context_key": "lib:org1:lib",
             "org": "org1",
             "breadcrumbs": [{"display_name": "Library"}],
-            "content": {"problem_types": [], "capa_content": " "},
+            "content": {"problem_types": [], "capa_content": ""},
             "type": "library_block",
             "access_id": lib_access.id,
             "last_published": None,
@@ -157,7 +158,7 @@ def setUp(self):
             "context_key": "lib:org1:lib",
             "org": "org1",
             "breadcrumbs": [{"display_name": "Library"}],
-            "content": {"problem_types": [], "capa_content": " "},
+            "content": {"problem_types": [], "capa_content": ""},
             "type": "library_block",
             "access_id": lib_access.id,
             "last_published": None,
@@ -177,25 +178,33 @@ def setUp(self):
 
         # Create a collection:
         self.learning_package = authoring_api.get_learning_package_by_key(self.library.key)
-        self.collection_dict = {
-            'id': 1,
-            'type': 'collection',
-            'display_name': 'my_collection',
-            'description': 'my collection description',
-            'context_key': 'lib:org1:lib',
-            'org': 'org1',
-            'created': created_date.timestamp(),
-            'modified': created_date.timestamp(),
-            "access_id": lib_access.id,
-            'breadcrumbs': [{'display_name': 'Library'}]
-        }
         with freeze_time(created_date):
             self.collection = authoring_api.create_collection(
                 learning_package_id=self.learning_package.id,
+                key="MYCOL",
                 title="my_collection",
                 created_by=None,
                 description="my collection description"
             )
+            self.collection_usage_key = "lib-collection:org1:lib:MYCOL"
+        self.collection_dict = {
+            "id": "lib-collectionorg1libmycol-5b647617",
+            "block_id": self.collection.key,
+            "usage_key": self.collection_usage_key,
+            "type": "collection",
+            "display_name": "my_collection",
+            "description": "my collection description",
+            "num_children": 0,
+            "context_key": "lib:org1:lib",
+            "org": "org1",
+            "created": created_date.timestamp(),
+            "modified": created_date.timestamp(),
+            "access_id": lib_access.id,
+            "published": {
+                "num_children": 0
+            },
+            "breadcrumbs": [{"display_name": "Library"}],
+        }
 
     @override_settings(MEILISEARCH_ENABLED=False)
     def test_reindex_meilisearch_disabled(self, mock_meilisearch):
@@ -214,19 +223,105 @@ def test_reindex_meilisearch(self, mock_meilisearch):
         doc_vertical["tags"] = {}
         doc_problem1 = copy.deepcopy(self.doc_problem1)
         doc_problem1["tags"] = {}
+        doc_problem1["collections"] = {'display_name': [], 'key': []}
         doc_problem2 = copy.deepcopy(self.doc_problem2)
         doc_problem2["tags"] = {}
+        doc_problem2["collections"] = {'display_name': [], 'key': []}
+        doc_collection = copy.deepcopy(self.collection_dict)
+        doc_collection["tags"] = {}
 
         api.rebuild_index()
+        assert mock_meilisearch.return_value.index.return_value.add_documents.call_count == 3
         mock_meilisearch.return_value.index.return_value.add_documents.assert_has_calls(
             [
                 call([doc_sequential, doc_vertical]),
                 call([doc_problem1, doc_problem2]),
-                call([self.collection_dict]),
+                call([doc_collection]),
             ],
             any_order=True,
         )
 
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_reindex_meilisearch_incremental(self, mock_meilisearch):
+
+        # Add tags field to doc, since reindex calls includes tags
+        doc_sequential = copy.deepcopy(self.doc_sequential)
+        doc_sequential["tags"] = {}
+        doc_vertical = copy.deepcopy(self.doc_vertical)
+        doc_vertical["tags"] = {}
+        doc_problem1 = copy.deepcopy(self.doc_problem1)
+        doc_problem1["tags"] = {}
+        doc_problem1["collections"] = {"display_name": [], "key": []}
+        doc_problem2 = copy.deepcopy(self.doc_problem2)
+        doc_problem2["tags"] = {}
+        doc_problem2["collections"] = {"display_name": [], "key": []}
+        doc_collection = copy.deepcopy(self.collection_dict)
+        doc_collection["tags"] = {}
+
+        api.rebuild_index(incremental=True)
+        assert mock_meilisearch.return_value.index.return_value.add_documents.call_count == 3
+        mock_meilisearch.return_value.index.return_value.add_documents.assert_has_calls(
+            [
+                call([doc_sequential, doc_vertical]),
+                call([doc_problem1, doc_problem2]),
+                call([doc_collection]),
+            ],
+            any_order=True,
+        )
+
+        # Now we simulate interruption by passing this function to the status_cb argument
+        def simulated_interruption(message):
+            # this exception prevents courses from being indexed
+            if "Indexing courses" in message:
+                raise Exception("Simulated interruption")
+
+        with pytest.raises(Exception, match="Simulated interruption"):
+            api.rebuild_index(simulated_interruption, incremental=True)
+
+        # two more calls due to collections
+        assert mock_meilisearch.return_value.index.return_value.add_documents.call_count == 5
+        assert IncrementalIndexCompleted.objects.all().count() == 1
+        api.rebuild_index(incremental=True)
+        assert IncrementalIndexCompleted.objects.all().count() == 0
+        # one missing course indexed
+        assert mock_meilisearch.return_value.index.return_value.add_documents.call_count == 6
+
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_reset_meilisearch_index(self, mock_meilisearch):
+        api.reset_index()
+        mock_meilisearch.return_value.swap_indexes.assert_called_once()
+        mock_meilisearch.return_value.create_index.assert_called_once()
+        mock_meilisearch.return_value.delete_index.call_count = 2
+        api.reset_index()
+        mock_meilisearch.return_value.delete_index.call_count = 4
+
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_init_meilisearch_index(self, mock_meilisearch):
+        # Test index already exists
+        api.init_index()
+        mock_meilisearch.return_value.swap_indexes.assert_not_called()
+        mock_meilisearch.return_value.create_index.assert_not_called()
+        mock_meilisearch.return_value.delete_index.assert_not_called()
+
+        # Test index already exists and has no documents
+        mock_meilisearch.return_value.get_stats.return_value = 0
+        api.init_index()
+        mock_meilisearch.return_value.swap_indexes.assert_not_called()
+        mock_meilisearch.return_value.create_index.assert_not_called()
+        mock_meilisearch.return_value.delete_index.assert_not_called()
+
+        mock_meilisearch.return_value.get_index.side_effect = [
+            MeilisearchApiError("Testing reindex", Mock(text='{"code":"index_not_found"}')),
+            MeilisearchApiError("Testing reindex", Mock(text='{"code":"index_not_found"}')),
+            Mock(created_at=1),
+            Mock(created_at=1),
+            Mock(created_at=1),
+        ]
+        api.init_index()
+        mock_meilisearch.return_value.swap_indexes.assert_called_once()
+        mock_meilisearch.return_value.create_index.assert_called_once()
+        mock_meilisearch.return_value.delete_index.call_count = 2
+
     @override_settings(MEILISEARCH_ENABLED=True)
     @patch(
         "openedx.core.djangoapps.content.search.api.searchable_doc_for_collection",
@@ -253,6 +348,7 @@ def test_reindex_meilisearch_library_block_error(self, mock_meilisearch):
         doc_vertical["tags"] = {}
         doc_problem2 = copy.deepcopy(self.doc_problem2)
         doc_problem2["tags"] = {}
+        doc_problem2["collections"] = {'display_name': [], 'key': []}
 
         orig_from_component = library_api.LibraryXBlockMetadata.from_component
 
@@ -345,6 +441,7 @@ def test_index_xblock_tags(self, mock_meilisearch):
             }
         }
 
+        assert mock_meilisearch.return_value.index.return_value.update_documents.call_count == 2
         mock_meilisearch.return_value.index.return_value.update_documents.assert_has_calls(
             [
                 call([doc_sequential_with_tags1]),
@@ -399,6 +496,7 @@ def test_index_library_block_tags(self, mock_meilisearch):
             }
         }
 
+        assert mock_meilisearch.return_value.index.return_value.update_documents.call_count == 2
         mock_meilisearch.return_value.index.return_value.update_documents.assert_has_calls(
             [
                 call([doc_problem_with_tags1]),
@@ -407,6 +505,146 @@ def test_index_library_block_tags(self, mock_meilisearch):
             any_order=True,
         )
 
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_index_library_block_and_collections(self, mock_meilisearch):
+        """
+        Test indexing an Library Block and the Collections it's in.
+        """
+        # Create collections (these internally call `upsert_library_collection_index_doc`)
+        created_date = datetime(2023, 5, 6, 7, 8, 9, tzinfo=timezone.utc)
+        with freeze_time(created_date):
+            collection1 = library_api.create_library_collection(
+                self.library.key,
+                collection_key="COL1",
+                title="Collection 1",
+                created_by=None,
+                description="First Collection",
+            )
+
+            collection2 = library_api.create_library_collection(
+                self.library.key,
+                collection_key="COL2",
+                title="Collection 2",
+                created_by=None,
+                description="Second Collection",
+            )
+
+        # Add Problem1 to both Collections (these internally call `upsert_block_collections_index_docs` and
+        # `upsert_library_collection_index_doc`)
+        # (adding in reverse order to test sorting of collection tag)
+        updated_date = datetime(2023, 6, 7, 8, 9, 10, tzinfo=timezone.utc)
+        with freeze_time(updated_date):
+            for collection in (collection2, collection1):
+                library_api.update_library_collection_components(
+                    self.library.key,
+                    collection_key=collection.key,
+                    usage_keys=[
+                        self.problem1.usage_key,
+                    ],
+                )
+
+        # Build expected docs at each stage
+        lib_access, _ = SearchAccess.objects.get_or_create(context_key=self.library.key)
+        doc_collection1_created = {
+            "id": "lib-collectionorg1libcol1-283a79c9",
+            "block_id": collection1.key,
+            "usage_key": f"lib-collection:org1:lib:{collection1.key}",
+            "type": "collection",
+            "display_name": "Collection 1",
+            "description": "First Collection",
+            "num_children": 0,
+            "context_key": "lib:org1:lib",
+            "org": "org1",
+            "created": created_date.timestamp(),
+            "modified": created_date.timestamp(),
+            "access_id": lib_access.id,
+            "published": {
+                "num_children": 0
+            },
+            "breadcrumbs": [{"display_name": "Library"}],
+        }
+        doc_collection2_created = {
+            "id": "lib-collectionorg1libcol2-46823d4d",
+            "block_id": collection2.key,
+            "usage_key": f"lib-collection:org1:lib:{collection2.key}",
+            "type": "collection",
+            "display_name": "Collection 2",
+            "description": "Second Collection",
+            "num_children": 0,
+            "context_key": "lib:org1:lib",
+            "org": "org1",
+            "created": created_date.timestamp(),
+            "modified": created_date.timestamp(),
+            "access_id": lib_access.id,
+            "published": {
+                "num_children": 0
+            },
+            "breadcrumbs": [{"display_name": "Library"}],
+        }
+        doc_collection2_updated = {
+            "id": "lib-collectionorg1libcol2-46823d4d",
+            "block_id": collection2.key,
+            "usage_key": f"lib-collection:org1:lib:{collection2.key}",
+            "type": "collection",
+            "display_name": "Collection 2",
+            "description": "Second Collection",
+            "num_children": 1,
+            "context_key": "lib:org1:lib",
+            "org": "org1",
+            "created": created_date.timestamp(),
+            "modified": updated_date.timestamp(),
+            "access_id": lib_access.id,
+            "published": {
+                "num_children": 0
+            },
+            "breadcrumbs": [{"display_name": "Library"}],
+        }
+        doc_collection1_updated = {
+            "id": "lib-collectionorg1libcol1-283a79c9",
+            "block_id": collection1.key,
+            "usage_key": f"lib-collection:org1:lib:{collection1.key}",
+            "type": "collection",
+            "display_name": "Collection 1",
+            "description": "First Collection",
+            "num_children": 1,
+            "context_key": "lib:org1:lib",
+            "org": "org1",
+            "created": created_date.timestamp(),
+            "modified": updated_date.timestamp(),
+            "access_id": lib_access.id,
+            "published": {
+                "num_children": 0
+            },
+            "breadcrumbs": [{"display_name": "Library"}],
+        }
+        doc_problem_with_collection1 = {
+            "id": self.doc_problem1["id"],
+            "collections": {
+                "display_name": ["Collection 2"],
+                "key": ["COL2"],
+            },
+        }
+        doc_problem_with_collection2 = {
+            "id": self.doc_problem1["id"],
+            "collections": {
+                "display_name": ["Collection 1", "Collection 2"],
+                "key": ["COL1", "COL2"],
+            },
+        }
+
+        assert mock_meilisearch.return_value.index.return_value.update_documents.call_count == 6
+        mock_meilisearch.return_value.index.return_value.update_documents.assert_has_calls(
+            [
+                call([doc_collection1_created]),
+                call([doc_collection2_created]),
+                call([doc_collection2_updated]),
+                call([doc_collection1_updated]),
+                call([doc_problem_with_collection1]),
+                call([doc_problem_with_collection2]),
+            ],
+            any_order=True,
+        )
+
     @override_settings(MEILISEARCH_ENABLED=True)
     def test_delete_index_library_block(self, mock_meilisearch):
         """
@@ -443,3 +681,136 @@ def test_delete_all_drafts(self, mock_meilisearch):
         mock_meilisearch.return_value.index.return_value.delete_documents.assert_called_once_with(
             filter=delete_filter
         )
+
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_index_tags_in_collections(self, mock_meilisearch):
+        # Tag collection
+        tagging_api.tag_object(self.collection_usage_key, self.taxonomyA, ["one", "two"])
+        tagging_api.tag_object(self.collection_usage_key, self.taxonomyB, ["three", "four"])
+
+        # Build expected docs with tags at each stage
+        doc_collection_with_tags1 = {
+            "id": "lib-collectionorg1libmycol-5b647617",
+            "tags": {
+                'taxonomy': ['A'],
+                'level0': ['A > one', 'A > two']
+            }
+        }
+        doc_collection_with_tags2 = {
+            "id": "lib-collectionorg1libmycol-5b647617",
+            "tags": {
+                'taxonomy': ['A', 'B'],
+                'level0': ['A > one', 'A > two', 'B > four', 'B > three']
+            }
+        }
+
+        assert mock_meilisearch.return_value.index.return_value.update_documents.call_count == 2
+        mock_meilisearch.return_value.index.return_value.update_documents.assert_has_calls(
+            [
+                call([doc_collection_with_tags1]),
+                call([doc_collection_with_tags2]),
+            ],
+            any_order=True,
+        )
+
+    @override_settings(MEILISEARCH_ENABLED=True)
+    def test_delete_collection(self, mock_meilisearch):
+        """
+        Test soft-deleting, restoring, and hard-deleting a collection.
+        """
+        # Add a component to the collection
+        updated_date = datetime(2023, 6, 7, 8, 9, 10, tzinfo=timezone.utc)
+        with freeze_time(updated_date):
+            library_api.update_library_collection_components(
+                self.library.key,
+                collection_key=self.collection.key,
+                usage_keys=[
+                    self.problem1.usage_key,
+                ],
+            )
+
+        doc_collection = copy.deepcopy(self.collection_dict)
+        doc_collection["num_children"] = 1
+        doc_collection["modified"] = updated_date.timestamp()
+        doc_problem_with_collection = {
+            "id": self.doc_problem1["id"],
+            "collections": {
+                "display_name": [self.collection.title],
+                "key": [self.collection.key],
+            },
+        }
+
+        # Should update the collection and its component
+        assert mock_meilisearch.return_value.index.return_value.update_documents.call_count == 2
+        mock_meilisearch.return_value.index.return_value.update_documents.assert_has_calls(
+            [
+                call([doc_collection]),
+                call([doc_problem_with_collection]),
+            ],
+            any_order=True,
+        )
+        mock_meilisearch.return_value.index.reset_mock()
+
+        # Soft-delete the collection
+        authoring_api.delete_collection(
+            self.collection.learning_package_id,
+            self.collection.key,
+        )
+
+        doc_problem_without_collection = {
+            "id": self.doc_problem1["id"],
+            "collections": {'display_name': [], 'key': []},
+        }
+
+        # Should delete the collection document
+        mock_meilisearch.return_value.index.return_value.delete_document.assert_called_once_with(
+            self.collection_dict["id"],
+        )
+        # ...and update the component's "collections" field
+        mock_meilisearch.return_value.index.return_value.update_documents.assert_called_once_with([
+            doc_problem_without_collection,
+        ])
+        mock_meilisearch.return_value.index.reset_mock()
+
+        # We need to mock get_document here so that when we restore the collection below, meilisearch knows the
+        # collection is being re-added, so it will update its components too.
+        mock_meilisearch.return_value.get_index.return_value.get_document.return_value = None
+
+        # Restore the collection
+        restored_date = datetime(2023, 8, 9, 10, 11, 12, tzinfo=timezone.utc)
+        with freeze_time(restored_date):
+            authoring_api.restore_collection(
+                self.collection.learning_package_id,
+                self.collection.key,
+            )
+
+        doc_collection = copy.deepcopy(self.collection_dict)
+        doc_collection["num_children"] = 1
+        doc_collection["modified"] = restored_date.timestamp()
+
+        # Should update the collection and its component's "collections" field
+        assert mock_meilisearch.return_value.index.return_value.update_documents.call_count == 2
+        mock_meilisearch.return_value.index.return_value.update_documents.assert_has_calls(
+            [
+                call([doc_collection]),
+                call([doc_problem_with_collection]),
+            ],
+            any_order=True,
+        )
+        mock_meilisearch.return_value.index.reset_mock()
+
+        # Hard-delete the collection
+        authoring_api.delete_collection(
+            self.collection.learning_package_id,
+            self.collection.key,
+            hard_delete=True,
+        )
+
+        # Should delete the collection document
+        mock_meilisearch.return_value.index.return_value.delete_document.assert_called_once_with(
+            self.collection_dict["id"],
+        )
+        # ...and cascade delete updates the "collections" field for the associated components
+        mock_meilisearch.return_value.index.return_value.update_documents.assert_called_once_with([
+            doc_problem_without_collection,
+        ])
diff --git a/openedx/core/djangoapps/content/search/tests/test_documents.py b/openedx/core/djangoapps/content/search/tests/test_documents.py
index 6140411705bb..603cc8d92f5e 100644
--- a/openedx/core/djangoapps/content/search/tests/test_documents.py
+++ b/openedx/core/djangoapps/content/search/tests/test_documents.py
@@ -5,9 +5,9 @@
 from organizations.models import Organization
 
 from freezegun import freeze_time
-from openedx_learning.api import authoring as authoring_api
 
 from openedx.core.djangoapps.content_tagging import api as tagging_api
+from openedx.core.djangoapps.content_libraries import api as library_api
 from openedx.core.djangolib.testing.utils import skip_unless_cms
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
@@ -15,12 +15,21 @@
 
 try:
     # This import errors in the lms because content.search is not an installed app there.
-    from ..documents import searchable_doc_for_course_block, searchable_doc_tags, searchable_doc_for_collection
+    from ..documents import (
+        searchable_doc_for_course_block,
+        searchable_doc_tags,
+        searchable_doc_tags_for_collection,
+        searchable_doc_collections,
+        searchable_doc_for_collection,
+        searchable_doc_for_library_block,
+    )
     from ..models import SearchAccess
 except RuntimeError:
     searchable_doc_for_course_block = lambda x: x
     searchable_doc_tags = lambda x: x
+    searchable_doc_tags_for_collection = lambda x: x
     searchable_doc_for_collection = lambda x: x
+    searchable_doc_for_library_block = lambda x: x
     SearchAccess = {}
 
 
@@ -38,12 +47,13 @@ class StudioDocumentsTest(SharedModuleStoreTestCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.store = modulestore()
+        cls.org = Organization.objects.create(name="edX", short_name="edX")
         cls.toy_course = ToyCourseFactory.create()  # See xmodule/modulestore/tests/sample_courses.py
         cls.toy_course_key = cls.toy_course.id
 
         # Get references to some blocks in the toy course
         cls.html_block_key = cls.toy_course_key.make_usage_key("html", "toyjumpto")
-        # Create a problem in library
+        # Create a problem in course
         cls.problem_block = BlockFactory.create(
             category="problem",
             parent_location=cls.toy_course_key.make_usage_key("vertical", "vertical_test"),
@@ -51,8 +61,39 @@ def setUpClass(cls):
             data="<problem>What is a test?<multiplechoiceresponse></multiplechoiceresponse></problem>",
         )
 
+        # Create a library and collection with a block
+        created_date = datetime(2023, 4, 5, 6, 7, 8, tzinfo=timezone.utc)
+        with freeze_time(created_date):
+            cls.library = library_api.create_library(
+                org=cls.org,
+                slug="2012_Fall",
+                title="some content_library",
+                description="some description",
+            )
+            cls.collection = library_api.create_library_collection(
+                cls.library.key,
+                collection_key="TOY_COLLECTION",
+                title="Toy Collection",
+                created_by=None,
+                description="my toy collection description"
+            )
+            cls.collection_usage_key = "lib-collection:edX:2012_Fall:TOY_COLLECTION"
+            cls.library_block = library_api.create_library_block(
+                cls.library.key,
+                "html",
+                "text2",
+            )
+
+            # Add the problem block to the collection
+            library_api.update_library_collection_components(
+                cls.library.key,
+                collection_key="TOY_COLLECTION",
+                usage_keys=[
+                    cls.library_block.usage_key,
+                ]
+            )
+
         # Create a couple taxonomies and some tags
-        cls.org = Organization.objects.create(name="edX", short_name="edX")
         cls.difficulty_tags = tagging_api.create_taxonomy(name="Difficulty", orgs=[cls.org], allow_multiple=False)
         tagging_api.add_tag_to_taxonomy(cls.difficulty_tags, tag="Easy")
         tagging_api.add_tag_to_taxonomy(cls.difficulty_tags, tag="Normal")
@@ -69,6 +110,8 @@ def setUpClass(cls):
         tagging_api.tag_object(str(cls.problem_block.usage_key), cls.difficulty_tags, tags=["Easy"])
         tagging_api.tag_object(str(cls.html_block_key), cls.subject_tags, tags=["Chinese", "Jump Links"])
         tagging_api.tag_object(str(cls.html_block_key), cls.difficulty_tags, tags=["Normal"])
+        tagging_api.tag_object(str(cls.library_block.usage_key), cls.difficulty_tags, tags=["Normal"])
+        tagging_api.tag_object(cls.collection_usage_key, cls.difficulty_tags, tags=["Normal"])
 
     @property
     def toy_course_access_id(self):
@@ -80,6 +123,16 @@ def toy_course_access_id(self):
         """
         return SearchAccess.objects.get(context_key=self.toy_course_key).id
 
+    @property
+    def library_access_id(self):
+        """
+        Returns the SearchAccess.id created for the library.
+
+        This SearchAccess object is created when documents are added to the search index, so this method must be called
+        after this step, or risk a DoesNotExist error.
+        """
+        return SearchAccess.objects.get(context_key=self.library.key).id
+
     def test_problem_block(self):
         """
         Test how a problem block gets represented in the search index
@@ -101,6 +154,7 @@ def test_problem_block(self):
             "org": "edX",
             "access_id": self.toy_course_access_id,
             "display_name": "Test Problem",
+            "description": "What is a test?",
             "breadcrumbs": [
                 {
                     'display_name': 'Toy Course',
@@ -149,6 +203,8 @@ def test_html_block(self):
             "org": "edX",
             "access_id": self.toy_course_access_id,
             "display_name": "Text",
+            "description": "This is a link to another page and some Chinese 四節比分和七年前 Some "
+                         "more Chinese 四節比分和七年前 ",
             "breadcrumbs": [
                 {
                     'display_name': 'Toy Course',
@@ -205,29 +261,219 @@ def test_video_block_untagged(self):
             # This video has no tags.
         }
 
-    def test_collection_with_no_library(self):
-        created_date = datetime(2023, 4, 5, 6, 7, 8, tzinfo=timezone.utc)
-        with freeze_time(created_date):
-            learning_package = authoring_api.create_learning_package(
-                key="course-v1:edX+toy+2012_Fall",
-                title="some learning_package",
-                description="some description",
-            )
-            collection = authoring_api.create_collection(
-                learning_package_id=learning_package.id,
-                title="my_collection",
-                created_by=None,
-                description="my collection description"
-            )
-        doc = searchable_doc_for_collection(collection)
+    def test_html_library_block(self):
+        """
+        Test how a library block gets represented in the search index
+        """
+        doc = {}
+        doc.update(searchable_doc_for_library_block(self.library_block))
+        doc.update(searchable_doc_tags(self.library_block.usage_key))
+        doc.update(searchable_doc_collections(self.library_block.usage_key))
+        assert doc == {
+            "id": "lbedx2012_fallhtmltext2-4bb47d67",
+            "type": "library_block",
+            "block_type": "html",
+            "usage_key": "lb:edX:2012_Fall:html:text2",
+            "block_id": "text2",
+            "context_key": "lib:edX:2012_Fall",
+            "org": "edX",
+            "access_id": self.library_access_id,
+            "display_name": "Text",
+            "breadcrumbs": [
+                {
+                    "display_name": "some content_library",
+                },
+            ],
+            "last_published": None,
+            "created": 1680674828.0,
+            "modified": 1680674828.0,
+            "content": {
+                "html_content": "",
+            },
+            "collections": {
+                "key": ["TOY_COLLECTION"],
+                "display_name": ["Toy Collection"],
+            },
+            "tags": {
+                "taxonomy": ["Difficulty"],
+                "level0": ["Difficulty > Normal"],
+            },
+        }
+
+    def test_html_published_library_block(self):
+        library_api.publish_changes(self.library.key)
+
+        doc = searchable_doc_for_library_block(self.library_block)
+        doc.update(searchable_doc_tags(self.library_block.usage_key))
+        doc.update(searchable_doc_collections(self.library_block.usage_key))
+
+        assert doc == {
+            "id": "lbedx2012_fallhtmltext2-4bb47d67",
+            "type": "library_block",
+            "block_type": "html",
+            "usage_key": "lb:edX:2012_Fall:html:text2",
+            "block_id": "text2",
+            "context_key": "lib:edX:2012_Fall",
+            "org": "edX",
+            "access_id": self.library_access_id,
+            "display_name": "Text",
+            "breadcrumbs": [
+                {
+                    "display_name": "some content_library",
+                },
+            ],
+            "last_published": None,
+            "created": 1680674828.0,
+            "modified": 1680674828.0,
+            "content": {
+                "html_content": "",
+            },
+            "collections": {
+                "key": ["TOY_COLLECTION"],
+                "display_name": ["Toy Collection"],
+            },
+            "tags": {
+                "taxonomy": ["Difficulty"],
+                "level0": ["Difficulty > Normal"],
+            },
+            'published': {'display_name': 'Text'},
+        }
+
+        # Update library block to create a draft
+        olx_str = '<html display_name="Text 2"><![CDATA[<p>This is a Test</p>]]></html>'
+        library_api.set_library_block_olx(self.library_block.usage_key, olx_str)
+
+        doc = searchable_doc_for_library_block(self.library_block)
+        doc.update(searchable_doc_tags(self.library_block.usage_key))
+        doc.update(searchable_doc_collections(self.library_block.usage_key))
+
+        assert doc == {
+            "id": "lbedx2012_fallhtmltext2-4bb47d67",
+            "type": "library_block",
+            "block_type": "html",
+            "usage_key": "lb:edX:2012_Fall:html:text2",
+            "block_id": "text2",
+            "context_key": "lib:edX:2012_Fall",
+            "org": "edX",
+            "access_id": self.library_access_id,
+            "display_name": "Text 2",
+            "description": "This is a Test",
+            "breadcrumbs": [
+                {
+                    "display_name": "some content_library",
+                },
+            ],
+            "last_published": None,
+            "created": 1680674828.0,
+            "modified": 1680674828.0,
+            "content": {
+                "html_content": "This is a Test",
+            },
+            "collections": {
+                "key": ["TOY_COLLECTION"],
+                "display_name": ["Toy Collection"],
+            },
+            "tags": {
+                "taxonomy": ["Difficulty"],
+                "level0": ["Difficulty > Normal"],
+            },
+            "published": {"display_name": "Text"},
+        }
+
+        # Publish new changes
+        library_api.publish_changes(self.library.key)
+        doc = searchable_doc_for_library_block(self.library_block)
+        doc.update(searchable_doc_tags(self.library_block.usage_key))
+        doc.update(searchable_doc_collections(self.library_block.usage_key))
+
+        assert doc == {
+            "id": "lbedx2012_fallhtmltext2-4bb47d67",
+            "type": "library_block",
+            "block_type": "html",
+            "usage_key": "lb:edX:2012_Fall:html:text2",
+            "block_id": "text2",
+            "context_key": "lib:edX:2012_Fall",
+            "org": "edX",
+            "access_id": self.library_access_id,
+            "display_name": "Text 2",
+            "description": "This is a Test",
+            "breadcrumbs": [
+                {
+                    "display_name": "some content_library",
+                },
+            ],
+            "last_published": None,
+            "created": 1680674828.0,
+            "modified": 1680674828.0,
+            "content": {
+                "html_content": "This is a Test",
+            },
+            "collections": {
+                "key": ["TOY_COLLECTION"],
+                "display_name": ["Toy Collection"],
+            },
+            "tags": {
+                "taxonomy": ["Difficulty"],
+                "level0": ["Difficulty > Normal"],
+            },
+            "published": {
+                "display_name": "Text 2",
+                "description": "This is a Test",
+            },
+        }
+
+    def test_collection_with_library(self):
+        doc = searchable_doc_for_collection(self.library.key, self.collection.key)
+        doc.update(searchable_doc_tags_for_collection(self.library.key, self.collection.key))
+
         assert doc == {
-            "id": collection.id,
+            "id": "lib-collectionedx2012_falltoy_collection-d1d907a4",
+            "block_id": self.collection.key,
+            "usage_key": self.collection_usage_key,
             "type": "collection",
-            "display_name": collection.title,
-            "description": collection.description,
-            "context_key": learning_package.key,
-            "access_id": self.toy_course_access_id,
-            "breadcrumbs": [{"display_name": learning_package.title}],
-            "created": created_date.timestamp(),
-            "modified": created_date.timestamp(),
+            "org": "edX",
+            "display_name": "Toy Collection",
+            "description": "my toy collection description",
+            "num_children": 1,
+            "context_key": "lib:edX:2012_Fall",
+            "access_id": self.library_access_id,
+            "breadcrumbs": [{"display_name": "some content_library"}],
+            "created": 1680674828.0,
+            "modified": 1680674828.0,
+            'tags': {
+                'taxonomy': ['Difficulty'],
+                'level0': ['Difficulty > Normal']
+            },
+            "published": {
+                "num_children": 0
+            }
+        }
+
+    def test_collection_with_published_library(self):
+        library_api.publish_changes(self.library.key)
+
+        doc = searchable_doc_for_collection(self.library.key, self.collection.key)
+        doc.update(searchable_doc_tags_for_collection(self.library.key, self.collection.key))
+
+        assert doc == {
+            "id": "lib-collectionedx2012_falltoy_collection-d1d907a4",
+            "block_id": self.collection.key,
+            "usage_key": self.collection_usage_key,
+            "type": "collection",
+            "org": "edX",
+            "display_name": "Toy Collection",
+            "description": "my toy collection description",
+            "num_children": 1,
+            "context_key": "lib:edX:2012_Fall",
+            "access_id": self.library_access_id,
+            "breadcrumbs": [{"display_name": "some content_library"}],
+            "created": 1680674828.0,
+            "modified": 1680674828.0,
+            'tags': {
+                'taxonomy': ['Difficulty'],
+                'level0': ['Difficulty > Normal']
+            },
+            "published": {
+                "num_children": 1
+            }
         }
diff --git a/openedx/core/djangoapps/content/search/tests/test_handlers.py b/openedx/core/djangoapps/content/search/tests/test_handlers.py
index 8a6627e3902d..dc274d182696 100644
--- a/openedx/core/djangoapps/content/search/tests/test_handlers.py
+++ b/openedx/core/djangoapps/content/search/tests/test_handlers.py
@@ -148,7 +148,7 @@ def test_create_delete_library_block(self, meilisearch_client):
             "context_key": "lib:orgA:lib_a",
             "org": "orgA",
             "breadcrumbs": [{"display_name": "Library Org A"}],
-            "content": {"problem_types": [], "capa_content": " "},
+            "content": {"problem_types": [], "capa_content": ""},
             "access_id": lib_access.id,
             "last_published": None,
             "created": created_date.timestamp(),
@@ -176,6 +176,7 @@ def test_create_delete_library_block(self, meilisearch_client):
         with freeze_time(published_date):
             library_api.publish_changes(library.key)
         doc_problem["last_published"] = published_date.timestamp()
+        doc_problem["published"] = {"display_name": "Blank Problem"}
         meilisearch_client.return_value.index.return_value.update_documents.assert_called_with([doc_problem])
 
         # Delete the Library Block
@@ -184,3 +185,13 @@ def test_create_delete_library_block(self, meilisearch_client):
         meilisearch_client.return_value.index.return_value.delete_document.assert_called_with(
             "lborgalib_aproblemproblem1-ca3186e9"
         )
+
+        # Restore the Library Block
+        library_api.restore_library_block(problem.usage_key)
+        meilisearch_client.return_value.index.return_value.update_documents.assert_any_call([doc_problem])
+        meilisearch_client.return_value.index.return_value.update_documents.assert_any_call(
+            [{'id': doc_problem['id'], 'collections': {'display_name': [], 'key': []}}]
+        )
+        meilisearch_client.return_value.index.return_value.update_documents.assert_any_call(
+            [{'id': doc_problem['id'], 'tags': {}}]
+        )
diff --git a/openedx/core/djangoapps/content_libraries/api.py b/openedx/core/djangoapps/content_libraries/api.py
index 17bea80b3a96..c51c707fc470 100644
--- a/openedx/core/djangoapps/content_libraries/api.py
+++ b/openedx/core/djangoapps/content_libraries/api.py
@@ -56,6 +56,8 @@
 import base64
 import hashlib
 import logging
+import mimetypes
+
 
 import attr
 import requests
@@ -68,15 +70,21 @@
 from django.db.models import Q, QuerySet
 from django.utils.translation import gettext as _
 from edx_rest_api_client.client import OAuthAPIClient
+from django.urls import reverse
 from lxml import etree
-from opaque_keys.edx.keys import UsageKey, UsageKeyV2
+from opaque_keys.edx.keys import BlockTypeKey, UsageKey, UsageKeyV2
 from opaque_keys.edx.locator import (
     LibraryLocatorV2,
     LibraryUsageLocatorV2,
-    LibraryLocator as LibraryLocatorV1
+    LibraryLocator as LibraryLocatorV1,
+    LibraryCollectionLocator,
+)
+from openedx_events.content_authoring.data import (
+    ContentLibraryData,
+    LibraryBlockData,
+    LibraryCollectionData,
+    ContentObjectChangedData,
 )
-from opaque_keys import InvalidKeyError
-from openedx_events.content_authoring.data import ContentLibraryData, LibraryBlockData
 from openedx_events.content_authoring.signals import (
     CONTENT_LIBRARY_CREATED,
     CONTENT_LIBRARY_DELETED,
@@ -84,22 +92,32 @@
     LIBRARY_BLOCK_CREATED,
     LIBRARY_BLOCK_DELETED,
     LIBRARY_BLOCK_UPDATED,
+    LIBRARY_COLLECTION_UPDATED,
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
 )
 from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import Component, MediaType
+from openedx_learning.api.authoring_models import (
+    Collection,
+    Component,
+    ComponentVersion,
+    MediaType,
+    LearningPackage,
+    PublishableEntity,
+)
 from organizations.models import Organization
 from xblock.core import XBlock
 from xblock.exceptions import XBlockNotFoundError
 
-from openedx.core.djangoapps.xblock.api import get_component_from_usage_key, xblock_type_display_name
+from openedx.core.djangoapps.xblock.api import (
+    get_component_from_usage_key,
+    get_xblock_app_config,
+    xblock_type_display_name,
+)
 from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_learning_core
-from xmodule.library_root_xblock import LibraryRoot as LibraryRootV1
-from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.exceptions import ItemNotFoundError
 
 from . import permissions, tasks
-from .constants import ALL_RIGHTS_RESERVED, COMPLEX
+from .constants import ALL_RIGHTS_RESERVED
 from .models import ContentLibrary, ContentLibraryPermission, ContentLibraryBlockImportTask
 
 log = logging.getLogger(__name__)
@@ -111,6 +129,8 @@
 
 ContentLibraryNotFound = ContentLibrary.DoesNotExist
 
+ContentLibraryCollectionNotFound = Collection.DoesNotExist
+
 
 class ContentLibraryBlockNotFound(XBlockNotFoundError):
     """ XBlock not found in the content library """
@@ -120,6 +140,10 @@ class LibraryAlreadyExists(KeyError):
     """ A library with the specified slug already exists """
 
 
+class LibraryCollectionAlreadyExists(IntegrityError):
+    """ A Collection with that key already exists in the library """
+
+
 class LibraryBlockAlreadyExists(KeyError):
     """ An XBlock with that ID already exists in the library """
 
@@ -150,11 +174,11 @@ class ContentLibraryMetadata:
     Class that represents the metadata about a content library.
     """
     key = attr.ib(type=LibraryLocatorV2)
+    learning_package = attr.ib(type=LearningPackage)
     title = attr.ib("")
     description = attr.ib("")
     num_blocks = attr.ib(0)
     version = attr.ib(0)
-    type = attr.ib(default=COMPLEX)
     last_published = attr.ib(default=None, type=datetime)
     last_draft_created = attr.ib(default=None, type=datetime)
     last_draft_created_by = attr.ib(default=None, type=datetime)
@@ -193,6 +217,15 @@ class ContentLibraryPermissionEntry:
     access_level = attr.ib(AccessLevel.NO_ACCESS)
 
 
+@attr.s
+class CollectionMetadata:
+    """
+    Class to represent collection metadata in a content library.
+    """
+    key = attr.ib(type=str)
+    title = attr.ib(type=str)
+
+
 @attr.s
 class LibraryXBlockMetadata:
     """
@@ -201,29 +234,49 @@ class LibraryXBlockMetadata:
     usage_key = attr.ib(type=LibraryUsageLocatorV2)
     created = attr.ib(type=datetime)
     modified = attr.ib(type=datetime)
+    draft_version_num = attr.ib(type=int)
+    published_version_num = attr.ib(default=None, type=int)
     display_name = attr.ib("")
     last_published = attr.ib(default=None, type=datetime)
+    last_draft_created = attr.ib(default=None, type=datetime)
+    last_draft_created_by = attr.ib("")
+    published_by = attr.ib("")
     has_unpublished_changes = attr.ib(False)
-    tags_count = attr.ib(0)
+    created = attr.ib(default=None, type=datetime)
+    collections = attr.ib(type=list[CollectionMetadata], factory=list)
 
     @classmethod
-    def from_component(cls, library_key, component):
+    def from_component(cls, library_key, component, associated_collections=None):
         """
         Construct a LibraryXBlockMetadata from a Component object.
         """
         last_publish_log = component.versioning.last_publish_log
 
+        published_by = None
+        if last_publish_log and last_publish_log.published_by:
+            published_by = last_publish_log.published_by.username
+
+        draft = component.versioning.draft
+        published = component.versioning.published
+        last_draft_created = draft.created if draft else None
+        last_draft_created_by = draft.publishable_entity_version.created_by if draft else None
+
         return cls(
-            usage_key=LibraryUsageLocatorV2(
+            usage_key=library_component_usage_key(
                 library_key,
-                component.component_type.name,
-                component.local_key,
+                component,
             ),
-            display_name=component.versioning.draft.title,
+            display_name=draft.title,
             created=component.created,
-            modified=component.versioning.draft.created,
+            modified=draft.created,
+            draft_version_num=draft.version_num,
+            published_version_num=published.version_num if published else None,
             last_published=None if last_publish_log is None else last_publish_log.published_at,
-            has_unpublished_changes=component.versioning.has_unpublished_changes
+            published_by=published_by,
+            last_draft_created=last_draft_created,
+            last_draft_created_by=last_draft_created_by,
+            has_unpublished_changes=component.versioning.has_unpublished_changes,
+            collections=associated_collections or [],
         )
 
 
@@ -255,15 +308,20 @@ class LibraryXBlockType:
 # ============
 
 
-def get_libraries_for_user(user, org=None, library_type=None, text_search=None, order=None):
+def user_can_create_library(user: AbstractUser) -> bool:
+    """
+    Check if the user has permission to create a content library.
+    """
+    return user.has_perm(permissions.CAN_CREATE_CONTENT_LIBRARY)
+
+
+def get_libraries_for_user(user, org=None, text_search=None, order=None):
     """
     Return content libraries that the user has permission to view.
     """
     filter_kwargs = {}
     if org:
         filter_kwargs['org__short_name'] = org
-    if library_type:
-        filter_kwargs['type'] = library_type
     qs = ContentLibrary.objects.filter(**filter_kwargs) \
                                .select_related('learning_package', 'org') \
                                .order_by('org__short_name', 'slug')
@@ -310,7 +368,6 @@ def get_metadata(queryset, text_search=None):
         ContentLibraryMetadata(
             key=lib.library_key,
             title=lib.learning_package.title if lib.learning_package else "",
-            type=lib.type,
             description="",
             version=0,
             allow_public_learning=lib.allow_public_learning,
@@ -323,13 +380,14 @@ def get_metadata(queryset, text_search=None):
             has_unpublished_changes=False,
             has_unpublished_deletes=False,
             license=lib.license,
+            learning_package=lib.learning_package,
         )
         for lib in queryset
     ]
     return libraries
 
 
-def require_permission_for_library_key(library_key, user, permission):
+def require_permission_for_library_key(library_key, user, permission) -> ContentLibrary:
     """
     Given any of the content library permission strings defined in
     openedx.core.djangoapps.content_libraries.permissions,
@@ -339,10 +397,12 @@ def require_permission_for_library_key(library_key, user, permission):
     Raises django.core.exceptions.PermissionDenied if the user doesn't have
     permission.
     """
-    library_obj = ContentLibrary.objects.get_by_key(library_key)
+    library_obj = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
     if not user.has_perm(permission, obj=library_obj):
         raise PermissionDenied
 
+    return library_obj
+
 
 def get_library(library_key):
     """
@@ -381,8 +441,8 @@ def get_library(library_key):
     # updated version of content that a course could pull in. But more recently,
     # we've decided to do those version references at the level of the
     # individual blocks being used, since a Learning Core backed library is
-    # intended to be used for many LibraryContentBlocks and not 1:1 like v1
-    # libraries. The top level version stays for now because LibraryContentBlock
+    # intended to be referenced in multiple course locations and not 1:1 like v1
+    # libraries. The top level version stays for now because LegacyLibraryContentBlock
     # uses it, but that should hopefully change before the Redwood release.
     version = 0 if last_publish_log is None else last_publish_log.pk
     published_by = None
@@ -392,7 +452,6 @@ def get_library(library_key):
     return ContentLibraryMetadata(
         key=library_key,
         title=learning_package.title,
-        type=ref.type,
         description=ref.learning_package.description,
         num_blocks=num_blocks,
         version=version,
@@ -408,6 +467,7 @@ def get_library(library_key):
         license=ref.license,
         created=learning_package.created,
         updated=learning_package.updated,
+        learning_package=learning_package
     )
 
 
@@ -419,7 +479,6 @@ def create_library(
         allow_public_learning=False,
         allow_public_read=False,
         library_license=ALL_RIGHTS_RESERVED,
-        library_type=COMPLEX,
 ):
     """
     Create a new content library.
@@ -436,8 +495,6 @@ def create_library(
 
     allow_public_read: Allow anyone to view blocks (including source) in Studio?
 
-    library_type: Deprecated parameter, not really used. Set to COMPLEX.
-
     Returns a ContentLibraryMetadata instance.
     """
     assert isinstance(org, Organization)
@@ -447,7 +504,6 @@ def create_library(
             ref = ContentLibrary.objects.create(
                 org=org,
                 slug=slug,
-                type=library_type,
                 allow_public_learning=allow_public_learning,
                 allow_public_read=allow_public_read,
                 license=library_license,
@@ -471,7 +527,6 @@ def create_library(
     return ContentLibraryMetadata(
         key=ref.library_key,
         title=title,
-        type=library_type,
         description=description,
         num_blocks=0,
         version=0,
@@ -479,6 +534,7 @@ def create_library(
         allow_public_learning=ref.allow_public_learning,
         allow_public_read=ref.allow_public_read,
         license=library_license,
+        learning_package=ref.learning_package
     )
 
 
@@ -555,7 +611,6 @@ def update_library(
         description=None,
         allow_public_learning=None,
         allow_public_read=None,
-        library_type=None,
         library_license=None,
 ):
     """
@@ -565,7 +620,7 @@ def update_library(
     A value of None means "don't change".
     """
     lib_obj_fields = [
-        allow_public_learning, allow_public_read, library_type, library_license
+        allow_public_learning, allow_public_read, library_license
     ]
     lib_obj_changed = any(field is not None for field in lib_obj_fields)
     learning_pkg_changed = any(field is not None for field in [title, description])
@@ -584,10 +639,6 @@ def update_library(
                 content_lib.allow_public_learning = allow_public_learning
             if allow_public_read is not None:
                 content_lib.allow_public_read = allow_public_read
-            if library_type is not None:
-                # TODO: Get rid of this field entirely, and remove library_type
-                # from any functions that take it as an argument.
-                content_lib.library_type = library_type
             if library_license is not None:
                 content_lib.library_license = library_license
             content_lib.save()
@@ -642,7 +693,11 @@ def _get_library_component_tags_count(library_key) -> dict:
     return get_object_tag_counts(library_key_pattern, count_implicit=True)
 
 
-def get_library_components(library_key, text_search=None, block_types=None) -> QuerySet[Component]:
+def get_library_components(
+    library_key,
+    text_search=None,
+    block_types=None,
+) -> QuerySet[Component]:
     """
     Get the library components and filter.
 
@@ -658,10 +713,11 @@ def get_library_components(library_key, text_search=None, block_types=None) -> Q
         type_names=block_types,
         draft_title=text_search,
     )
+
     return components
 
 
-def get_library_block(usage_key) -> LibraryXBlockMetadata:
+def get_library_block(usage_key, include_collections=False) -> LibraryXBlockMetadata:
     """
     Get metadata about (the draft version of) one specific XBlock in a library.
 
@@ -684,29 +740,40 @@ def get_library_block(usage_key) -> LibraryXBlockMetadata:
     if not draft_version:
         raise ContentLibraryBlockNotFound(usage_key)
 
+    if include_collections:
+        associated_collections = authoring_api.get_entity_collections(
+            component.learning_package_id,
+            component.key,
+        ).values('key', 'title')
+    else:
+        associated_collections = None
     xblock_metadata = LibraryXBlockMetadata.from_component(
         library_key=usage_key.context_key,
         component=component,
+        associated_collections=associated_collections,
     )
     return xblock_metadata
 
 
-def set_library_block_olx(usage_key, new_olx_str):
+def set_library_block_olx(usage_key, new_olx_str) -> ComponentVersion:
     """
     Replace the OLX source of the given XBlock.
 
     This is only meant for use by developers or API client applications, as
     very little validation is done and this can easily result in a broken XBlock
     that won't load.
+
+    Returns the version number of the newly created ComponentVersion.
     """
     # because this old pylint can't understand attr.ib() objects, pylint: disable=no-member
     assert isinstance(usage_key, LibraryUsageLocatorV2)
 
-    # Make sure the block exists:
-    _block_metadata = get_library_block(usage_key)
+    # HTMLBlock uses CDATA to preserve HTML inside the XML, so make sure we
+    # don't strip that out.
+    parser = etree.XMLParser(strip_cdata=False)
 
     # Verify that the OLX parses, at least as generic XML, and the root tag is correct:
-    node = etree.fromstring(new_olx_str)
+    node = etree.fromstring(new_olx_str, parser=parser)
     if node.tag != usage_key.block_type:
         raise ValueError(
             f"Tried to set the OLX of a {usage_key.block_type} block to a <{node.tag}> node. "
@@ -725,6 +792,14 @@ def set_library_block_olx(usage_key, new_olx_str):
         xblock_type_display_name(usage_key.block_type),
     )
 
+    # Libraries don't use the url_name attribute, because they encode that into
+    # the Component key. Normally this is stripped out by the XBlockSerializer,
+    # but we're not actually creating the XBlock when it's coming from the
+    # clipboard right now.
+    if "url_name" in node.attrib:
+        del node.attrib["url_name"]
+        new_olx_str = etree.tostring(node, encoding='unicode')
+
     now = datetime.now(tz=timezone.utc)
 
     with transaction.atomic():
@@ -734,7 +809,7 @@ def set_library_block_olx(usage_key, new_olx_str):
             text=new_olx_str,
             created=now,
         )
-        authoring_api.create_next_version(
+        new_component_version = authoring_api.create_next_component_version(
             component.pk,
             title=new_title,
             content_to_replace={
@@ -750,6 +825,22 @@ def set_library_block_olx(usage_key, new_olx_str):
         )
     )
 
+    return new_component_version
+
+
+def library_component_usage_key(
+    library_key: LibraryLocatorV2,
+    component: Component,
+) -> LibraryUsageLocatorV2:
+    """
+    Returns a LibraryUsageLocatorV2 for the given library + component.
+    """
+    return LibraryUsageLocatorV2(  # type: ignore[abstract]
+        library_key,
+        block_type=component.component_type.name,
+        usage_id=component.local_key,
+    )
+
 
 def validate_can_add_block_to_library(
     library_key: LibraryLocatorV2,
@@ -765,13 +856,6 @@ def validate_can_add_block_to_library(
     """
     assert isinstance(library_key, LibraryLocatorV2)
     content_library = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
-    if content_library.type != COMPLEX:
-        if block_type != content_library.type:
-            raise IncompatibleTypesError(
-                _('Block type "{block_type}" is not compatible with library type "{library_type}".').format(
-                    block_type=block_type, library_type=content_library.type,
-                )
-            )
 
     # If adding a component would take us over our max, return an error.
     component_count = authoring_api.get_all_drafts(content_library.learning_package.id).count()
@@ -851,9 +935,9 @@ def import_staged_content_from_user_clipboard(library_key: LibraryLocatorV2, use
     if not user_clipboard:
         return None
 
-    olx_str = content_staging_api.get_staged_content_olx(user_clipboard.content.id)
-
-    # TODO: Handle importing over static assets
+    staged_content_id = user_clipboard.content.id
+    olx_str = content_staging_api.get_staged_content_olx(staged_content_id)
+    staged_content_files = content_staging_api.get_staged_content_static_files(staged_content_id)
 
     content_library, usage_key = validate_can_add_block_to_library(
         library_key,
@@ -861,9 +945,90 @@ def import_staged_content_from_user_clipboard(library_key: LibraryLocatorV2, use
         block_id
     )
 
+    # content_library.learning_package is technically a nullable field because
+    # it was added in a later migration, but we can't actually make a Library
+    # without one at the moment. TODO: fix this at the model level.
+    learning_package: LearningPackage = content_library.learning_package  # type: ignore
+
+    now = datetime.now(tz=timezone.utc)
+
     # Create component for block then populate it with clipboard data
-    _create_component_for_block(content_library, usage_key, user.id)
-    set_library_block_olx(usage_key, olx_str)
+    with transaction.atomic():
+        # First create the Component, but do not initialize it to anything (i.e.
+        # no ComponentVersion).
+        component_type = authoring_api.get_or_create_component_type(
+            "xblock.v1", usage_key.block_type
+        )
+        component = authoring_api.create_component(
+            learning_package.id,
+            component_type=component_type,
+            local_key=usage_key.block_id,
+            created=now,
+            created_by=user.id,
+        )
+
+        # This will create the first component version and set the OLX/title
+        # appropriately. It will not publish. Once we get the newly created
+        # ComponentVersion back from this, we can attach all our files to it.
+        component_version = set_library_block_olx(usage_key, olx_str)
+
+        for staged_content_file_data in staged_content_files:
+            # The ``data`` attribute is going to be None because the clipboard
+            # is optimized to not do redundant file copying when copying/pasting
+            # within the same course (where all the Files and Uploads are
+            # shared). Learning Core backed content Components will always store
+            # a Component-local "copy" of the data, and rely on lower-level
+            # deduplication to happen in the ``contents`` app.
+            filename = staged_content_file_data.filename
+
+            # Grab our byte data for the file...
+            file_data = content_staging_api.get_staged_content_static_file_data(
+                staged_content_id,
+                filename,
+            )
+            if not file_data:
+                log.error(
+                    f"Staged content {staged_content_id} included referenced "
+                    f"file {filename}, but no file data was found."
+                )
+                continue
+
+            # Courses don't support having assets that are local to a specific
+            # component, and instead store all their content together in a
+            # shared Files and Uploads namespace. If we're pasting that into a
+            # Learning Core backed data model (v2 Libraries), then we want to
+            # prepend "static/" to the filename. This will need to get updated
+            # when we start moving courses over to Learning Core, or if we start
+            # storing course component assets in sub-directories of Files and
+            # Uploads.
+            #
+            # The reason we don't just search for a "static/" prefix is that
+            # Learning Core components can store other kinds of files if they
+            # wish (though none currently do).
+            source_assumes_global_assets = not isinstance(
+                user_clipboard.source_context_key, LibraryLocatorV2
+            )
+            if source_assumes_global_assets:
+                filename = f"static/{filename}"
+
+            # Now construct the Learning Core data models for it...
+            # TODO: more of this logic should be pushed down to openedx-learning
+            media_type_str, _encoding = mimetypes.guess_type(filename)
+            if not media_type_str:
+                media_type_str = "application/octet-stream"
+
+            media_type = authoring_api.get_or_create_media_type(media_type_str)
+            content = authoring_api.get_or_create_file_content(
+                learning_package.id,
+                media_type.id,
+                data=file_data,
+                created=now,
+            )
+            authoring_api.create_component_version_content(
+                component_version.pk,
+                content.id,
+                key=filename,
+            )
 
     # Emit library block created event
     LIBRARY_BLOCK_CREATED.send_event(
@@ -891,7 +1056,7 @@ def get_or_create_olx_media_type(block_type: str) -> MediaType:
 
 def _create_component_for_block(content_lib, usage_key, user_id=None):
     """
-    Create a Component for an XBlock type, and initialize it.
+    Create a Component for an XBlock type, initialize it, and return the ComponentVersion.
 
     This will create a Component, along with its first ComponentVersion. The tag
     in the OLX will have no attributes, e.g. `<problem />`. This first version
@@ -932,24 +1097,81 @@ def _create_component_for_block(content_lib, usage_key, user_id=None):
             component_version.pk,
             content.id,
             key="block.xml",
-            learner_downloadable=False
         )
 
+        return component_version
+
 
 def delete_library_block(usage_key, remove_from_parent=True):
     """
     Delete the specified block from this library (soft delete).
     """
     component = get_component_from_usage_key(usage_key)
+    library_key = usage_key.context_key
+    affected_collections = authoring_api.get_entity_collections(component.learning_package_id, component.key)
+
     authoring_api.soft_delete_draft(component.pk)
 
     LIBRARY_BLOCK_DELETED.send_event(
         library_block=LibraryBlockData(
-            library_key=usage_key.context_key,
+            library_key=library_key,
+            usage_key=usage_key
+        )
+    )
+
+    # For each collection, trigger LIBRARY_COLLECTION_UPDATED signal and set background=True to trigger
+    # collection indexing asynchronously.
+    #
+    # To delete the component on collections
+    for collection in affected_collections:
+        LIBRARY_COLLECTION_UPDATED.send_event(
+            library_collection=LibraryCollectionData(
+                library_key=library_key,
+                collection_key=collection.key,
+                background=True,
+            )
+        )
+
+
+def restore_library_block(usage_key):
+    """
+    Restore the specified library block.
+    """
+    component = get_component_from_usage_key(usage_key)
+    library_key = usage_key.context_key
+    affected_collections = authoring_api.get_entity_collections(component.learning_package_id, component.key)
+
+    # Set draft version back to the latest available component version id.
+    authoring_api.set_draft_version(component.pk, component.versioning.latest.pk)
+
+    LIBRARY_BLOCK_CREATED.send_event(
+        library_block=LibraryBlockData(
+            library_key=library_key,
             usage_key=usage_key
         )
     )
 
+    # Add tags and collections back to index
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED.send_event(
+        content_object=ContentObjectChangedData(
+            object_id=str(usage_key),
+            changes=["collections", "tags"],
+        ),
+    )
+
+    # For each collection, trigger LIBRARY_COLLECTION_UPDATED signal and set background=True to trigger
+    # collection indexing asynchronously.
+    #
+    # To restore the component in the collections
+    for collection in affected_collections:
+        LIBRARY_COLLECTION_UPDATED.send_event(
+            library_collection=LibraryCollectionData(
+                library_key=library_key,
+                collection_key=collection.key,
+                background=True,
+            )
+        )
+
 
 def get_library_block_static_asset_files(usage_key) -> list[LibraryXBlockStaticFile]:
     """
@@ -958,18 +1180,48 @@ def get_library_block_static_asset_files(usage_key) -> list[LibraryXBlockStaticF
 
     Returns a list of LibraryXBlockStaticFile objects, sorted by path.
 
-    TODO: This is not yet implemented for Learning Core backed libraries.
     TODO: Should this be in the general XBlock API rather than the libraries API?
     """
-    return []
+    component = get_component_from_usage_key(usage_key)
+    component_version = component.versioning.draft
+
+    # If there is no Draft version, then this was soft-deleted
+    if component_version is None:
+        return []
+
+    # cvc = the ComponentVersionContent through table
+    cvc_set = (
+        component_version
+        .componentversioncontent_set
+        .filter(content__has_file=True)
+        .order_by('key')
+        .select_related('content')
+    )
 
+    site_root_url = get_xblock_app_config().get_site_root_url()
 
-def add_library_block_static_asset_file(usage_key, file_name, file_content) -> LibraryXBlockStaticFile:
+    return [
+        LibraryXBlockStaticFile(
+            path=cvc.key,
+            size=cvc.content.size,
+            url=site_root_url + reverse(
+                'content_libraries:library-assets',
+                kwargs={
+                    'component_version_uuid': component_version.uuid,
+                    'asset_path': cvc.key,
+                }
+            ),
+        )
+        for cvc in cvc_set
+    ]
+
+
+def add_library_block_static_asset_file(usage_key, file_path, file_content, user=None) -> LibraryXBlockStaticFile:
     """
     Upload a static asset file into the library, to be associated with the
     specified XBlock. Will silently overwrite an existing file of the same name.
 
-    file_name should be a name like "doc.pdf". It may optionally contain slashes
+    file_path should be a name like "doc.pdf". It may optionally contain slashes
         like 'en/doc.pdf'
     file_content should be a binary string.
 
@@ -981,10 +1233,52 @@ def add_library_block_static_asset_file(usage_key, file_name, file_content) -> L
         video_block = UsageKey.from_string("lb:VideoTeam:python-intro:video:1")
         add_library_block_static_asset_file(video_block, "subtitles-en.srt", subtitles.encode('utf-8'))
     """
-    raise NotImplementedError("Static assets not yet implemented for Learning Core")
+    # File path validations copied over from v1 library logic. This can't really
+    # hurt us inside our system because we never use these paths in an actual
+    # file system–they're just string keys that point to hash-named data files
+    # in a common library (learning package) level directory. But it might
+    # become a security issue during import/export serialization.
+    if file_path != file_path.strip().strip('/'):
+        raise InvalidNameError("file_path cannot start/end with / or whitespace.")
+    if '//' in file_path or '..' in file_path:
+        raise InvalidNameError("Invalid sequence (// or ..) in file_path.")
 
+    component = get_component_from_usage_key(usage_key)
 
-def delete_library_block_static_asset_file(usage_key, file_name):
+    with transaction.atomic():
+        component_version = authoring_api.create_next_component_version(
+            component.pk,
+            content_to_replace={file_path: file_content},
+            created=datetime.now(tz=timezone.utc),
+            created_by=user.id if user else None,
+        )
+        transaction.on_commit(
+            lambda: LIBRARY_BLOCK_UPDATED.send_event(
+                library_block=LibraryBlockData(
+                    library_key=usage_key.context_key,
+                    usage_key=usage_key,
+                )
+            )
+        )
+
+    # Now figure out the URL for the newly created asset...
+    site_root_url = get_xblock_app_config().get_site_root_url()
+    local_path = reverse(
+        'content_libraries:library-assets',
+        kwargs={
+            'component_version_uuid': component_version.uuid,
+            'asset_path': file_path,
+        }
+    )
+
+    return LibraryXBlockStaticFile(
+        path=file_path,
+        url=site_root_url + local_path,
+        size=len(file_content),
+    )
+
+
+def delete_library_block_static_asset_file(usage_key, file_path, user=None):
     """
     Delete a static asset file from the library.
 
@@ -994,7 +1288,24 @@ def delete_library_block_static_asset_file(usage_key, file_name):
         video_block = UsageKey.from_string("lb:VideoTeam:python-intro:video:1")
         delete_library_block_static_asset_file(video_block, "subtitles-en.srt")
     """
-    raise NotImplementedError("Static assets not yet implemented for Learning Core")
+    component = get_component_from_usage_key(usage_key)
+    now = datetime.now(tz=timezone.utc)
+
+    with transaction.atomic():
+        component_version = authoring_api.create_next_component_version(
+            component.pk,
+            content_to_replace={file_path: None},
+            created=now,
+            created_by=user.id if user else None,
+        )
+        transaction.on_commit(
+            lambda: LIBRARY_BLOCK_UPDATED.send_event(
+                library_block=LibraryBlockData(
+                    library_key=usage_key.context_key,
+                    usage_key=usage_key,
+                )
+            )
+        )
 
 
 def get_allowed_block_types(library_key):  # pylint: disable=unused-argument
@@ -1009,10 +1320,7 @@ def get_allowed_block_types(library_key):  # pylint: disable=unused-argument
     # TODO: return support status and template options
     # See cms/djangoapps/contentstore/views/component.py
     block_types = sorted(name for name, class_ in XBlock.load_classes())
-    lib = get_library(library_key)
-    if lib.type != COMPLEX:
-        # Problem and Video libraries only permit XBlocks of the same name.
-        block_types = (name for name in block_types if name == lib.type)
+
     info = []
     for block_type in block_types:
         # TODO: unify the contentstore helper with the xblock.api version of
@@ -1040,6 +1348,31 @@ def publish_changes(library_key, user_id=None):
     )
 
 
+def publish_component_changes(usage_key: LibraryUsageLocatorV2, user):
+    """
+    Publish all pending changes in a single component.
+    """
+    content_library = require_permission_for_library_key(
+        usage_key.lib_key,
+        user,
+        permissions.CAN_EDIT_THIS_CONTENT_LIBRARY
+    )
+    learning_package = content_library.learning_package
+
+    assert learning_package
+    component = get_component_from_usage_key(usage_key)
+    drafts_to_publish = authoring_api.get_all_drafts(learning_package.id).filter(
+        entity__key=component.key
+    )
+    authoring_api.publish_from_drafts(learning_package.id, draft_qset=drafts_to_publish, published_by=user.id)
+    LIBRARY_BLOCK_UPDATED.send_event(
+        library_block=LibraryBlockData(
+            library_key=usage_key.lib_key,
+            usage_key=usage_key,
+        )
+    )
+
+
 def revert_changes(library_key):
     """
     Revert all pending changes to the specified library, restoring it to the
@@ -1055,76 +1388,258 @@ def revert_changes(library_key):
         )
     )
 
+    # For each collection, trigger LIBRARY_COLLECTION_UPDATED signal and set background=True to trigger
+    # collection indexing asynchronously.
+    #
+    # This is to update component counts in all library collections,
+    # because there may be components that have been discarded in the revert.
+    for collection in authoring_api.get_collections(learning_package.id):
+        LIBRARY_COLLECTION_UPDATED.send_event(
+            library_collection=LibraryCollectionData(
+                library_key=library_key,
+                collection_key=collection.key,
+                background=True,
+            )
+        )
+
+    # Reindex components that are in collections
+    #
+    # Use case: When a component that was within a collection has been deleted
+    # and the changes are reverted, the component should appear in the
+    # collection again.
+    components_in_collections = authoring_api.get_components(
+        learning_package.id, draft=True, namespace='xblock.v1',
+    ).filter(publishable_entity__collections__isnull=False)
+
+    for component in components_in_collections:
+        usage_key = library_component_usage_key(library_key, component)
+
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.send_event(
+            content_object=ContentObjectChangedData(
+                object_id=str(usage_key),
+                changes=["collections"],
+            ),
+        )
+
+
+def create_library_collection(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+    title: str,
+    *,
+    description: str = "",
+    created_by: int | None = None,
+    # As an optimization, callers may pass in a pre-fetched ContentLibrary instance
+    content_library: ContentLibrary | None = None,
+) -> Collection:
+    """
+    Creates a Collection in the given ContentLibrary.
+
+    If you've already fetched a ContentLibrary for the given library_key, pass it in here to avoid refetching.
+    """
+    if not content_library:
+        content_library = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
+    assert content_library
+    assert content_library.learning_package_id
+    assert content_library.library_key == library_key
+
+    try:
+        collection = authoring_api.create_collection(
+            learning_package_id=content_library.learning_package_id,
+            key=collection_key,
+            title=title,
+            description=description,
+            created_by=created_by,
+        )
+    except IntegrityError as err:
+        raise LibraryCollectionAlreadyExists from err
+
+    return collection
+
+
+def update_library_collection(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+    *,
+    title: str | None = None,
+    description: str | None = None,
+    # As an optimization, callers may pass in a pre-fetched ContentLibrary instance
+    content_library: ContentLibrary | None = None,
+) -> Collection:
+    """
+    Updates a Collection in the given ContentLibrary.
+    """
+    if not content_library:
+        content_library = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
+    assert content_library
+    assert content_library.learning_package_id
+    assert content_library.library_key == library_key
+
+    try:
+        collection = authoring_api.update_collection(
+            learning_package_id=content_library.learning_package_id,
+            key=collection_key,
+            title=title,
+            description=description,
+        )
+    except Collection.DoesNotExist as exc:
+        raise ContentLibraryCollectionNotFound from exc
 
-# V1/V2 Compatibility Helpers
-# (Should be removed as part of
-#  https://github.com/openedx/edx-platform/issues/32457)
-# ======================================================
+    return collection
 
-def get_v1_or_v2_library(
-    library_id: str | LibraryLocatorV1 | LibraryLocatorV2,
-    version: str | int | None,
-) -> LibraryRootV1 | ContentLibraryMetadata | None:
+
+def update_library_collection_components(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+    *,
+    usage_keys: list[UsageKeyV2],
+    created_by: int | None = None,
+    remove=False,
+    # As an optimization, callers may pass in a pre-fetched ContentLibrary instance
+    content_library: ContentLibrary | None = None,
+) -> Collection:
     """
-    Fetch either a V1 or V2 content library from a V1/V2 key (or key string) and version.
+    Associates the Collection with Components for the given UsageKeys.
 
-    V1 library versions are Mongo ObjectID strings.
-    V2 library versions can be positive ints, or strings of positive ints.
-    Passing version=None will return the latest version the library.
+    By default the Components are added to the Collection.
+    If remove=True, the Components are removed from the Collection.
 
-    Returns None if not found.
-    If key is invalid, raises InvalidKeyError.
-    For V1, if key has a version, it is ignored in favor of `version`.
-    For V2, if version is provided but it isn't an int or parseable to one, we raise a ValueError.
+    If you've already fetched the ContentLibrary, pass it in to avoid refetching.
 
-    Examples:
-    * get_v1_or_v2_library("library-v1:ProblemX+PR0B", None)       -> <LibraryRootV1>
-    * get_v1_or_v2_library("library-v1:ProblemX+PR0B", "65ff...")  -> <LibraryRootV1>
-    * get_v1_or_v2_library("lib:RG:rg-1", None)                    -> <ContentLibraryMetadata>
-    * get_v1_or_v2_library("lib:RG:rg-1", "36")                    -> <ContentLibraryMetadata>
-    * get_v1_or_v2_library("lib:RG:rg-1", "xyz")                   -> <ValueError>
-    * get_v1_or_v2_library("notakey", "xyz")                       -> <InvalidKeyError>
+    Raises:
+    * ContentLibraryCollectionNotFound if no Collection with the given pk is found in the given library.
+    * ContentLibraryBlockNotFound if any of the given usage_keys don't match Components in the given library.
 
-    If you just want to get a V2 library, use `get_library` instead.
+    Returns the updated Collection.
     """
-    library_key: LibraryLocatorV1 | LibraryLocatorV2
-    if isinstance(library_id, str):
+    if not content_library:
+        content_library = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
+    assert content_library
+    assert content_library.learning_package_id
+    assert content_library.library_key == library_key
+
+    # Fetch the Component.key values for the provided UsageKeys.
+    component_keys = []
+    for usage_key in usage_keys:
+        # Parse the block_family from the key to use as namespace.
+        block_type = BlockTypeKey.from_string(str(usage_key))
+
         try:
-            library_key = LibraryLocatorV1.from_string(library_id)
-        except InvalidKeyError:
-            library_key = LibraryLocatorV2.from_string(library_id)
+            component = authoring_api.get_component_by_key(
+                content_library.learning_package_id,
+                namespace=block_type.block_family,
+                type_name=usage_key.block_type,
+                local_key=usage_key.block_id,
+            )
+        except Component.DoesNotExist as exc:
+            raise ContentLibraryBlockNotFound(usage_key) from exc
+
+        component_keys.append(component.key)
+
+    # Note: Component.key matches its PublishableEntity.key
+    entities_qset = PublishableEntity.objects.filter(
+        key__in=component_keys,
+    )
+
+    if remove:
+        collection = authoring_api.remove_from_collection(
+            content_library.learning_package_id,
+            collection_key,
+            entities_qset,
+        )
     else:
-        library_key = library_id
-    if isinstance(library_key, LibraryLocatorV2):
-        v2_version: int | None
-        if version:
-            v2_version = int(version)
-        else:
-            v2_version = None
-        try:
-            library = get_library(library_key)
-            if v2_version is not None and library.version != v2_version:
-                raise NotImplementedError(
-                    f"Tried to load version {v2_version} of learning_core-based library {library_key}. "
-                    f"Currently, only the latest version ({library.version}) may be loaded. "
-                    "This is a known issue. "
-                    "It will be fixed before the production release of learning_core-based (V2) content libraries. "
-                )
-            return library
-        except ContentLibrary.DoesNotExist:
-            return None
-    elif isinstance(library_key, LibraryLocatorV1):
-        v1_version: str | None
-        if version:
-            v1_version = str(version)
-        else:
-            v1_version = None
-        store = modulestore()
-        library_key = library_key.for_branch(ModuleStoreEnum.BranchName.library).for_version(v1_version)
-        try:
-            return store.get_library(library_key, remove_version=False, remove_branch=False, head_validation=False)
-        except ItemNotFoundError:
-            return None
+        collection = authoring_api.add_to_collection(
+            content_library.learning_package_id,
+            collection_key,
+            entities_qset,
+            created_by=created_by,
+        )
+
+    return collection
+
+
+def set_library_component_collections(
+    library_key: LibraryLocatorV2,
+    component: Component,
+    *,
+    collection_keys: list[str],
+    created_by: int | None = None,
+    # As an optimization, callers may pass in a pre-fetched ContentLibrary instance
+    content_library: ContentLibrary | None = None,
+) -> Component:
+    """
+    It Associates the component with collections for the given collection keys.
+
+    Only collections in queryset are associated with component, all previous component-collections
+    associations are removed.
+
+    If you've already fetched the ContentLibrary, pass it in to avoid refetching.
+
+    Raises:
+    * ContentLibraryCollectionNotFound if any of the given collection_keys don't match Collections in the given library.
+
+    Returns the updated Component.
+    """
+    if not content_library:
+        content_library = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
+    assert content_library
+    assert content_library.learning_package_id
+    assert content_library.library_key == library_key
+
+    # Note: Component.key matches its PublishableEntity.key
+    collection_qs = authoring_api.get_collections(content_library.learning_package_id).filter(
+        key__in=collection_keys
+    )
+
+    affected_collections = authoring_api.set_collections(
+        content_library.learning_package_id,
+        component,
+        collection_qs,
+        created_by=created_by,
+    )
+
+    # For each collection, trigger LIBRARY_COLLECTION_UPDATED signal and set background=True to trigger
+    # collection indexing asynchronously.
+    for collection in affected_collections:
+        LIBRARY_COLLECTION_UPDATED.send_event(
+            library_collection=LibraryCollectionData(
+                library_key=library_key,
+                collection_key=collection.key,
+                background=True,
+            )
+        )
+
+    return component
+
+
+def get_library_collection_usage_key(
+    library_key: LibraryLocatorV2,
+    collection_key: str,
+) -> LibraryCollectionLocator:
+    """
+    Returns the LibraryCollectionLocator associated to a collection
+    """
+
+    return LibraryCollectionLocator(library_key, collection_key)
+
+
+def get_library_collection_from_usage_key(
+    collection_usage_key: LibraryCollectionLocator,
+) -> Collection:
+    """
+    Return a Collection using the LibraryCollectionLocator
+    """
+
+    library_key = collection_usage_key.library_key
+    collection_key = collection_usage_key.collection_id
+    content_library = ContentLibrary.objects.get_by_key(library_key)  # type: ignore[attr-defined]
+    try:
+        return authoring_api.get_collection(
+            content_library.learning_package_id,
+            collection_key,
+        )
+    except Collection.DoesNotExist as exc:
+        raise ContentLibraryCollectionNotFound from exc
 
 
 # Import from Courseware
diff --git a/openedx/core/djangoapps/content_libraries/constants.py b/openedx/core/djangoapps/content_libraries/constants.py
index 9505d52d1cca..a01e0fbdda91 100644
--- a/openedx/core/djangoapps/content_libraries/constants.py
+++ b/openedx/core/djangoapps/content_libraries/constants.py
@@ -2,16 +2,6 @@
 from django.utils.translation import gettext_lazy as _
 
 
-VIDEO = 'video'
-COMPLEX = 'complex'
-PROBLEM = 'problem'
-
-LIBRARY_TYPES = (
-    (VIDEO, _('Video')),
-    (COMPLEX, _('Complex')),
-    (PROBLEM, _('Problem')),
-)
-
 # These are all the licenses we support so far.
 ALL_RIGHTS_RESERVED = ''
 CC_4_BY = 'CC:4.0:BY'
diff --git a/openedx/core/djangoapps/content_libraries/library_context.py b/openedx/core/djangoapps/content_libraries/library_context.py
index 6ff426e73560..4bda10eb12fa 100644
--- a/openedx/core/djangoapps/content_libraries/library_context.py
+++ b/openedx/core/djangoapps/content_libraries/library_context.py
@@ -1,19 +1,21 @@
 """
 Definition of "Library" as a learning context.
 """
-
 import logging
 
 from django.core.exceptions import PermissionDenied
+from rest_framework.exceptions import NotFound
 
 from openedx_events.content_authoring.data import LibraryBlockData
 from openedx_events.content_authoring.signals import LIBRARY_BLOCK_UPDATED
+from opaque_keys.edx.keys import UsageKeyV2
+from opaque_keys.edx.locator import LibraryUsageLocatorV2, LibraryLocatorV2
+from openedx_learning.api import authoring as authoring_api
 
 from openedx.core.djangoapps.content_libraries import api, permissions
 from openedx.core.djangoapps.content_libraries.models import ContentLibrary
 from openedx.core.djangoapps.xblock.api import LearningContext
-
-from openedx_learning.api import authoring as authoring_api
+from openedx.core.types import User as UserType
 
 log = logging.getLogger(__name__)
 
@@ -30,47 +32,51 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.use_draft = kwargs.get('use_draft', None)
 
-    def can_edit_block(self, user, usage_key):
+    def can_edit_block(self, user: UserType, usage_key: UsageKeyV2) -> bool:
         """
-        Does the specified usage key exist in its context, and if so, does the
-        specified user have permission to edit it (make changes to the authored
-        data store)?
-
-        user: a Django User object (may be an AnonymousUser)
+        Assuming a block with the specified ID (usage_key) exists, does the
+        specified user have permission to edit it (make changes to the
+        fields / authored data store)?
 
-        usage_key: the UsageKeyV2 subclass used for this learning context
+        May raise ContentLibraryNotFound if the library does not exist.
+        """
+        assert isinstance(usage_key, LibraryUsageLocatorV2)
+        return self._check_perm(user, usage_key.lib_key, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY)
 
-        Must return a boolean.
+    def can_view_block_for_editing(self, user: UserType, usage_key: UsageKeyV2) -> bool:
         """
-        try:
-            api.require_permission_for_library_key(usage_key.lib_key, user, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY)
-        except (PermissionDenied, api.ContentLibraryNotFound):
-            return False
+        Assuming a block with the specified ID (usage_key) exists, does the
+        specified user have permission to view its fields and OLX details (but
+        not necessarily to make changes to it)?
 
-        return self.block_exists(usage_key)
+        May raise ContentLibraryNotFound if the library does not exist.
+        """
+        assert isinstance(usage_key, LibraryUsageLocatorV2)
+        return self._check_perm(user, usage_key.lib_key, permissions.CAN_VIEW_THIS_CONTENT_LIBRARY)
 
-    def can_view_block(self, user, usage_key):
+    def can_view_block(self, user: UserType, usage_key: UsageKeyV2) -> bool:
         """
         Does the specified usage key exist in its context, and if so, does the
         specified user have permission to view it and interact with it (call
         handlers, save user state, etc.)?
 
-        user: a Django User object (may be an AnonymousUser)
-
-        usage_key: the UsageKeyV2 subclass used for this learning context
-
-        Must return a boolean.
+        May raise ContentLibraryNotFound if the library does not exist.
         """
+        assert isinstance(usage_key, LibraryUsageLocatorV2)
+        return self._check_perm(user, usage_key.lib_key, permissions.CAN_LEARN_FROM_THIS_CONTENT_LIBRARY)
+
+    def _check_perm(self, user: UserType, lib_key: LibraryLocatorV2, perm) -> bool:
+        """ Helper method to check a permission for the various can_ methods"""
         try:
-            api.require_permission_for_library_key(
-                usage_key.lib_key, user, permissions.CAN_LEARN_FROM_THIS_CONTENT_LIBRARY,
-            )
-        except (PermissionDenied, api.ContentLibraryNotFound):
+            api.require_permission_for_library_key(lib_key, user, perm)
+            return True
+        except PermissionDenied:
             return False
+        except api.ContentLibraryNotFound as exc:
+            # A 404 is probably what you want in this case, not a 500 error, so do that by default.
+            raise NotFound(f"Content Library '{lib_key}' does not exist") from exc
 
-        return self.block_exists(usage_key)
-
-    def block_exists(self, usage_key):
+    def block_exists(self, usage_key: LibraryUsageLocatorV2):
         """
         Does the block for this usage_key exist in this Library?
 
@@ -82,7 +88,7 @@ def block_exists(self, usage_key):
         version of it.
         """
         try:
-            content_lib = ContentLibrary.objects.get_by_key(usage_key.context_key)
+            content_lib = ContentLibrary.objects.get_by_key(usage_key.context_key)  # type: ignore[attr-defined]
         except ContentLibrary.DoesNotExist:
             return False
 
@@ -97,12 +103,11 @@ def block_exists(self, usage_key):
             local_key=usage_key.block_id,
         )
 
-    def send_block_updated_event(self, usage_key):
+    def send_block_updated_event(self, usage_key: UsageKeyV2):
         """
         Send a "block updated" event for the library block with the given usage_key.
-
-        usage_key: the UsageKeyV2 subclass used for this learning context
         """
+        assert isinstance(usage_key, LibraryUsageLocatorV2)
         LIBRARY_BLOCK_UPDATED.send_event(
             library_block=LibraryBlockData(
                 library_key=usage_key.lib_key,
diff --git a/openedx/core/djangoapps/content_libraries/migrations/0011_remove_contentlibrary_bundle_uuid_and_more.py b/openedx/core/djangoapps/content_libraries/migrations/0011_remove_contentlibrary_bundle_uuid_and_more.py
new file mode 100644
index 000000000000..0c634c648870
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/migrations/0011_remove_contentlibrary_bundle_uuid_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.16 on 2024-10-24 20:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('content_libraries', '0010_contentlibrary_learning_package_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contentlibrary',
+            name='bundle_uuid',
+        ),
+        migrations.RemoveField(
+            model_name='contentlibrary',
+            name='type',
+        ),
+    ]
diff --git a/openedx/core/djangoapps/content_libraries/models.py b/openedx/core/djangoapps/content_libraries/models.py
index c1dea39e0613..61e28b944851 100644
--- a/openedx/core/djangoapps/content_libraries/models.py
+++ b/openedx/core/djangoapps/content_libraries/models.py
@@ -54,8 +54,7 @@
 
 from opaque_keys.edx.django.models import UsageKeyField
 from openedx.core.djangoapps.content_libraries.constants import (
-    LIBRARY_TYPES, COMPLEX, LICENSE_OPTIONS,
-    ALL_RIGHTS_RESERVED,
+    LICENSE_OPTIONS, ALL_RIGHTS_RESERVED,
 )
 from openedx_learning.api.authoring_models import LearningPackage
 from organizations.models import Organization  # lint-amnesty, pylint: disable=wrong-import-order
@@ -90,6 +89,8 @@ class ContentLibrary(models.Model):
     re-imported on another Open edX instance should be kept in Learning Core. This
     model in Studio should only be used to track settings specific to this Open
     edX instance, like who has permission to edit this content library.
+
+    .. no_pii:
     """
     objects: ContentLibraryManager[ContentLibrary] = ContentLibraryManager()
 
@@ -101,18 +102,6 @@ class ContentLibrary(models.Model):
     org = models.ForeignKey(Organization, on_delete=models.PROTECT, null=False)
     slug = models.SlugField(allow_unicode=True)
 
-    # We no longer use the ``bundle_uuid`` and ``type`` fields, but we'll leave
-    # them in the model until after the Redwood release, just in case someone
-    # out there was using v2 libraries. We don't expect this, since it wasn't in
-    # a usable state, but there's always a chance someone managed to do it and
-    # is still using it. By keeping the schema backwards compatible, the thought
-    # is that they would update to the latest version, notice their libraries
-    # aren't working correctly, and still have the ability to recover their data
-    # if the code was rolled back.
-    # TODO: Remove these fields after the Redwood release is cut.
-    bundle_uuid = models.UUIDField(unique=True, null=True, default=None)
-    type = models.CharField(max_length=25, default=COMPLEX, choices=LIBRARY_TYPES)
-
     license = models.CharField(max_length=25, default=ALL_RIGHTS_RESERVED, choices=LICENSE_OPTIONS)
     learning_package = models.OneToOneField(
         LearningPackage,
@@ -196,6 +185,8 @@ def __str__(self):
 class ContentLibraryPermission(models.Model):
     """
     Row recording permissions for a content library
+
+    .. no_pii:
     """
     library = models.ForeignKey(ContentLibrary, on_delete=models.CASCADE, related_name="permission_grants")
     # One of the following must be set (but not both):
@@ -239,6 +230,8 @@ def __str__(self):
 class ContentLibraryBlockImportTask(models.Model):
     """
     Model of a task to import blocks from an external source (e.g. modulestore).
+
+    .. no_pii:
     """
 
     library = models.ForeignKey(
@@ -344,6 +337,8 @@ class LtiProfile(models.Model):
     Unless Anonymous, this should be a unique representation of the LTI subject
     (as per the client token ``sub`` identify claim) that initiated an LTI
     launch through Content Libraries.
+
+    .. no_pii:
     """
 
     objects = LtiProfileManager()
@@ -466,6 +461,8 @@ class LtiGradedResource(models.Model):
     launch.  This model links the profile that launched the resource with the
     resource itself, allowing identifcation of the link through its usage key
     string and user id.
+
+    .. no_pii:
     """
 
     objects = LtiGradedResourceManager()
diff --git a/openedx/core/djangoapps/content_libraries/permissions.py b/openedx/core/djangoapps/content_libraries/permissions.py
index c7da012c9fb4..4e72381986ed 100644
--- a/openedx/core/djangoapps/content_libraries/permissions.py
+++ b/openedx/core/djangoapps/content_libraries/permissions.py
@@ -2,7 +2,8 @@
 Permissions for Content Libraries (v2, Learning-Core-based)
 """
 from bridgekeeper import perms, rules
-from bridgekeeper.rules import Attribute, ManyRelation, Relation, in_current_groups
+from bridgekeeper.rules import Attribute, ManyRelation, Relation, blanket_rule, in_current_groups
+from django.conf import settings
 
 from openedx.core.djangoapps.content_libraries.models import ContentLibraryPermission
 
@@ -41,6 +42,18 @@
 )
 
 
+# Are we in Studio? (Is there a better or more contextual way to define this, e.g. get from learning context?)
+@blanket_rule
+def is_studio_request(_):
+    return settings.SERVICE_VARIANT == "cms"
+
+
+@blanket_rule
+def is_course_creator(user):
+    from cms.djangoapps.course_creators.views import get_course_creator_status
+
+    return get_course_creator_status(user) == 'granted'
+
 ########################### Permissions ###########################
 
 # Is the user allowed to view XBlocks from the specified content library
@@ -51,15 +64,20 @@
 perms[CAN_LEARN_FROM_THIS_CONTENT_LIBRARY] = (
     # Global staff can learn from any library:
     is_global_staff |
-    # Regular users can learn if the library allows public learning:
+    # Regular and even anonymous users can learn if the library allows public learning:
     Attribute('allow_public_learning', True) |
     # Users/groups who are explicitly granted permission can learn from the library:
-    (is_user_active & has_explicit_read_permission_for_library)
+    (is_user_active & has_explicit_read_permission_for_library) |
+    # Or, in Studio (but not the LMS) any users can access libraries with "public read" permissions:
+    (is_studio_request & is_user_active & Attribute('allow_public_read', True))
 )
 
 # Is the user allowed to create content libraries?
 CAN_CREATE_CONTENT_LIBRARY = 'content_libraries.create_library'
-perms[CAN_CREATE_CONTENT_LIBRARY] = is_user_active
+if settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
+    perms[CAN_CREATE_CONTENT_LIBRARY] = is_global_staff | (is_user_active & is_course_creator)
+else:
+    perms[CAN_CREATE_CONTENT_LIBRARY] = is_global_staff
 
 # Is the user allowed to view the specified content library in Studio,
 # including to view the raw OLX and asset files?
@@ -67,8 +85,8 @@
 perms[CAN_VIEW_THIS_CONTENT_LIBRARY] = is_user_active & (
     # Global staff can access any library
     is_global_staff |
-    # Some libraries allow anyone to view them in Studio:
-    Attribute('allow_public_read', True) |
+    # Libraries with "public read" permissions can be accessed only by course creators
+    (Attribute('allow_public_read', True) & is_course_creator) |
     # Otherwise the user must be part of the library's team
     has_explicit_read_permission_for_library
 )
diff --git a/openedx/core/djangoapps/content_libraries/serializers.py b/openedx/core/djangoapps/content_libraries/serializers.py
index 497eda81475b..c2a26220d4c7 100644
--- a/openedx/core/djangoapps/content_libraries/serializers.py
+++ b/openedx/core/djangoapps/content_libraries/serializers.py
@@ -4,10 +4,13 @@
 # pylint: disable=abstract-method
 from django.core.validators import validate_unicode_slug
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
 
+from opaque_keys.edx.keys import UsageKeyV2
+from opaque_keys import InvalidKeyError
+
+from openedx_learning.api.authoring_models import Collection
 from openedx.core.djangoapps.content_libraries.constants import (
-    LIBRARY_TYPES,
-    COMPLEX,
     ALL_RIGHTS_RESERVED,
     LICENSE_OPTIONS,
 )
@@ -32,10 +35,8 @@ class ContentLibraryMetadataSerializer(serializers.Serializer):
     # begins with 'lib:'. (The numeric ID of the ContentLibrary object in MySQL
     # is not exposed via this API.)
     id = serializers.CharField(source="key", read_only=True)
-    type = serializers.ChoiceField(choices=LIBRARY_TYPES, default=COMPLEX)
     org = serializers.SlugField(source="key.org")
     slug = serializers.CharField(source="key.slug", validators=(validate_unicode_slug, ))
-    bundle_uuid = serializers.UUIDField(format='hex_verbose', read_only=True)
     title = serializers.CharField()
     description = serializers.CharField(allow_blank=True)
     num_blocks = serializers.IntegerField(read_only=True)
@@ -81,7 +82,6 @@ class ContentLibraryUpdateSerializer(serializers.Serializer):
     description = serializers.CharField()
     allow_public_learning = serializers.BooleanField()
     allow_public_read = serializers.BooleanField()
-    type = serializers.ChoiceField(choices=LIBRARY_TYPES)
     license = serializers.ChoiceField(choices=LICENSE_OPTIONS)
 
 
@@ -113,7 +113,7 @@ class ContentLibraryPermissionSerializer(ContentLibraryPermissionLevelSerializer
     group_name = serializers.CharField(source="group.name", allow_null=True, allow_blank=False, default=None)
 
 
-class BaseFilterSerializer(serializers.Serializer):
+class ContentLibraryFilterSerializer(serializers.Serializer):
     """
     Base serializer for filtering listings on the content library APIs.
     """
@@ -122,11 +122,12 @@ class BaseFilterSerializer(serializers.Serializer):
     order = serializers.CharField(default=None, required=False)
 
 
-class ContentLibraryFilterSerializer(BaseFilterSerializer):
+class CollectionMetadataSerializer(serializers.Serializer):
     """
-    Serializer for filtering library listings.
+    Serializer for CollectionMetadata
     """
-    type = serializers.ChoiceField(choices=LIBRARY_TYPES, default=None, required=False)
+    key = serializers.CharField()
+    title = serializers.CharField()
 
 
 class LibraryXBlockMetadataSerializer(serializers.Serializer):
@@ -143,13 +144,21 @@ class LibraryXBlockMetadataSerializer(serializers.Serializer):
 
     block_type = serializers.CharField(source="usage_key.block_type")
     display_name = serializers.CharField(read_only=True)
+    last_published = serializers.DateTimeField(format=DATETIME_FORMAT, read_only=True)
+    published_by = serializers.CharField(read_only=True)
+    last_draft_created = serializers.DateTimeField(format=DATETIME_FORMAT, read_only=True)
+    last_draft_created_by = serializers.CharField(read_only=True)
     has_unpublished_changes = serializers.BooleanField(read_only=True)
+    created = serializers.DateTimeField(format=DATETIME_FORMAT, read_only=True)
+    modified = serializers.DateTimeField(format=DATETIME_FORMAT, read_only=True)
 
     # When creating a new XBlock in a library, the slug becomes the ID part of
     # the definition key and usage key:
     slug = serializers.CharField(write_only=True)
     tags_count = serializers.IntegerField(read_only=True)
 
+    collections = CollectionMetadataSerializer(many=True, required=False)
+
 
 class LibraryXBlockTypeSerializer(serializers.Serializer):
     """
@@ -196,6 +205,7 @@ class LibraryXBlockOlxSerializer(serializers.Serializer):
     Serializer for representing an XBlock's OLX
     """
     olx = serializers.CharField()
+    version_num = serializers.IntegerField(read_only=True, required=False)
 
 
 class LibraryXBlockStaticFileSerializer(serializers.Serializer):
@@ -245,3 +255,60 @@ class ContentLibraryBlockImportTaskCreateSerializer(serializers.Serializer):
     """
 
     course_key = CourseKeyField()
+
+
+class ContentLibraryCollectionSerializer(serializers.ModelSerializer):
+    """
+    Serializer for a Content Library Collection
+    """
+
+    class Meta:
+        model = Collection
+        fields = '__all__'
+
+
+class ContentLibraryCollectionUpdateSerializer(serializers.Serializer):
+    """
+    Serializer for updating a Collection in a Content Library
+    """
+
+    title = serializers.CharField()
+    description = serializers.CharField(allow_blank=True)
+
+
+class UsageKeyV2Serializer(serializers.BaseSerializer):
+    """
+    Serializes a UsageKeyV2.
+    """
+    def to_representation(self, value: UsageKeyV2) -> str:
+        """
+        Returns the UsageKeyV2 value as a string.
+        """
+        return str(value)
+
+    def to_internal_value(self, value: str) -> UsageKeyV2:
+        """
+        Returns a UsageKeyV2 from the string value.
+
+        Raises ValidationError if invalid UsageKeyV2.
+        """
+        try:
+            return UsageKeyV2.from_string(value)
+        except InvalidKeyError as err:
+            raise ValidationError from err
+
+
+class ContentLibraryCollectionComponentsUpdateSerializer(serializers.Serializer):
+    """
+    Serializer for adding/removing Components to/from a Collection.
+    """
+
+    usage_keys = serializers.ListField(child=UsageKeyV2Serializer(), allow_empty=False)
+
+
+class ContentLibraryComponentCollectionsUpdateSerializer(serializers.Serializer):
+    """
+    Serializer for adding/removing Collections to/from a Component.
+    """
+
+    collection_keys = serializers.ListField(child=serializers.CharField(), allow_empty=True)
diff --git a/openedx/core/djangoapps/content_libraries/signal_handlers.py b/openedx/core/djangoapps/content_libraries/signal_handlers.py
index 768b49d55f22..58f45d218e95 100644
--- a/openedx/core/djangoapps/content_libraries/signal_handlers.py
+++ b/openedx/core/djangoapps/content_libraries/signal_handlers.py
@@ -5,13 +5,28 @@
 import logging
 
 from django.conf import settings
+from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.dispatch import receiver
 
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
+from openedx_events.content_authoring.data import (
+    ContentObjectChangedData,
+    LibraryCollectionData,
+)
+from openedx_events.content_authoring.signals import (
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+    LIBRARY_COLLECTION_CREATED,
+    LIBRARY_COLLECTION_DELETED,
+    LIBRARY_COLLECTION_UPDATED,
+)
+from openedx_learning.api.authoring import get_component, get_components
+from openedx_learning.api.authoring_models import Collection, CollectionPublishableEntity, Component, PublishableEntity
+
 from lms.djangoapps.grades.api import signals as grades_signals
-from opaque_keys import InvalidKeyError  # lint-amnesty, pylint: disable=wrong-import-order
-from opaque_keys.edx.locator import LibraryUsageLocatorV2  # lint-amnesty, pylint: disable=wrong-import-order
 
-from .models import LtiGradedResource
+from .api import library_component_usage_key
+from .models import ContentLibrary, LtiGradedResource
 
 
 log = logging.getLogger(__name__)
@@ -55,3 +70,136 @@ def score_changed_handler(sender, **kwargs):  # pylint: disable=unused-argument
         resource.update_score(weighted_earned, weighted_possible, modified)
         log.info("LTI 1.3: Score Signal: Grade upgraded: resource; %s",
                  resource)
+
+
+@receiver(post_save, sender=Collection, dispatch_uid="library_collection_saved")
+def library_collection_saved(sender, instance, created, **kwargs):
+    """
+    Raises LIBRARY_COLLECTION_CREATED if the Collection is new,
+    or LIBRARY_COLLECTION_UPDATED if updated an existing Collection.
+    """
+    try:
+        library = ContentLibrary.objects.get(learning_package_id=instance.learning_package_id)
+    except ContentLibrary.DoesNotExist:
+        log.error("{instance} is not associated with a content library.")
+        return
+
+    if created:
+        LIBRARY_COLLECTION_CREATED.send_event(
+            library_collection=LibraryCollectionData(
+                library_key=library.library_key,
+                collection_key=instance.key,
+            )
+        )
+    else:
+        LIBRARY_COLLECTION_UPDATED.send_event(
+            library_collection=LibraryCollectionData(
+                library_key=library.library_key,
+                collection_key=instance.key,
+            )
+        )
+
+
+@receiver(post_delete, sender=Collection, dispatch_uid="library_collection_deleted")
+def library_collection_deleted(sender, instance, **kwargs):
+    """
+    Raises LIBRARY_COLLECTION_DELETED for the deleted Collection.
+    """
+    try:
+        library = ContentLibrary.objects.get(learning_package_id=instance.learning_package_id)
+    except ContentLibrary.DoesNotExist:
+        log.error("{instance} is not associated with a content library.")
+        return
+
+    LIBRARY_COLLECTION_DELETED.send_event(
+        library_collection=LibraryCollectionData(
+            library_key=library.library_key,
+            collection_key=instance.key,
+        )
+    )
+
+
+def _library_collection_component_changed(
+    component: Component,
+    library_key: LibraryLocatorV2 | None = None,
+) -> None:
+    """
+    Sends a CONTENT_OBJECT_ASSOCIATIONS_CHANGED event for the component.
+    """
+    if not library_key:
+        try:
+            library = ContentLibrary.objects.get(
+                learning_package_id=component.learning_package_id,
+            )
+        except ContentLibrary.DoesNotExist:
+            log.error("{component} is not associated with a content library.")
+            return
+
+        library_key = library.library_key
+
+    assert library_key
+
+    usage_key = library_component_usage_key(
+        library_key,
+        component,
+    )
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED.send_event(
+        content_object=ContentObjectChangedData(
+            object_id=str(usage_key),
+            changes=["collections"],
+        ),
+    )
+
+
+@receiver(post_save, sender=CollectionPublishableEntity, dispatch_uid="library_collection_entity_saved")
+def library_collection_entity_saved(sender, instance, created, **kwargs):
+    """
+    Sends a CONTENT_OBJECT_ASSOCIATIONS_CHANGED event for components added to a collection.
+    """
+    if created:
+        # Component.pk matches its entity.pk
+        component = get_component(instance.entity_id)
+        _library_collection_component_changed(component)
+
+
+@receiver(post_delete, sender=CollectionPublishableEntity, dispatch_uid="library_collection_entity_deleted")
+def library_collection_entity_deleted(sender, instance, **kwargs):
+    """
+    Sends a CONTENT_OBJECT_ASSOCIATIONS_CHANGED event for components removed from a collection.
+    """
+    # Only trigger component updates if CollectionPublishableEntity was cascade deleted due to deletion of a collection.
+    if isinstance(kwargs.get('origin'), Collection):
+        # Component.pk matches its entity.pk
+        component = get_component(instance.entity_id)
+        _library_collection_component_changed(component)
+
+
+@receiver(m2m_changed, sender=CollectionPublishableEntity, dispatch_uid="library_collection_entities_changed")
+def library_collection_entities_changed(sender, instance, action, pk_set, **kwargs):
+    """
+    Sends a CONTENT_OBJECT_ASSOCIATIONS_CHANGED event for components added/removed/cleared from a collection.
+    """
+    if action not in ["post_add", "post_remove", "post_clear"]:
+        return
+
+    try:
+        library = ContentLibrary.objects.get(
+            learning_package_id=instance.learning_package_id,
+        )
+    except ContentLibrary.DoesNotExist:
+        log.error("{instance} is not associated with a content library.")
+        return
+
+    if isinstance(instance, PublishableEntity):
+        _library_collection_component_changed(instance.component, library.library_key)
+        return
+
+    # When action=="post_clear", pk_set==None
+    # Since the collection instance now has an empty entities set,
+    # we don't know which ones were removed, so we need to update associations for all library components.
+    components = get_components(instance.learning_package_id)
+    if pk_set:
+        components = components.filter(pk__in=pk_set)
+
+    for component in components.all():
+        _library_collection_component_changed(component, library.library_key)
diff --git a/openedx/core/djangoapps/content_libraries/tasks.py b/openedx/core/djangoapps/content_libraries/tasks.py
index 9f4f7aaaf7dc..f56b4adfe313 100644
--- a/openedx/core/djangoapps/content_libraries/tasks.py
+++ b/openedx/core/djangoapps/content_libraries/tasks.py
@@ -21,33 +21,20 @@
 from celery import shared_task
 from celery_utils.logged_task import LoggedTask
 from celery.utils.log import get_task_logger
-from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
-from django.core.exceptions import PermissionDenied
 from edx_django_utils.monitoring import set_code_owner_attribute, set_code_owner_attribute_from_module
-from opaque_keys.edx.keys import UsageKey
-from opaque_keys.edx.locator import (
-    BlockUsageLocator,
-    LibraryLocatorV2,
-    LibraryUsageLocatorV2,
-    LibraryLocator as LibraryLocatorV1
-)
 
 from user_tasks.tasks import UserTask, UserTaskStatus
 from xblock.fields import Scope
 
-from common.djangoapps.student.auth import has_studio_write_access
 from opaque_keys.edx.keys import CourseKey
-from openedx.core.djangoapps.content_libraries import api as library_api
-from openedx.core.djangoapps.xblock.api import load_block
+from opaque_keys.edx.locator import BlockUsageLocator
 from openedx.core.lib import ensure_cms
 from xmodule.capa_block import ProblemBlock
-from xmodule.library_content_block import ANY_CAPA_TYPE_VALUE, LibraryContentBlock
-from xmodule.library_root_xblock import LibraryRoot as LibraryRootV1
+from xmodule.library_content_block import ANY_CAPA_TYPE_VALUE, LegacyLibraryContentBlock
+from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.mixed import MixedModuleStore
-from xmodule.modulestore.split_mongo import BlockKey
-from xmodule.util.keys import derive_key
 
 from . import api
 from .models import ContentLibraryBlockImportTask
@@ -84,77 +71,6 @@ def on_progress(block_key, block_num, block_count, exception=None):
         )
 
 
-def _import_block(store, user_id, source_block, dest_parent_key):
-    """
-    Recursively import a learning core block and its children.`
-    """
-    def generate_block_key(source_key, dest_parent_key):
-        """
-        Deterministically generate an ID for the new block and return the key.
-        Keys are generated such that they appear identical to a v1 library with
-        the same input block_id, library name, library organization, and parent block using derive_key
-        """
-        if not isinstance(source_key.lib_key, LibraryLocatorV2):
-            raise TypeError(f"Expected source library key of type LibraryLocatorV2, got {source_key.lib_key} instead.")
-        source_key_as_v1_course_key = LibraryLocatorV1(
-            org=source_key.lib_key.org,
-            library=source_key.lib_key.slug,
-            branch='library'
-        )
-        derived_block_key = derive_key(
-            source=source_key_as_v1_course_key.make_usage_key(source_key.block_type, source_key.block_id),
-            dest_parent=BlockKey(dest_parent_key.block_type, dest_parent_key.block_id),
-        )
-        return dest_parent_key.context_key.make_usage_key(*derived_block_key)
-
-    source_key = source_block.scope_ids.usage_id
-    new_block_key = generate_block_key(source_key, dest_parent_key)
-    try:
-        new_block = store.get_item(new_block_key)
-        if new_block.parent.block_id != dest_parent_key.block_id:
-            raise ValueError(
-                "Expected existing block {} to be a child of {} but instead it's a child of {}".format(
-                    new_block_key, dest_parent_key, new_block.parent,
-                )
-            )
-    except ItemNotFoundError:
-        new_block = store.create_child(
-            user_id,
-            dest_parent_key,
-            source_key.block_type,
-            block_id=new_block_key.block_id,
-        )
-
-    # Prepare a list of this block's static assets; any assets that are referenced as /static/{path} (the
-    # recommended way for referencing them) will stop working, and so we rewrite the url when importing.
-    # Copying assets not advised because modulestore doesn't namespace assets to each block like learning core, which
-    # might cause conflicts when the same filename is used across imported blocks.
-    if isinstance(source_key, LibraryUsageLocatorV2):
-        all_assets = library_api.get_library_block_static_asset_files(source_key)
-    else:
-        all_assets = []
-
-    for field_name, field in source_block.fields.items():
-        if field.scope not in (Scope.settings, Scope.content):
-            continue  # Only copy authored field data
-        if field.is_set_on(source_block) or field.is_set_on(new_block):
-            field_value = getattr(source_block, field_name)
-            setattr(new_block, field_name, field_value)
-    new_block.save()
-    store.update_item(new_block, user_id)
-
-    if new_block.has_children:
-        # Delete existing children in the new block, which can be reimported again if they still exist in the
-        # source library
-        for existing_child_key in new_block.children:
-            store.delete_item(existing_child_key, user_id)
-        # Now import the children
-        for child in source_block.get_children():
-            _import_block(store, user_id, child, new_block_key)
-
-    return new_block_key
-
-
 def _filter_child(store, usage_key, capa_type):
     """
     Return whether this block is both a problem and has a `capa_type` which is included in the filter.
@@ -172,49 +88,6 @@ def _problem_type_filter(store, library, capa_type):
     return [key for key in library.children if _filter_child(store, key, capa_type)]
 
 
-def _import_from_learning_core(user_id, store, dest_block, source_block_ids):
-    """
-    Imports a block from a learning-core-based learning context (usually a
-    content library) into modulestore, as a new child of dest_block.
-    Any existing children of dest_block are replaced.
-    """
-    dest_key = dest_block.scope_ids.usage_id
-    if not isinstance(dest_key, BlockUsageLocator):
-        raise TypeError(f"Destination {dest_key} should be a modulestore course.")
-    if user_id is None:
-        raise ValueError("Cannot check user permissions - LibraryTools user_id is None")
-
-    if len(set(source_block_ids)) != len(source_block_ids):
-        # We don't support importing the exact same block twice because it would break the way we generate new IDs
-        # for each block and then overwrite existing copies of blocks when re-importing the same blocks.
-        raise ValueError("One or more library component IDs is a duplicate.")
-
-    dest_course_key = dest_key.context_key
-    user = User.objects.get(id=user_id)
-    if not has_studio_write_access(user, dest_course_key):
-        raise PermissionDenied()
-
-    # Read the source block; this will also confirm that user has permission to read it.
-    # (This could be slow and use lots of memory, except for the fact that LibraryContentBlock which calls this
-    # should be limiting the number of blocks to a reasonable limit. We load them all now instead of one at a
-    # time in order to raise any errors before we start actually copying blocks over.)
-    orig_blocks = [load_block(UsageKey.from_string(key), user) for key in source_block_ids]
-
-    with store.bulk_operations(dest_course_key):
-        child_ids_updated = set()
-
-        for block in orig_blocks:
-            new_block_id = _import_block(store, user_id, block, dest_key)
-            child_ids_updated.add(new_block_id)
-
-        # Remove any existing children that are no longer used
-        for old_child_id in set(dest_block.children) - child_ids_updated:
-            store.delete_item(old_child_id, user_id)
-        # If this was called from a handler, it will save dest_block at the end, so we must update
-        # dest_block.children to avoid it saving the old value of children and deleting the new ones.
-        dest_block.children = store.get_item(dest_key).children
-
-
 class LibrarySyncChildrenTask(UserTask):  # pylint: disable=abstract-method
     """
     Base class for tasks which operate upon library_content children.
@@ -244,7 +117,7 @@ def sync_from_library(
     self: LibrarySyncChildrenTask,
     user_id: int,
     dest_block_id: str,
-    library_version: str | int | None,
+    library_version: str | None,
 ) -> None:
     """
     Celery task to update the children of the library_content block at `dest_block_id`.
@@ -300,8 +173,8 @@ def _sync_children(
     task: LibrarySyncChildrenTask,
     store: MixedModuleStore,
     user_id: int,
-    dest_block: LibraryContentBlock,
-    library_version: int | str | None,
+    dest_block: LegacyLibraryContentBlock,
+    library_version: str | None,
 ) -> None:
     """
     Implementation helper for `sync_from_library` and `duplicate_children` Celery tasks.
@@ -309,41 +182,29 @@ def _sync_children(
     Can update children with a specific library `library_version`, or latest (`library_version=None`).
     """
     source_blocks = []
-    library_key = dest_block.source_library_key
-    filter_children = (dest_block.capa_type != ANY_CAPA_TYPE_VALUE)
-    library = library_api.get_v1_or_v2_library(library_key, version=library_version)
-    if not library:
+    library_key = dest_block.source_library_key.for_branch(
+        ModuleStoreEnum.BranchName.library
+    ).for_version(library_version)
+    try:
+        library = store.get_library(library_key, remove_version=False, remove_branch=False, head_validation=False)
+    except ItemNotFoundError:
         task.status.fail(f"Requested library {library_key} not found.")
-    elif isinstance(library, LibraryRootV1):
-        if filter_children:
-            # Apply simple filtering based on CAPA problem types:
-            source_blocks.extend(_problem_type_filter(store, library, dest_block.capa_type))
-        else:
-            source_blocks.extend(library.children)
-        with store.bulk_operations(dest_block.scope_ids.usage_id.context_key):
-            try:
-                dest_block.source_library_version = str(library.location.library_key.version_guid)
-                store.update_item(dest_block, user_id)
-                dest_block.children = store.copy_from_template(
-                    source_blocks, dest_block.location, user_id, head_validation=True
-                )
-                # ^-- copy_from_template updates the children in the DB
-                # but we must also set .children here to avoid overwriting the DB again
-            except Exception as exception:  # pylint: disable=broad-except
-                TASK_LOGGER.exception('Error importing children for %s', dest_block.scope_ids.usage_id, exc_info=True)
-                if task.status.state != UserTaskStatus.FAILED:
-                    task.status.fail({'raw_error_msg': str(exception)})
-                raise
-    elif isinstance(library, library_api.ContentLibraryMetadata):
-        # TODO: add filtering by capa_type when V2 library will support different problem types
+        return
+    filter_children = (dest_block.capa_type != ANY_CAPA_TYPE_VALUE)
+    if filter_children:
+        # Apply simple filtering based on CAPA problem types:
+        source_blocks.extend(_problem_type_filter(store, library, dest_block.capa_type))
+    else:
+        source_blocks.extend(library.children)
+    with store.bulk_operations(dest_block.scope_ids.usage_id.context_key):
         try:
-            source_block_ids = [
-                str(library_api.LibraryXBlockMetadata.from_component(library_key, component).usage_key)
-                for component in library_api.get_library_components(library_key)
-            ]
-            _import_from_learning_core(user_id, store, dest_block, source_block_ids)
-            dest_block.source_library_version = str(library.version)
+            dest_block.source_library_version = str(library.location.library_key.version_guid)
             store.update_item(dest_block, user_id)
+            dest_block.children = store.copy_from_template(
+                source_blocks, dest_block.location, user_id, head_validation=True
+            )
+            # ^-- copy_from_template updates the children in the DB
+            # but we must also set .children here to avoid overwriting the DB again
         except Exception as exception:  # pylint: disable=broad-except
             TASK_LOGGER.exception('Error importing children for %s', dest_block.scope_ids.usage_id, exc_info=True)
             if task.status.state != UserTaskStatus.FAILED:
@@ -354,8 +215,8 @@ def _sync_children(
 def _copy_overrides(
     store: MixedModuleStore,
     user_id: int,
-    source_block: LibraryContentBlock,
-    dest_block: LibraryContentBlock
+    source_block: LegacyLibraryContentBlock,
+    dest_block: LegacyLibraryContentBlock
 ) -> None:
     """
     Copy any overrides the user has made on children of `source` over to the children of `dest_block`, recursively.
diff --git a/openedx/core/djangoapps/content_libraries/tests/base.py b/openedx/core/djangoapps/content_libraries/tests/base.py
index 987133255f58..77de1c028aa7 100644
--- a/openedx/core/djangoapps/content_libraries/tests/base.py
+++ b/openedx/core/djangoapps/content_libraries/tests/base.py
@@ -9,7 +9,7 @@
 from rest_framework.test import APITransactionTestCase, APIClient
 
 from common.djangoapps.student.tests.factories import UserFactory
-from openedx.core.djangoapps.content_libraries.constants import COMPLEX, ALL_RIGHTS_RESERVED
+from openedx.core.djangoapps.content_libraries.constants import ALL_RIGHTS_RESERVED
 from openedx.core.djangolib.testing.utils import skip_unless_cms
 
 # Define the URLs here - don't use reverse() because we want to detect
@@ -27,6 +27,7 @@
 URL_LIB_TEAM_GROUP = URL_LIB_TEAM + 'group/{group_name}/'  # Add/edit/remove a group's permission to use this library
 URL_LIB_PASTE_CLIPBOARD = URL_LIB_DETAIL + 'paste_clipboard/'  # Paste user clipboard (POST) containing Xblock data
 URL_LIB_BLOCK = URL_PREFIX + 'blocks/{block_key}/'  # Get data about a block, or delete it
+URL_LIB_BLOCK_PUBLISH = URL_LIB_BLOCK + 'publish/'  # Publish changes from a specified XBlock
 URL_LIB_BLOCK_OLX = URL_LIB_BLOCK + 'olx/'  # Get or set the OLX of the specified XBlock
 URL_LIB_BLOCK_ASSETS = URL_LIB_BLOCK + 'assets/'  # List the static asset files of the specified XBlock
 URL_LIB_BLOCK_ASSET_FILE = URL_LIB_BLOCK + 'assets/{file_name}'  # Get, delete, or upload a specific static asset file
@@ -36,6 +37,7 @@
 URL_LIB_LTI_LAUNCH = URL_LIB_LTI_PREFIX + 'launch/'
 
 URL_BLOCK_RENDER_VIEW = '/api/xblock/v2/xblocks/{block_key}/view/{view_name}/'
+URL_BLOCK_EMBED_VIEW = '/xblocks/v2/{block_key}/embed/{view_name}/'  # Returns HTML not JSON so its URL is different
 URL_BLOCK_GET_HANDLER_URL = '/api/xblock/v2/xblocks/{block_key}/handler_url/{handler_name}/'
 URL_BLOCK_METADATA_URL = '/api/xblock/v2/xblocks/{block_key}/'
 URL_BLOCK_FIELDS_URL = '/api/xblock/v2/xblocks/{block_key}/fields/'
@@ -69,7 +71,7 @@ class ContentLibrariesRestApiTest(APITransactionTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = UserFactory.create(username="Bob", email="bob@example.com", password="edx")
+        self.user = UserFactory.create(username="Bob", email="bob@example.com", password="edx", is_staff=True)
         # Create an organization
         self.organization, _ = Organization.objects.get_or_create(
             short_name="CL-TEST",
@@ -84,11 +86,10 @@ def assertDictContainsEntries(self, big_dict, subset_dict):
         """
         Assert that the first dict contains at least all of the same entries as
         the second dict.
-
-        Like python 2's assertDictContainsSubset, but with the arguments in the
-        correct order.
         """
-        assert big_dict.items() >= subset_dict.items()
+        for key, value in subset_dict.items():
+            assert key in big_dict, f"Missing key: {key}"
+            assert big_dict[key] == value, f"Value for key {key} does not match: expected {value}, got {big_dict[key]}"
 
     def assertOrderEqual(self, libraries_list, expected_order):
         """
@@ -122,7 +123,7 @@ def as_user(self, user):
         self.client = old_client  # pylint: disable=attribute-defined-outside-init
 
     def _create_library(
-        self, slug, title, description="", org=None, library_type=COMPLEX,
+        self, slug, title, description="", org=None,
         license_type=ALL_RIGHTS_RESERVED, expect_response=200,
     ):
         """ Create a library """
@@ -133,7 +134,6 @@ def _create_library(
             "slug": slug,
             "title": title,
             "description": description,
-            "type": library_type,
             "license": license_type,
         }, expect_response)
 
@@ -285,21 +285,45 @@ def _delete_library_block_asset(self, block_key, file_name, expect_response=204)
         url = URL_LIB_BLOCK_ASSET_FILE.format(block_key=block_key, file_name=file_name)
         return self._api('delete', url, None, expect_response)
 
+    def _publish_library_block(self, block_key, expect_response=200):
+        """ Publish changes from a specified XBlock """
+        return self._api('post', URL_LIB_BLOCK_PUBLISH.format(block_key=block_key), None, expect_response)
+
     def _paste_clipboard_content_in_library(self, lib_key, block_id, expect_response=200):
         """ Paste's the users clipboard content into Library """
         url = URL_LIB_PASTE_CLIPBOARD.format(lib_key=lib_key)
         data = {"block_id": block_id}
         return self._api('post', url, data, expect_response)
 
-    def _render_block_view(self, block_key, view_name, expect_response=200):
+    def _render_block_view(self, block_key, view_name, version=None, expect_response=200):
         """
         Render an XBlock's view in the active application's runtime.
         Note that this endpoint has different behavior in Studio (draft mode)
         vs. the LMS (published version only).
         """
+        if version is not None:
+            block_key += f"@{version}"
         url = URL_BLOCK_RENDER_VIEW.format(block_key=block_key, view_name=view_name)
         return self._api('get', url, None, expect_response)
 
+    def _embed_block(
+        self,
+        block_key,
+        *,
+        view_name="student_view",
+        version: str | int | None = None,
+        expect_response=200,
+    ) -> str:
+        """
+        Get an HTML response that displays the given XBlock. Returns HTML.
+        """
+        url = URL_BLOCK_EMBED_VIEW.format(block_key=block_key, view_name=view_name)
+        if version is not None:
+            url += f"?version={version}"
+        response = self.client.get(url)
+        assert response.status_code == expect_response, 'Unexpected response code {}:'.format(response.status_code)
+        return response.content.decode()
+
     def _get_block_handler_url(self, block_key, handler_name):
         """
         Get the URL to call a specific XBlock's handler.
@@ -308,3 +332,21 @@ def _get_block_handler_url(self, block_key, handler_name):
         """
         url = URL_BLOCK_GET_HANDLER_URL.format(block_key=block_key, handler_name=handler_name)
         return self._api('get', url, None, expect_response=200)["handler_url"]
+
+    def _get_basic_xblock_metadata(self, block_key, version=None, expect_response=200):
+        """ Get basic metadata about a specific block in the library. """
+        if version is not None:
+            block_key += f"@{version}"
+        result = self._api('get', URL_BLOCK_METADATA_URL.format(block_key=block_key), None, expect_response)
+        return result
+
+    def _get_library_block_fields(self, block_key, version=None, expect_response=200):
+        """ Get the fields of a specific block in the library. This API is only used by the MFE editors. """
+        if version is not None:
+            block_key += f"@{version}"
+        result = self._api('get', URL_BLOCK_FIELDS_URL.format(block_key=block_key), None, expect_response)
+        return result
+
+    def _set_library_block_fields(self, block_key, new_fields, expect_response=200):
+        """ Set the fields of a specific block in the library. This API is only used by the MFE editors. """
+        return self._api('post', URL_BLOCK_FIELDS_URL.format(block_key=block_key), new_fields, expect_response)
diff --git a/openedx/core/djangoapps/content_libraries/tests/fields_test_block.py b/openedx/core/djangoapps/content_libraries/tests/fields_test_block.py
new file mode 100644
index 000000000000..0db5ac28d7a8
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/tests/fields_test_block.py
@@ -0,0 +1,60 @@
+"""
+Block for testing variously scoped XBlock fields.
+"""
+import json
+
+from webob import Response
+from web_fragments.fragment import Fragment
+from xblock.core import XBlock, Scope
+from xblock import fields
+
+
+class FieldsTestBlock(XBlock):
+    """
+    Block for testing variously scoped XBlock fields and XBlock handlers.
+
+    This has only authored fields. See also UserStateTestBlock which has user fields.
+    """
+    BLOCK_TYPE = "fields-test"
+    has_score = False
+
+    display_name = fields.String(scope=Scope.settings, name='User State Test Block')
+    setting_field = fields.String(scope=Scope.settings, name='A setting')
+    content_field = fields.String(scope=Scope.content, name='A setting')
+
+    @XBlock.json_handler
+    def update_fields(self, data, suffix=None):  # pylint: disable=unused-argument
+        """
+        Update the authored fields of this block
+        """
+        self.display_name = data["display_name"]
+        self.setting_field = data["setting_field"]
+        self.content_field = data["content_field"]
+        return {}
+
+    @XBlock.handler
+    def get_fields(self, request, suffix=None):  # pylint: disable=unused-argument
+        """
+        Get the various fields of this XBlock.
+        """
+        return Response(
+            json.dumps({
+                "display_name": self.display_name,
+                "setting_field": self.setting_field,
+                "content_field": self.content_field,
+            }),
+            content_type='application/json',
+            charset='UTF-8',
+        )
+
+    def student_view(self, _context):
+        """
+        Return the student view.
+        """
+        fragment = Fragment()
+        fragment.add_content(f'<h1>{self.display_name}</h1>\n')
+        fragment.add_content(f'<p>SF: {self.setting_field}</p>\n')
+        fragment.add_content(f'<p>CF: {self.content_field}</p>\n')
+        handler_url = self.runtime.handler_url(self, 'get_fields')
+        fragment.add_content(f'<p>handler URL: {handler_url}</p>\n')
+        return fragment
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_api.py b/openedx/core/djangoapps/content_libraries/tests/test_api.py
index 87ae180d291e..203cc7a9397a 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_api.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_api.py
@@ -13,8 +13,22 @@
     UsageKey,
 )
 from opaque_keys.edx.locator import LibraryLocatorV2
+from openedx_events.content_authoring.data import (
+    ContentObjectChangedData,
+    LibraryCollectionData,
+)
+from openedx_events.content_authoring.signals import (
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+    LIBRARY_COLLECTION_CREATED,
+    LIBRARY_COLLECTION_DELETED,
+    LIBRARY_COLLECTION_UPDATED,
+)
+from openedx_events.tests.utils import OpenEdxEventsTestMixin
+from openedx_learning.api import authoring as authoring_api
 
 from .. import api
+from ..models import ContentLibrary
+from .base import ContentLibrariesRestApiTest
 
 
 class EdxModulestoreImportClientTest(TestCase):
@@ -241,3 +255,490 @@ def test_import_block_when_url_is_from_studio(
             block_olx
         )
         mock_publish_changes.assert_not_called()
+
+
+class ContentLibraryCollectionsTest(ContentLibrariesRestApiTest, OpenEdxEventsTestMixin):
+    """
+    Tests for Content Library API collections methods.
+
+    Same guidelines as ContentLibrariesTestCase.
+    """
+    ENABLED_OPENEDX_EVENTS = [
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.event_type,
+        LIBRARY_COLLECTION_CREATED.event_type,
+        LIBRARY_COLLECTION_DELETED.event_type,
+        LIBRARY_COLLECTION_UPDATED.event_type,
+    ]
+
+    @classmethod
+    def setUpClass(cls):
+        """
+        Set up class method for the Test class.
+
+        TODO: It's unclear why we need to call start_events_isolation ourselves rather than relying on
+              OpenEdxEventsTestMixin.setUpClass to handle it. It fails it we don't, and many other test cases do it,
+              so we're following a pattern here. But that pattern doesn't really make sense.
+        """
+        super().setUpClass()
+        cls.start_events_isolation()
+
+    def setUp(self):
+        super().setUp()
+
+        # Create Content Libraries
+        self._create_library("test-lib-col-1", "Test Library 1")
+        self._create_library("test-lib-col-2", "Test Library 2")
+
+        # Fetch the created ContentLibrare objects so we can access their learning_package.id
+        self.lib1 = ContentLibrary.objects.get(slug="test-lib-col-1")
+        self.lib2 = ContentLibrary.objects.get(slug="test-lib-col-2")
+
+        # Create Content Library Collections
+        self.col1 = api.create_library_collection(
+            self.lib1.library_key,
+            collection_key="COL1",
+            title="Collection 1",
+            description="Description for Collection 1",
+            created_by=self.user.id,
+        )
+        self.col2 = api.create_library_collection(
+            self.lib2.library_key,
+            collection_key="COL2",
+            title="Collection 2",
+            description="Description for Collection 2",
+            created_by=self.user.id,
+        )
+        self.col3 = api.create_library_collection(
+            self.lib2.library_key,
+            collection_key="COL3",
+            title="Collection 3",
+            description="Description for Collection 3",
+            created_by=self.user.id,
+        )
+
+        # Create some library blocks in lib1
+        self.lib1_problem_block = self._add_block_to_library(
+            self.lib1.library_key, "problem", "problem1",
+        )
+        self.lib1_html_block = self._add_block_to_library(
+            self.lib1.library_key, "html", "html1",
+        )
+        # Create some library blocks in lib2
+        self.lib2_problem_block = self._add_block_to_library(
+            self.lib2.library_key, "problem", "problem2",
+        )
+
+    def test_create_library_collection(self):
+        event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_CREATED.connect(event_receiver)
+
+        collection = api.create_library_collection(
+            self.lib2.library_key,
+            collection_key="COL4",
+            title="Collection 4",
+            description="Description for Collection 4",
+            created_by=self.user.id,
+        )
+        assert collection.key == "COL4"
+        assert collection.title == "Collection 4"
+        assert collection.description == "Description for Collection 4"
+        assert collection.created_by == self.user
+
+        assert event_receiver.call_count == 1
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_CREATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib2.library_key,
+                    collection_key="COL4",
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+
+    def test_create_library_collection_invalid_library(self):
+        library_key = LibraryLocatorV2.from_string("lib:INVALID:test-lib-does-not-exist")
+        with self.assertRaises(api.ContentLibraryNotFound) as exc:
+            api.create_library_collection(
+                library_key,
+                collection_key="COL4",
+                title="Collection 3",
+            )
+
+    def test_update_library_collection(self):
+        event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_UPDATED.connect(event_receiver)
+
+        self.col1 = api.update_library_collection(
+            self.lib1.library_key,
+            self.col1.key,
+            title="New title for Collection 1",
+        )
+        assert self.col1.key == "COL1"
+        assert self.col1.title == "New title for Collection 1"
+        assert self.col1.description == "Description for Collection 1"
+        assert self.col1.created_by == self.user
+
+        assert event_receiver.call_count == 1
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key="COL1",
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+
+    def test_update_library_collection_wrong_library(self):
+        with self.assertRaises(api.ContentLibraryCollectionNotFound) as exc:
+            api.update_library_collection(
+                self.lib1.library_key,
+                self.col2.key,
+            )
+
+    def test_delete_library_collection(self):
+        event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_DELETED.connect(event_receiver)
+
+        authoring_api.delete_collection(
+            self.lib1.learning_package_id,
+            self.col1.key,
+            hard_delete=True,
+        )
+
+        assert event_receiver.call_count == 1
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_DELETED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key="COL1",
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+
+    def test_update_library_collection_components(self):
+        assert not list(self.col1.entities.all())
+
+        self.col1 = api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_problem_block["id"]),
+                UsageKey.from_string(self.lib1_html_block["id"]),
+            ],
+        )
+        assert len(self.col1.entities.all()) == 2
+
+        self.col1 = api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_html_block["id"]),
+            ],
+            remove=True,
+        )
+        assert len(self.col1.entities.all()) == 1
+
+    def test_update_library_collection_components_event(self):
+        """
+        Check that a CONTENT_OBJECT_ASSOCIATIONS_CHANGED event is raised for each added/removed component.
+        """
+        event_receiver = mock.Mock()
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.connect(event_receiver)
+        LIBRARY_COLLECTION_UPDATED.connect(event_receiver)
+
+        api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_problem_block["id"]),
+                UsageKey.from_string(self.lib1_html_block["id"]),
+            ],
+        )
+
+        assert event_receiver.call_count == 3
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=self.lib1_problem_block["id"],
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=self.lib1_html_block["id"],
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[1].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key="COL1",
+                ),
+            },
+            event_receiver.call_args_list[2].kwargs,
+        )
+
+    def test_update_collection_components_from_wrong_library(self):
+        with self.assertRaises(api.ContentLibraryBlockNotFound) as exc:
+            api.update_library_collection_components(
+                self.lib2.library_key,
+                self.col2.key,
+                usage_keys=[
+                    UsageKey.from_string(self.lib1_problem_block["id"]),
+                    UsageKey.from_string(self.lib1_html_block["id"]),
+                ],
+            )
+            assert self.lib1_problem_block["id"] in str(exc.exception)
+
+    def test_set_library_component_collections(self):
+        event_receiver = mock.Mock()
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.connect(event_receiver)
+        collection_update_event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_UPDATED.connect(collection_update_event_receiver)
+        assert not list(self.col2.entities.all())
+        component = api.get_component_from_usage_key(UsageKey.from_string(self.lib2_problem_block["id"]))
+
+        api.set_library_component_collections(
+            self.lib2.library_key,
+            component,
+            collection_keys=[self.col2.key, self.col3.key],
+        )
+
+        assert len(authoring_api.get_collection(self.lib2.learning_package_id, self.col2.key).entities.all()) == 1
+        assert len(authoring_api.get_collection(self.lib2.learning_package_id, self.col3.key).entities.all()) == 1
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=self.lib2_problem_block["id"],
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib2.library_key,
+                    collection_key=self.col2.key,
+                    background=True,
+                ),
+            },
+            collection_update_event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib2.library_key,
+                    collection_key=self.col3.key,
+                    background=True,
+                ),
+            },
+            collection_update_event_receiver.call_args_list[1].kwargs,
+        )
+
+    def test_delete_library_block(self):
+        api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_problem_block["id"]),
+                UsageKey.from_string(self.lib1_html_block["id"]),
+            ],
+        )
+
+        event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_UPDATED.connect(event_receiver)
+
+        api.delete_library_block(UsageKey.from_string(self.lib1_problem_block["id"]))
+
+        assert event_receiver.call_count == 1
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key=self.col1.key,
+                    background=True,
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+
+    def test_restore_library_block(self):
+        api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_problem_block["id"]),
+                UsageKey.from_string(self.lib1_html_block["id"]),
+            ],
+        )
+
+        event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_UPDATED.connect(event_receiver)
+
+        api.restore_library_block(UsageKey.from_string(self.lib1_problem_block["id"]))
+
+        assert event_receiver.call_count == 1
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key=self.col1.key,
+                    background=True,
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+
+    def test_add_component_and_revert(self):
+        # Add component and publish
+        api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_problem_block["id"]),
+            ],
+        )
+        api.publish_changes(self.lib1.library_key)
+
+        # Add component and revert
+        api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_html_block["id"]),
+            ],
+        )
+
+        event_receiver = mock.Mock()
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.connect(event_receiver)
+        collection_update_event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_UPDATED.connect(collection_update_event_receiver)
+
+        api.revert_changes(self.lib1.library_key)
+
+        assert collection_update_event_receiver.call_count == 1
+        assert event_receiver.call_count == 2
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key=self.col1.key,
+                    background=True,
+                ),
+            },
+            collection_update_event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=str(self.lib1_problem_block["id"]),
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=str(self.lib1_html_block["id"]),
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[1].kwargs,
+        )
+
+    def test_delete_component_and_revert(self):
+        # Add components and publish
+        api.update_library_collection_components(
+            self.lib1.library_key,
+            self.col1.key,
+            usage_keys=[
+                UsageKey.from_string(self.lib1_problem_block["id"]),
+                UsageKey.from_string(self.lib1_html_block["id"])
+            ],
+        )
+        api.publish_changes(self.lib1.library_key)
+
+        # Delete component and revert
+        api.delete_library_block(UsageKey.from_string(self.lib1_problem_block["id"]))
+
+        event_receiver = mock.Mock()
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.connect(event_receiver)
+        collection_update_event_receiver = mock.Mock()
+        LIBRARY_COLLECTION_UPDATED.connect(collection_update_event_receiver)
+
+        api.revert_changes(self.lib1.library_key)
+
+        assert collection_update_event_receiver.call_count == 1
+        assert event_receiver.call_count == 2
+        self.assertDictContainsSubset(
+            {
+                "signal": LIBRARY_COLLECTION_UPDATED,
+                "sender": None,
+                "library_collection": LibraryCollectionData(
+                    self.lib1.library_key,
+                    collection_key=self.col1.key,
+                    background=True,
+                ),
+            },
+            collection_update_event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=str(self.lib1_problem_block["id"]),
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[0].kwargs,
+        )
+        self.assertDictContainsSubset(
+            {
+                "signal": CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+                "sender": None,
+                "content_object": ContentObjectChangedData(
+                    object_id=str(self.lib1_html_block["id"]),
+                    changes=["collections"],
+                ),
+            },
+            event_receiver.call_args_list[1].kwargs,
+        )
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index 95b7309b3cd1..83b277604071 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -1,16 +1,15 @@
 """
 Tests for Learning-Core-based Content Libraries
 """
-from unittest.mock import Mock, patch
+from datetime import datetime, timezone
 from unittest import skip
+from unittest.mock import Mock, patch
+from uuid import uuid4
 
 import ddt
-from uuid import uuid4
 from django.contrib.auth.models import Group
 from django.test.client import Client
-from organizations.models import Organization
-from rest_framework.test import APITestCase
-
+from freezegun import freeze_time
 from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
 from openedx_events.content_authoring.data import ContentLibraryData, LibraryBlockData
 from openedx_events.content_authoring.signals import (
@@ -19,20 +18,23 @@
     CONTENT_LIBRARY_UPDATED,
     LIBRARY_BLOCK_CREATED,
     LIBRARY_BLOCK_DELETED,
-    LIBRARY_BLOCK_UPDATED,
+    LIBRARY_BLOCK_UPDATED
 )
 from openedx_events.tests.utils import OpenEdxEventsTestMixin
+from organizations.models import Organization
+from rest_framework.test import APITestCase
+
+from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangoapps.content_libraries.constants import CC_4_BY
 from openedx.core.djangoapps.content_libraries.tests.base import (
-    ContentLibrariesRestApiTest,
+    URL_BLOCK_GET_HANDLER_URL,
     URL_BLOCK_METADATA_URL,
     URL_BLOCK_RENDER_VIEW,
-    URL_BLOCK_GET_HANDLER_URL,
     URL_BLOCK_XBLOCK_HANDLER,
+    ContentLibrariesRestApiTest
 )
-from openedx.core.djangoapps.content_libraries.constants import VIDEO, COMPLEX, PROBLEM, CC_4_BY
 from openedx.core.djangoapps.xblock import api as xblock_api
 from openedx.core.djangolib.testing.utils import skip_unless_cms
-from common.djangoapps.student.tests.factories import UserFactory
 
 
 @skip_unless_cms
@@ -98,7 +100,6 @@ def test_library_crud(self):
             "title": "A Tést Lꜟطrary",
             "description": "Just Téstꜟng",
             "version": 0,
-            "type": COMPLEX,
             "license": CC_4_BY,
             "has_unpublished_changes": False,
             "has_unpublished_deletes": False,
@@ -197,13 +198,13 @@ def test_library_filters(self):
         Test the filters in the list libraries API
         """
         self._create_library(
-            slug="test-lib-filter-1", title="Fob", description="Bar", library_type=VIDEO,
+            slug="test-lib-filter-1", title="Fob", description="Bar",
         )
         self._create_library(
             slug="test-lib-filter-2", title="Library-Title-2", description="Bar-2",
         )
         self._create_library(
-            slug="l3", title="Library-Title-3", description="Description", library_type=VIDEO,
+            slug="l3", title="Library-Title-3", description="Description",
         )
 
         Organization.objects.get_or_create(
@@ -213,7 +214,6 @@ def test_library_filters(self):
         self._create_library(
             slug="l4", title="Library-Title-4",
             description="Library-Description", org='org-test',
-            library_type=VIDEO,
         )
         self._create_library(
             slug="l5", title="Library-Title-5", description="Library-Description",
@@ -223,14 +223,11 @@ def test_library_filters(self):
         assert len(self._list_libraries()) == 5
         assert len(self._list_libraries({'org': 'org-test'})) == 2
         assert len(self._list_libraries({'text_search': 'test-lib-filter'})) == 2
-        assert len(self._list_libraries({'text_search': 'test-lib-filter', 'type': VIDEO})) == 1
         assert len(self._list_libraries({'text_search': 'library-title'})) == 4
-        assert len(self._list_libraries({'text_search': 'library-title', 'type': VIDEO})) == 2
         assert len(self._list_libraries({'text_search': 'bar'})) == 2
         assert len(self._list_libraries({'text_search': 'org-test'})) == 2
         assert len(self._list_libraries({'org': 'org-test',
                                          'text_search': 'library-title-4'})) == 1
-        assert len(self._list_libraries({'type': VIDEO})) == 3
 
         self.assertOrderEqual(
             self._list_libraries({'order': 'title'}),
@@ -255,13 +252,15 @@ def test_library_filters(self):
 
     # General Content Library XBlock tests:
 
-    def test_library_blocks(self):
+    def test_library_blocks(self):  # pylint: disable=too-many-statements
         """
         Test the happy path of creating and working with XBlocks in a content
         library.
 
         Tests with some non-ASCII chars in slugs, titles, descriptions.
         """
+        admin = UserFactory.create(username="Admin", email="admin@example.com", is_staff=True)
+
         lib = self._create_library(slug="téstlꜟط", title="A Tést Lꜟطrary", description="Tésting XBlocks")
         lib_id = lib["id"]
         assert lib['has_unpublished_changes'] is False
@@ -270,12 +269,18 @@ def test_library_blocks(self):
         assert self._get_library_blocks(lib_id)['results'] == []
 
         # Add a 'problem' XBlock to the library:
-        block_data = self._add_block_to_library(lib_id, "problem", "ࠒröblæm1")
+        create_date = datetime(2024, 6, 6, 6, 6, 6, tzinfo=timezone.utc)
+        with freeze_time(create_date):
+            block_data = self._add_block_to_library(lib_id, "problem", "ࠒröblæm1")
         self.assertDictContainsEntries(block_data, {
             "id": "lb:CL-TEST:téstlꜟط:problem:ࠒröblæm1",
             "display_name": "Blank Problem",
             "block_type": "problem",
             "has_unpublished_changes": True,
+            "last_published": None,
+            "published_by": None,
+            "last_draft_created": create_date.isoformat().replace('+00:00', 'Z'),
+            "last_draft_created_by": "Bob",
         })
         block_id = block_data["id"]
         # Confirm that the result contains a definition key, but don't check its value,
@@ -287,10 +292,14 @@ def test_library_blocks(self):
         assert self._get_library(lib_id)['has_unpublished_changes'] is True
 
         # Publish the changes:
-        self._commit_library_changes(lib_id)
+        publish_date = datetime(2024, 7, 7, 7, 7, 7, tzinfo=timezone.utc)
+        with freeze_time(publish_date):
+            self._commit_library_changes(lib_id)
         assert self._get_library(lib_id)['has_unpublished_changes'] is False
         # And now the block information should also show that block has no unpublished changes:
         block_data["has_unpublished_changes"] = False
+        block_data["last_published"] = publish_date.isoformat().replace('+00:00', 'Z')
+        block_data["published_by"] = "Bob"
         self.assertDictContainsEntries(self._get_library_block(block_id), block_data)
         assert self._get_library_blocks(lib_id)['results'] == [block_data]
 
@@ -311,13 +320,16 @@ def test_library_blocks(self):
             </multiplechoiceresponse>
         </problem>
         """.strip()
-        self._set_library_block_olx(block_id, new_olx)
+        update_date = datetime(2024, 8, 8, 8, 8, 8, tzinfo=timezone.utc)
+        with freeze_time(update_date):
+            self._set_library_block_olx(block_id, new_olx)
         # now reading it back, we should get that exact OLX (no change to whitespace etc.):
         assert self._get_library_block_olx(block_id) == new_olx
         # And the display name and "unpublished changes" status of the block should be updated:
         self.assertDictContainsEntries(self._get_library_block(block_id), {
             "display_name": "New Multi Choice Question",
             "has_unpublished_changes": True,
+            "last_draft_created": update_date.isoformat().replace('+00:00', 'Z')
         })
 
         # Now view the XBlock's student_view (including draft changes):
@@ -344,6 +356,21 @@ def test_library_blocks(self):
         assert self._get_library(lib_id)['has_unpublished_deletes'] is False
         assert self._get_library_block_olx(block_id) == orig_olx
 
+        # Now edit and publish the single block instead of the whole library:
+        new_olx = "<problem><p>Edited OLX</p></problem>"
+        self._set_library_block_olx(block_id, new_olx)
+        assert self._get_library_block_olx(block_id) == new_olx
+        unpublished_block_data = self._get_library_block(block_id)
+        assert unpublished_block_data['has_unpublished_changes'] is True
+        block_update_date = datetime(2024, 8, 8, 8, 8, 9, tzinfo=timezone.utc)
+        with freeze_time(block_update_date):
+            self._publish_library_block(block_id)
+        # Confirm the block is now published:
+        published_block_data = self._get_library_block(block_id)
+        assert published_block_data['last_published'] == block_update_date.isoformat().replace('+00:00', 'Z')
+        assert published_block_data['published_by'] == "Bob"
+        assert published_block_data['has_unpublished_changes'] is False
+
         # fin
 
     def test_library_blocks_studio_view(self):
@@ -358,12 +385,18 @@ def test_library_blocks_studio_view(self):
         assert self._get_library_blocks(lib_id)['results'] == []
 
         # Add a 'html' XBlock to the library:
-        block_data = self._add_block_to_library(lib_id, "html", "html1")
+        create_date = datetime(2024, 6, 6, 6, 6, 6, tzinfo=timezone.utc)
+        with freeze_time(create_date):
+            block_data = self._add_block_to_library(lib_id, "html", "html1")
         self.assertDictContainsEntries(block_data, {
             "id": "lb:CL-TEST:testlib2:html:html1",
             "display_name": "Text",
             "block_type": "html",
             "has_unpublished_changes": True,
+            "last_published": None,
+            "published_by": None,
+            "last_draft_created": create_date.isoformat().replace('+00:00', 'Z'),
+            "last_draft_created_by": "Bob",
         })
         block_id = block_data["id"]
 
@@ -372,10 +405,14 @@ def test_library_blocks_studio_view(self):
         assert self._get_library(lib_id)['has_unpublished_changes'] is True
 
         # Publish the changes:
-        self._commit_library_changes(lib_id)
+        publish_date = datetime(2024, 7, 7, 7, 7, 7, tzinfo=timezone.utc)
+        with freeze_time(publish_date):
+            self._commit_library_changes(lib_id)
         assert self._get_library(lib_id)['has_unpublished_changes'] is False
         # And now the block information should also show that block has no unpublished changes:
         block_data["has_unpublished_changes"] = False
+        block_data["last_published"] = publish_date.isoformat().replace('+00:00', 'Z')
+        block_data["published_by"] = "Bob"
         self.assertDictContainsEntries(self._get_library_block(block_id), block_data)
         assert self._get_library_blocks(lib_id)['results'] == [block_data]
 
@@ -383,13 +420,17 @@ def test_library_blocks_studio_view(self):
         orig_olx = self._get_library_block_olx(block_id)
         assert '<html' in orig_olx
         new_olx = "<html><b>Hello world!</b></html>"
-        self._set_library_block_olx(block_id, new_olx)
+
+        update_date = datetime(2024, 8, 8, 8, 8, 8, tzinfo=timezone.utc)
+        with freeze_time(update_date):
+            self._set_library_block_olx(block_id, new_olx)
         # now reading it back, we should get that exact OLX (no change to whitespace etc.):
         assert self._get_library_block_olx(block_id) == new_olx
         # And the display name and "unpublished changes" status of the block should be updated:
         self.assertDictContainsEntries(self._get_library_block(block_id), {
             "display_name": "Text",
             "has_unpublished_changes": True,
+            "last_draft_created": update_date.isoformat().replace('+00:00', 'Z')
         })
 
         # Now view the XBlock's studio view (including draft changes):
@@ -452,26 +493,29 @@ def test_library_blocks_filters(self):
         assert len(self._get_library_blocks(lib['id'], {'block_type': 'problem'})['results']) == 3
         assert len(self._get_library_blocks(lib['id'], {'block_type': 'squirrel'})['results']) == 0
 
-    @ddt.data(
-        ('video-problem', VIDEO, 'problem', 400),
-        ('video-video', VIDEO, 'video', 200),
-        ('problem-problem', PROBLEM, 'problem', 200),
-        ('problem-video', PROBLEM, 'video', 400),
-        ('complex-video', COMPLEX, 'video', 200),
-        ('complex-problem', COMPLEX, 'problem', 200),
-    )
-    @ddt.unpack
-    def test_library_blocks_type_constrained(self, slug, library_type, block_type, expect_response):
-        """
-        Test that type-constrained libraries enforce their constraint when adding an XBlock.
-        """
+    def test_library_not_found(self):
+        """Test that requests fail with 404 when the library does not exist"""
+        valid_not_found_key = 'lb:valid:key:video:1'
+        response = self.client.get(URL_BLOCK_METADATA_URL.format(block_key=valid_not_found_key))
+        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.json(), {
+            'detail': "Content Library 'lib:valid:key' does not exist",
+        })
+
+    def test_block_not_found(self):
+        """Test that requests fail with 404 when the library exists but the XBlock does not"""
         lib = self._create_library(
-            slug=slug, title="A Test Library", description="Testing XBlocks", library_type=library_type,
+            slug="test_lib_block_event_delete",
+            title="Event Test Library",
+            description="Testing event in library"
         )
-        lib_id = lib["id"]
-
-        # Add a 'problem' XBlock to the library:
-        self._add_block_to_library(lib_id, block_type, 'test-block', expect_response=expect_response)
+        library_key = LibraryLocatorV2.from_string(lib['id'])
+        non_existent_block_key = LibraryUsageLocatorV2(lib_key=library_key, block_type='video', usage_id='123')
+        response = self.client.get(URL_BLOCK_METADATA_URL.format(block_key=non_existent_block_key))
+        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.json(), {
+            'detail': f"The component '{non_existent_block_key}' does not exist.",
+        })
 
     # Test that permissions are enforced for content libraries
 
@@ -489,7 +533,7 @@ def test_library_permissions(self):  # pylint: disable=too-many-statements
         Learning Core data models.
         """
         # Create a few users to use for all of these tests:
-        admin = UserFactory.create(username="Admin", email="admin@example.com")
+        admin = UserFactory.create(username="Admin", email="admin@example.com", is_staff=True)
         author = UserFactory.create(username="Author", email="author@example.com")
         reader = UserFactory.create(username="Reader", email="reader@example.com")
         group = Group.objects.create(name="group1")
@@ -606,22 +650,30 @@ def test_library_permissions(self):  # pylint: disable=too-many-statements
         # A random user cannot read OLX nor assets (this library has allow_public_read False):
         with self.as_user(random_user):
             self._get_library_block_olx(block3_key, expect_response=403)
+            self._get_library_block_fields(block3_key, expect_response=403)
             self._get_library_block_assets(block3_key, expect_response=403)
-            self._get_library_block_asset(block3_key, file_name="whatever.png", expect_response=403)
-        # But if we grant allow_public_read, then they can:
+            self._get_library_block_asset(block3_key, file_name="static/whatever.png", expect_response=403)
+            # Nor can they preview the block:
+            self._render_block_view(block3_key, view_name="student_view", expect_response=403)
+        # Even if we grant allow_public_read, then they can't:
         with self.as_user(admin):
             self._update_library(lib_id, allow_public_read=True)
-            # self._set_library_block_asset(block3_key, "whatever.png", b"data")
+            self._set_library_block_asset(block3_key, "static/whatever.png", b"data")
         with self.as_user(random_user):
-            self._get_library_block_olx(block3_key)
+            self._get_library_block_olx(block3_key, expect_response=403)
+            self._get_library_block_fields(block3_key, expect_response=403)
+            # But he can preview the block:
+            self._render_block_view(block3_key, view_name="student_view")
             # self._get_library_block_assets(block3_key)
             # self._get_library_block_asset(block3_key, file_name="whatever.png")
 
-        # Users without authoring permission cannot edit nor delete XBlocks (this library has allow_public_read False):
+        # Users without authoring permission cannot edit nor publish nor delete XBlocks:
         for user in [reader, random_user]:
             with self.as_user(user):
                 self._set_library_block_olx(block3_key, "<problem/>", expect_response=403)
-                # self._set_library_block_asset(block3_key, "test.txt", b"data", expect_response=403)
+                self._set_library_block_fields(block3_key, {"data": "<problem />", "metadata": {}}, expect_response=403)
+                self._set_library_block_asset(block3_key, "static/test.txt", b"data", expect_response=403)
+                self._publish_library_block(block3_key, expect_response=403)
                 self._delete_library_block(block3_key, expect_response=403)
                 self._commit_library_changes(lib_id, expect_response=403)
                 self._revert_library_changes(lib_id, expect_response=403)
@@ -630,18 +682,30 @@ def test_library_permissions(self):  # pylint: disable=too-many-statements
         with self.as_user(author_group_member):
             olx = self._get_library_block_olx(block3_key)
             self._set_library_block_olx(block3_key, olx)
-            # self._get_library_block_assets(block3_key)
-            # self._set_library_block_asset(block3_key, "test.txt", b"data")
-            # self._get_library_block_asset(block3_key, file_name="test.txt")
+            self._set_library_block_fields(block3_key, {"data": olx, "metadata": {}})
+            self._get_library_block_assets(block3_key)
+            self._set_library_block_asset(block3_key, "static/test.txt", b"data")
+            self._get_library_block_asset(block3_key, file_name="static/test.txt")
             self._delete_library_block(block3_key)
+            self._publish_library_block(block3_key)
             self._commit_library_changes(lib_id)
             self._revert_library_changes(lib_id)  # This is a no-op after the commit, but should still have 200 response
 
+        # Users without authoring permission cannot commit Xblock changes:
+        # First we need to add some unpublished changes
+        with self.as_user(admin):
+            block4_data = self._add_block_to_library(lib_id, "problem", "problem4")
+            block5_data = self._add_block_to_library(lib_id, "problem", "problem5")
+            block4_key = block4_data["id"]
+            block5_key = block5_data["id"]
+            self._set_library_block_olx(block4_key, "<problem/>")
+            self._set_library_block_olx(block5_key, "<problem/>")
+
     def test_no_lockout(self):
         """
         Test that administrators cannot be removed if they are the only administrator granted access.
         """
-        admin = UserFactory.create(username="Admin", email="admin@example.com")
+        admin = UserFactory.create(username="Admin", email="admin@example.com", is_staff=True)
         successor = UserFactory.create(username="Successor", email="successor@example.com")
         with self.as_user(admin):
             lib = self._create_library(slug="permtest", title="Permission Test Library", description="Testing")
@@ -668,24 +732,6 @@ def test_library_blocks_limit(self):
             # Second block should throw error
             self._add_block_to_library(lib_id, "problem", "problem1", expect_response=400)
 
-    @ddt.data(
-        ('complex-types', COMPLEX, False),
-        ('video-types', VIDEO, True),
-        ('problem-types', PROBLEM, True),
-    )
-    @ddt.unpack
-    def test_block_types(self, slug, library_type, constrained):
-        """
-        Test that the permitted block types listing for a library change based on type.
-        """
-        lib = self._create_library(slug=slug, title='Test Block Types', library_type=library_type)
-        types = self._get_library_block_types(lib['id'])
-        if constrained:
-            assert len(types) == 1
-            assert types[0]['block_type'] == library_type
-        else:
-            assert len(types) > 1
-
     def test_content_library_create_event(self):
         """
         Check that CONTENT_LIBRARY_CREATED event is sent when a content library is created.
@@ -855,7 +901,6 @@ def test_library_block_olx_update_event(self):
             event_receiver.call_args.kwargs
         )
 
-    @skip("We still need to re-implement static asset handling.")
     def test_library_block_add_asset_update_event(self):
         """
         Check that LIBRARY_BLOCK_CREATED event is sent when a static asset is
@@ -874,7 +919,7 @@ def test_library_block_add_asset_update_event(self):
 
         block = self._add_block_to_library(lib_id, "unit", "u1")
         block_id = block["id"]
-        self._set_library_block_asset(block_id, "test.txt", b"data")
+        self._set_library_block_asset(block_id, "static/test.txt", b"data")
 
         usage_key = LibraryUsageLocatorV2(
             lib_key=library_key,
@@ -895,7 +940,6 @@ def test_library_block_add_asset_update_event(self):
             event_receiver.call_args.kwargs
         )
 
-    @skip("We still need to re-implement static asset handling.")
     def test_library_block_del_asset_update_event(self):
         """
         Check that LIBRARY_BLOCK_CREATED event is sent when a static asset is
@@ -914,9 +958,9 @@ def test_library_block_del_asset_update_event(self):
 
         block = self._add_block_to_library(lib_id, "unit", "u1")
         block_id = block["id"]
-        self._set_library_block_asset(block_id, "test.txt", b"data")
+        self._set_library_block_asset(block_id, "static/test.txt", b"data")
 
-        self._delete_library_block_asset(block_id, 'text.txt')
+        self._delete_library_block_asset(block_id, 'static/text.txt')
 
         usage_key = LibraryUsageLocatorV2(
             lib_key=library_key,
@@ -985,7 +1029,7 @@ def test_library_paste_clipboard(self):
         from openedx.core.djangoapps.content_staging.api import save_xblock_to_user_clipboard
 
         # Create user to perform tests on
-        author = UserFactory.create(username="Author", email="author@example.com")
+        author = UserFactory.create(username="Author", email="author@example.com", is_staff=True)
         with self.as_user(author):
             lib = self._create_library(
                 slug="test_lib_paste_clipboard",
@@ -1005,6 +1049,9 @@ def test_library_paste_clipboard(self):
                 usage_id="problem1"
             )
 
+            # Add an asset to the block before copying
+            self._set_library_block_asset(usage_key, "static/hello.txt", b"Hello World!")
+
             # Get the XBlock created in the previous step
             block = xblock_api.load_block(usage_key, user=author)
 
@@ -1014,11 +1061,26 @@ def test_library_paste_clipboard(self):
             # Paste the content of the clipboard into the library
             pasted_block_id = str(uuid4())
             paste_data = self._paste_clipboard_content_in_library(lib_id, pasted_block_id)
+            pasted_usage_key = LibraryUsageLocatorV2(
+                lib_key=library_key,
+                block_type="problem",
+                usage_id=pasted_block_id
+            )
+            self._get_library_block_asset(pasted_usage_key, "static/hello.txt")
+
+            # Compare the two text files
+            src_data = self.client.get(f"/library_assets/blocks/{usage_key}/static/hello.txt").getvalue()
+            dest_data = self.client.get(f"/library_assets/blocks/{pasted_usage_key}/static/hello.txt").getvalue()
+            assert src_data == dest_data
 
             # Check that the new block was created after the paste and it's content matches
             # the the block in the clipboard
             self.assertDictContainsEntries(self._get_library_block(paste_data["id"]), {
                 **block_data,
+                "last_draft_created_by": None,
+                "last_draft_created": paste_data["last_draft_created"],
+                "created": paste_data["created"],
+                "modified": paste_data["modified"],
                 "id": f"lb:CL-TEST:test_lib_paste_clipboard:problem:{pasted_block_id}",
             })
 
@@ -1039,10 +1101,6 @@ def test_invalid_key(self, endpoint, endpoint_parameters):
             endpoint.format(**endpoint_parameters),
         )
         self.assertEqual(response.status_code, 404)
-        msg = f"XBlock {endpoint_parameters.get('block_key')} does not exist, or you don't have permission to view it."
-        self.assertEqual(response.json(), {
-            'detail': msg,
-        })
 
     def test_xblock_handler_invalid_key(self):
         """This endpoint is tested separately from the previous ones as it's not a DRF endpoint."""
@@ -1054,12 +1112,3 @@ def test_xblock_handler_invalid_key(self):
             secure_token='random',
         )))
         self.assertEqual(response.status_code, 404)
-
-    def test_not_found_fails_correctly(self):
-        """Test fails with 404 when xblock key is valid but not found."""
-        valid_not_found_key = 'lb:valid:key:video:1'
-        response = self.client.get(URL_BLOCK_METADATA_URL.format(block_key=valid_not_found_key))
-        self.assertEqual(response.status_code, 404)
-        self.assertEqual(response.json(), {
-            'detail': f"XBlock {valid_not_found_key} does not exist, or you don't have permission to view it.",
-        })
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py b/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
new file mode 100644
index 000000000000..e9909b7d6063
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
@@ -0,0 +1,231 @@
+"""
+Tests for the XBlock v2 runtime's "embed" view, using Content Libraries
+
+This view is used in the MFE to preview XBlocks that are in the library.
+"""
+import re
+
+import ddt
+from django.core.exceptions import ValidationError
+from django.test.utils import override_settings
+from openedx_events.tests.utils import OpenEdxEventsTestMixin
+import pytest
+from xblock.core import XBlock
+
+from openedx.core.djangoapps.content_libraries.tests.base import (
+    ContentLibrariesRestApiTest
+)
+from openedx.core.djangolib.testing.utils import skip_unless_cms
+from .fields_test_block import FieldsTestBlock
+
+
+@skip_unless_cms
+@ddt.ddt
+@override_settings(CORS_ORIGIN_WHITELIST=[])  # For some reason, this setting isn't defined in our test environment?
+class LibrariesEmbedViewTestCase(ContentLibrariesRestApiTest, OpenEdxEventsTestMixin):
+    """
+    Tests for embed_view and interacting with draft/published/past versions of
+    Learning-Core-based XBlocks (in Content Libraries).
+
+    These tests use the REST API, which in turn relies on the Python API.
+    Some tests may use the python API directly if necessary to provide
+    coverage of any code paths not accessible via the REST API.
+
+    In general, these tests should
+    (1) Use public APIs only - don't directly create data using other methods,
+        which results in a less realistic test and ties the test suite too
+        closely to specific implementation details.
+        (Exception: users can be provisioned using a user factory)
+    (2) Assert that fields are present in responses, but don't assert that the
+        entire response has some specific shape. That way, things like adding
+        new fields to an API response, which are backwards compatible, won't
+        break any tests, but backwards-incompatible API changes will.
+
+    WARNING: every test should have a unique library slug, because even though
+    the django/mysql database gets reset for each test case, the lookup between
+    library slug and bundle UUID does not because it's assumed to be immutable
+    and cached forever.
+    """
+
+    @XBlock.register_temp_plugin(FieldsTestBlock, FieldsTestBlock.BLOCK_TYPE)
+    def test_embed_view_versions(self):
+        """
+        Test that the embed_view renders a block and can render different versions of it.
+        """
+        # Create a library:
+        lib = self._create_library(slug="test-eb-1", title="Test Library", description="")
+        lib_id = lib["id"]
+        # Create an XBlock. This will be the empty version 1:
+        create_response = self._add_block_to_library(lib_id, FieldsTestBlock.BLOCK_TYPE, "block1")
+        block_id = create_response["id"]
+        # Create version 2 of the block by setting its OLX:
+        olx_response = self._set_library_block_olx(block_id, """
+            <fields-test
+                display_name="Field Test Block (Old, v2)"
+                setting_field="Old setting value 2."
+                content_field="Old content value 2."
+            />
+        """)
+        assert olx_response["version_num"] == 2
+        # Create version 3 of the block by setting its OLX again:
+        olx_response = self._set_library_block_olx(block_id, """
+            <fields-test
+                display_name="Field Test Block (Published, v3)"
+                setting_field="Published setting value 3."
+                content_field="Published content value 3."
+            />
+        """)
+        assert olx_response["version_num"] == 3
+        # Publish the library:
+        self._commit_library_changes(lib_id)
+
+        # Create the draft (version 4) of the block:
+        olx_response = self._set_library_block_olx(block_id, """
+            <fields-test
+                display_name="Field Test Block (Draft, v4)"
+                setting_field="Draft setting value 4."
+                content_field="Draft content value 4."
+            />
+        """)
+
+        # Now render the "embed block" view. This test only runs in CMS so it should default to the draft:
+        html = self._embed_block(block_id)
+
+        def check_fields(display_name, setting_value, content_value):
+            assert f'<h1>{display_name}</h1>' in html
+            assert f'<p>SF: {setting_value}</p>' in html
+            assert f'<p>CF: {content_value}</p>' in html
+            handler_url = re.search(r'<p>handler URL: ([^<]+)</p>', html).group(1)
+            assert handler_url.startswith('http')
+            handler_result = self.client.get(handler_url).json()
+            assert handler_result == {
+                "display_name": display_name,
+                "setting_field": setting_value,
+                "content_field": content_value,
+            }
+        check_fields('Field Test Block (Draft, v4)', 'Draft setting value 4.', 'Draft content value 4.')
+
+        # But if we request the published version, we get that:
+        html = self._embed_block(block_id, version="published")
+        check_fields('Field Test Block (Published, v3)', 'Published setting value 3.', 'Published content value 3.')
+
+        # And if we request a specific version, we get that:
+        html = self._embed_block(block_id, version=3)
+        check_fields('Field Test Block (Published, v3)', 'Published setting value 3.', 'Published content value 3.')
+
+        # And if we request a specific version, we get that:
+        html = self._embed_block(block_id, version=2)
+        check_fields('Field Test Block (Old, v2)', 'Old setting value 2.', 'Old content value 2.')
+
+        html = self._embed_block(block_id, version=4)
+        check_fields('Field Test Block (Draft, v4)', 'Draft setting value 4.', 'Draft content value 4.')
+
+    @XBlock.register_temp_plugin(FieldsTestBlock, FieldsTestBlock.BLOCK_TYPE)
+    def test_handlers_modifying_published_data(self):
+        """
+        Test that if we requested any version other than "draft", the handlers should not allow _writing_ to authored
+        field data (because you'd be overwriting the latest draft version with changes based on an old version).
+
+        We may decide to relax this restriction in the future. Not sure how important it is.
+
+        Writing to student state is OK.
+        """
+        # Create a library:
+        lib = self._create_library(slug="test-eb-2", title="Test Library", description="")
+        lib_id = lib["id"]
+        # Create an XBlock. This will be the empty version 1:
+        create_response = self._add_block_to_library(lib_id, FieldsTestBlock.BLOCK_TYPE, "block1")
+        block_id = create_response["id"]
+
+        # Now render the "embed block" view. This test only runs in CMS so it should default to the draft:
+        html = self._embed_block(block_id)
+
+        def call_update_handler(**kwargs):
+            handler_url = re.search(r'<p>handler URL: ([^<]+)</p>', html).group(1)
+            assert handler_url.startswith('http')
+            handler_url = handler_url.replace('get_fields', 'update_fields')
+            response = self.client.post(handler_url, kwargs, format='json')
+            assert response.status_code == 200
+
+        def check_fields(display_name, setting_field, content_field):
+            assert f'<h1>{display_name}</h1>' in html
+            assert f'<p>SF: {setting_field}</p>' in html
+            assert f'<p>CF: {content_field}</p>' in html
+
+        # Call the update handler to change the fields on the draft:
+        call_update_handler(display_name="DN-01", setting_field="SV-01", content_field="CV-01")
+
+        # Render the block again and check that the handler was able to update the fields:
+        html = self._embed_block(block_id)
+        check_fields(display_name="DN-01", setting_field="SV-01", content_field="CV-01")
+
+        # Publish the library:
+        self._commit_library_changes(lib_id)
+
+        # Now try changing the authored fields of the published version using a handler:
+        html = self._embed_block(block_id, version="published")
+        expected_msg = "Do not make changes to a component starting from the published or past versions."
+        with pytest.raises(ValidationError, match=expected_msg) as err:
+            call_update_handler(display_name="DN-X", setting_field="SV-X", content_field="CV-X")
+
+        # Now try changing the authored fields of a specific past version using a handler:
+        html = self._embed_block(block_id, version=2)
+        with pytest.raises(ValidationError, match=expected_msg) as err:
+            call_update_handler(display_name="DN-X", setting_field="SV-X", content_field="CV-X")
+
+        # Make sure the fields were not updated:
+        html = self._embed_block(block_id)
+        check_fields(display_name="DN-01", setting_field="SV-01", content_field="CV-01")
+
+    def test_embed_view_versions_static_assets(self):
+        """
+        Test asset substitution and version-awareness.
+        """
+        # Create a library:
+        lib = self._create_library(
+            slug="test-eb-asset-1", title="Asset Test Library", description="",
+        )
+        lib_id = lib["id"]
+
+        # Create an HTMLBlock. This will be the empty version 1:
+        create_response = self._add_block_to_library(lib_id, "html", "asset_block")
+        block_id = create_response["id"]
+
+        # Create version 2 of the block by setting its OLX. This has a reference
+        # to an image, but not the image itself–so it won't get auto-replaced.
+        olx_response = self._set_library_block_olx(block_id, """
+            <html display_name="Asset Test Component"><![CDATA[
+                <p>This is the enemy of our garden:</p>
+                <p><img src="/static/deer.jpg"/></p>
+            ]]></html>
+        """)
+        assert olx_response["version_num"] == 2
+
+        # Create version 3 with some bogus file data
+        self._set_library_block_asset(block_id, "static/deer.jpg", b"This is not a valid JPEG file")
+
+        # Publish the library (making version 3 the published state):
+        self._commit_library_changes(lib_id)
+
+        # Create version 4 by deleting the asset
+        self._delete_library_block_asset(block_id, "static/deer.jpg")
+
+        # Grab version 2, which has the asset reference but not the asset. No
+        # substitution should happen.
+        html = self._embed_block(block_id, version=2)
+        assert 'src="/static/deer.jpg"' in html
+
+        # Grab the published version 3. This has the asset, so the link should
+        # show up.
+        html = self._embed_block(block_id, version='published')
+        # This is the pattern we're looking for:
+        #   <img src="https://{host}/library_assets/component_versions/.../static/deer.jpg"/>
+        assert re.search(r'/library_assets/component_versions/[0-9a-f-]*/static/deer.jpg', html)
+
+        # Now grab the draft version (4), which is going to once again not have
+        # the asset (because we deleted it).
+        html = self._embed_block(block_id, version='draft')
+        assert 'src="/static/deer.jpg"' in html
+
+    # TODO: if we are ever able to run these tests in the LMS, test that the LMS only allows accessing the published
+    # version.
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_models.py b/openedx/core/djangoapps/content_libraries/tests/test_models.py
index 81a5a8fa32f3..eded47a305d2 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_models.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_models.py
@@ -15,7 +15,6 @@
 from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
 
 from ..models import ALL_RIGHTS_RESERVED
-from ..models import COMPLEX
 from ..models import ContentLibrary
 from ..models import LtiGradedResource
 from ..models import LtiProfile
@@ -35,7 +34,6 @@ def _create_library(self, **kwds):
         return ContentLibrary.objects.create(
             org=org,
             slug='foobar',
-            type=COMPLEX,
             allow_public_learning=False,
             allow_public_read=False,
             license=ALL_RIGHTS_RESERVED,
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
index 89b8cdefd86b..5fe5bb4eb1fc 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
@@ -2,11 +2,12 @@
 Test the Learning-Core-based XBlock runtime and content libraries together.
 """
 import json
-from gettext import GNUTranslations
 
 from completion.test_utils import CompletionWaffleTestMixin
 from django.db import connections, transaction
+from django.test import TestCase, override_settings
 from django.utils.text import slugify
+import django.utils.translation
 from organizations.models import Organization
 from rest_framework.test import APIClient
 from xblock.core import XBlock
@@ -20,10 +21,11 @@
     URL_BLOCK_FIELDS_URL,
 )
 from openedx.core.djangoapps.content_libraries.tests.user_state_block import UserStateTestBlock
-from openedx.core.djangoapps.content_libraries.constants import COMPLEX, ALL_RIGHTS_RESERVED
+from openedx.core.djangoapps.content_libraries.constants import ALL_RIGHTS_RESERVED
 from openedx.core.djangoapps.dark_lang.models import DarkLangConfig
 from openedx.core.djangoapps.xblock import api as xblock_api
 from openedx.core.djangolib.testing.utils import skip_unless_lms, skip_unless_cms
+from openedx.core.lib.xblock_serializer import api as serializer_api
 from common.djangoapps.student.tests.factories import UserFactory
 
 
@@ -48,7 +50,6 @@ def setUp(self):
         _, slug = self.id().rsplit('.', 1)
         with transaction.atomic():
             self.library = library_api.create_library(
-                library_type=COMPLEX,
                 org=self.organization,
                 slug=slugify(slug),
                 title=(f"{slug} Test Lib"),
@@ -59,18 +60,97 @@ def setUp(self):
             )
 
 
-class ContentLibraryRuntimeTests(ContentLibraryContentTestMixin):
+@skip_unless_cms
+class ContentLibraryOlxTests(ContentLibraryContentTestMixin, TestCase):
+    """
+    Basic test of the Learning-Core-based XBlock serialization-deserialization, using XBlocks in a content library.
+    """
+
+    def test_html_round_trip(self):
+        """
+        Test that if we deserialize and serialize an HTMLBlock repeatedly, two things hold true:
+
+        1. Even if the OLX changes format, the inner content does not change format.
+        2. The OLX settles into a stable state after 1 round trip.
+
+        (We are particularly testing HTML, but it would be good to confirm that these principles hold true for
+         XBlocks in general.)
+        """
+        usage_key = library_api.create_library_block(self.library.key, "html", "roundtrip").usage_key
+
+        # The block's actual HTML has some extraneous spaces and newlines, as well as comment.
+        # We expect this to be preserved through the round-trips.
+        block_content = '''\
+<div class="i-like-double-quotes">
+    <div class='i-like-single-quotes'>
+        <p> There is a space on either side of this sentence. </p>
+        <p>\tThere is a tab on either side of this sentence.\t<p>
+        <p>🙃There is an emoji on either side of this sentence.🙂</p>
+        <p>There is nothing on either side of this sentence.</p>
+    </div>
+    <p><![CDATA[ This is an inner CDATA 🤯 Technically illegal in HTML, but let's test it anyway. ?!&<>\t ]]&gt;</p>
+    <!-- This is a comment within the HTML. -->
+</div>'''
+
+        # The OLX containing the HTML also has some extraneous stuff, which do *not* expect to survive the round-trip.
+        olx_1 = f'''\
+
+            <html
+                display_name="Round Trip Test HTML Block"
+                some_fake_field="some fake value"
+            ><![CDATA[{block_content}]]><!--
+                I am an OLX comment.
+            --></html>'''
+
+        # Here is what we expect the OLX to settle down to. Notable changes:
+        #  * url_name is added.
+        #  * some_fake_field is gone.
+        #  * The OLX comment is gone.
+        #  * A trailing newline is added at the end of the export.
+        # DEVS: If you are purposefully tweaking the formatting of the xblock serializer, then it's fine to
+        # update the value of this variable, as long as:
+        #  1. the {block_content} remains unchanged, and
+        #  2. the canonical_olx remains stable through the 2nd round trip.
+        canonical_olx = (
+            f'<html url_name="roundtrip" display_name="Round Trip Test HTML Block"><![CDATA[{block_content}]]></html>\n'
+        )
+
+        # Save the block to LC, and re-load it.
+        library_api.set_library_block_olx(usage_key, olx_1)
+        library_api.publish_changes(self.library.key)
+        block_saved_1 = xblock_api.load_block(usage_key, self.staff_user)
+
+        # Content should be preserved...
+        assert block_saved_1.data == block_content
+
+        # ...but the serialized OLX will have changed to match the 'canonical' OLX.
+        olx_2 = serializer_api.serialize_xblock_to_olx(block_saved_1).olx_str
+        assert olx_2 == canonical_olx
+
+        # Now, save that OLX back to LC, and re-load it again.
+        library_api.set_library_block_olx(usage_key, olx_2)
+        library_api.publish_changes(self.library.key)
+        block_saved_2 = xblock_api.load_block(usage_key, self.staff_user)
+
+        # Again, content should be preserved...
+        assert block_saved_2.data == block_saved_1.data == block_content
+
+        # ...and this time, the OLX should have settled too.
+        olx_3 = serializer_api.serialize_xblock_to_olx(block_saved_2).olx_str
+        assert olx_3 == olx_2 == canonical_olx
+
+
+class ContentLibraryRuntimeTests(ContentLibraryContentTestMixin, TestCase):
     """
     Basic tests of the Learning-Core-based XBlock runtime using XBlocks in a
     content library.
     """
-
     def test_dndv2_sets_translator(self):
         dnd_block_key = library_api.create_library_block(self.library.key, "drag-and-drop-v2", "dnd1").usage_key
         library_api.publish_changes(self.library.key)
         dnd_block = xblock_api.load_block(dnd_block_key, self.student_a)
         i18n_service = dnd_block.runtime.service(dnd_block, 'i18n')
-        assert isinstance(i18n_service.translator, GNUTranslations)
+        assert i18n_service.translator is django.utils.translation
 
     def test_has_score(self):
         """
@@ -88,8 +168,7 @@ def test_xblock_metadata(self):
         """
         Test the XBlock metadata API
         """
-        unit_block_key = library_api.create_library_block(self.library.key, "unit", "metadata-u1").usage_key
-        problem_key = library_api.create_library_block_child(unit_block_key, "problem", "metadata-p1").usage_key
+        problem_key = library_api.create_library_block(self.library.key, "problem", "metadata-p1").usage_key
         new_olx = """
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
@@ -111,14 +190,6 @@ def test_xblock_metadata(self):
         client = APIClient()
         client.login(username=self.student_a.username, password='edx')
 
-        # Check the metadata API for the unit:
-        metadata_view_result = client.get(
-            URL_BLOCK_METADATA_URL.format(block_key=unit_block_key),
-            {"include": "children,editable_children"},
-        )
-        assert metadata_view_result.data['children'] == [str(problem_key)]
-        assert metadata_view_result.data['editable_children'] == [str(problem_key)]
-
         # Check the metadata API for the problem:
         metadata_view_result = client.get(
             URL_BLOCK_METADATA_URL.format(block_key=problem_key),
@@ -145,8 +216,7 @@ def test_xblock_fields(self):
         client.login(username=self.staff_user.username, password='edx')
 
         # create/save a block using the library APIs first
-        unit_block_key = library_api.create_library_block(self.library.key, "unit", "fields-u1").usage_key
-        block_key = library_api.create_library_block_child(unit_block_key, "html", "fields-p1").usage_key
+        block_key = library_api.create_library_block(self.library.key, "html", "fields-p1").usage_key
         new_olx = """
         <html display_name="New Text Block">
             <p>This is some <strong>HTML</strong>.</p>
@@ -169,14 +239,24 @@ def test_xblock_fields(self):
             }
         }, format='json')
         block_saved = xblock_api.load_block(block_key, self.staff_user)
-        assert block_saved.data == '\n<p>test</p>\n'
+        assert block_saved.data == '<p>test</p>'
         assert block_saved.display_name == 'New Display Name'
 
 
+# EphemeralKeyValueStore requires a working cache, and the default test cache is a dummy cache.
+@override_settings(
+    XBLOCK_RUNTIME_V2_EPHEMERAL_DATA_CACHE='default',
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            'LOCATION': 'edx_loc_mem_cache',
+        },
+    },
+)
 # We can remove the line below to enable this in Studio once we implement a session-backed
 # field data store which we can use for both studio users and anonymous users
 @skip_unless_lms
-class ContentLibraryXBlockUserStateTest(ContentLibraryContentTestMixin):
+class ContentLibraryXBlockUserStateTest(ContentLibraryContentTestMixin, TestCase):
     """
     Test that the Blockstore-based XBlock runtime can store and retrieve student
     state for XBlocks when learners access blocks directly in a library context,
@@ -479,7 +559,7 @@ def test_i18n(self):
 
 
 @skip_unless_lms  # No completion tracking in Studio
-class ContentLibraryXBlockCompletionTest(ContentLibraryContentTestMixin, CompletionWaffleTestMixin):
+class ContentLibraryXBlockCompletionTest(ContentLibraryContentTestMixin, CompletionWaffleTestMixin, TestCase):
     """
     Test that the Blockstore-based XBlocks can track their completion status
     using the completion library.
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py b/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
index 92ff4c1767d0..91d9556b01f1 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
@@ -1,11 +1,16 @@
 """
 Tests for static asset files in Learning-Core-based Content Libraries
 """
-from unittest import skip
+from uuid import UUID
 
+from opaque_keys.edx.keys import UsageKey
+
+from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.content_libraries.tests.base import (
     ContentLibrariesRestApiTest,
 )
+from openedx.core.djangoapps.xblock.api import get_component_from_usage_key
+from openedx.core.djangolib.testing.utils import skip_unless_cms
 
 # Binary data representing an SVG image file
 SVG_DATA = """<svg xmlns="http://www.w3.org/2000/svg" height="30" width="100">
@@ -23,15 +28,10 @@
 """
 
 
-@skip("Assets are being reimplemented in Learning Core. Disable until that's ready.")
+@skip_unless_cms
 class ContentLibrariesStaticAssetsTest(ContentLibrariesRestApiTest):
     """
     Tests for static asset files in Learning-Core-based Content Libraries
-
-    WARNING: every test should have a unique library slug, because even though
-    the django/mysql database gets reset for each test case, the lookup between
-    library slug and bundle UUID does not because it's assumed to be immutable
-    and cached forever.
     """
 
     def test_asset_filenames(self):
@@ -63,6 +63,13 @@ def test_asset_filenames(self):
         file_name = "a////////b"
         self._set_library_block_asset(block_id, file_name, SVG_DATA, expect_response=400)
 
+        # Names with spaces are allowed but replaced with underscores
+        file_name_with_space = "o w o.svg"
+        self._set_library_block_asset(block_id, file_name_with_space, SVG_DATA)
+        file_name = "o_w_o.svg"
+        assert self._get_library_block_asset(block_id, file_name)['path'] == file_name
+        assert self._get_library_block_asset(block_id, file_name)['size'] == file_size
+
     def test_video_transcripts(self):
         """
         Test that video blocks can read transcript files out of learning core.
@@ -79,7 +86,7 @@ def test_video_transcripts(self):
             />
         """)
         # Upload the transcript file
-        self._set_library_block_asset(block_id, "3_yD_cEKoCk-en.srt", TRANSCRIPT_DATA)
+        self._set_library_block_asset(block_id, "static/3_yD_cEKoCk-en.srt", TRANSCRIPT_DATA)
 
         transcript_handler_url = self._get_block_handler_url(block_id, "transcript")
 
@@ -108,3 +115,106 @@ def check_download():
         self._commit_library_changes(library["id"])
         check_sjson()
         check_download()
+
+
+@skip_unless_cms
+class ContentLibrariesComponentVersionAssetTest(ContentLibrariesRestApiTest):
+    """
+    Tests for the view that actually delivers the Library asset in Studio.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        library = self._create_library(slug="asset-lib2", title="Static Assets Test Library")
+        block = self._add_block_to_library(library["id"], "html", "html1")
+        self._set_library_block_asset(block["id"], "static/test.svg", SVG_DATA)
+        usage_key = UsageKey.from_string(block["id"])
+        self.usage_key = usage_key
+        self.component = get_component_from_usage_key(usage_key)
+        self.draft_component_version = self.component.versioning.draft
+
+    def test_good_responses(self):
+        get_response = self.client.get(
+            f"/library_assets/component_versions/{self.draft_component_version.uuid}/static/test.svg"
+        )
+        assert get_response.status_code == 200
+        content = b''.join(chunk for chunk in get_response.streaming_content)
+        assert content == SVG_DATA
+
+        good_head_response = self.client.head(
+            f"/library_assets/component_versions/{self.draft_component_version.uuid}/static/test.svg"
+        )
+        assert good_head_response.headers == get_response.headers
+
+    def test_missing(self):
+        """Test asset requests that should 404."""
+        # Non-existent version...
+        wrong_version_uuid = UUID('11111111-1111-1111-1111-111111111111')
+        response = self.client.get(
+            f"/library_assets/component_versions/{wrong_version_uuid}/static/test.svg"
+        )
+        assert response.status_code == 404
+
+        # Non-existent file...
+        response = self.client.get(
+            f"/library_assets/component_versions/{self.draft_component_version.uuid}/static/missing.svg"
+        )
+        assert response.status_code == 404
+
+        # File-like ComponenVersionContent entry that isn't an actually
+        # downloadable file...
+        response = self.client.get(
+            f"/library_assets/component_versions/{self.draft_component_version.uuid}/block.xml"
+        )
+        assert response.status_code == 404
+
+    def test_anonymous_user(self):
+        """Anonymous users shouldn't get access to library assets."""
+        self.client.logout()
+        response = self.client.get(
+            f"/library_assets/component_versions/{self.draft_component_version.uuid}/static/test.svg"
+        )
+        assert response.status_code == 401
+
+    def test_unauthorized_user(self):
+        """User who is not a Content Library staff should not have access."""
+        self.client.logout()
+        UserFactory.create(
+            username="student",
+            email="student@example.com",
+            password="student-pass",
+            is_staff=False,
+            is_superuser=False,
+        )
+        self.client.login(username="student", password="student-pass")
+        get_response = self.client.get(
+            f"/library_assets/component_versions/{self.draft_component_version.uuid}/static/test.svg"
+        )
+        assert get_response.status_code == 403
+
+    def test_draft_version(self):
+        """Get draft version of asset"""
+        get_response = self.client.get(
+            f"/library_assets/blocks/{self.usage_key}/static/test.svg"
+        )
+        assert get_response.status_code == 200
+        content = b''.join(chunk for chunk in get_response.streaming_content)
+        assert content == SVG_DATA
+
+        good_head_response = self.client.head(
+            f"/library_assets/blocks/{self.usage_key}/static/test.svg"
+        )
+        assert good_head_response.headers == get_response.headers
+
+    def test_draft_version_404(self):
+        """Get draft version of asset"""
+        get_response = self.client.get(
+            f"/library_assets/blocks/{self.usage_key}@/static/test.svg"
+        )
+        assert get_response.status_code == 404
+
+        get_response = self.client.get(
+            f"/library_assets/blocks/{self.usage_key}/static/test2.svg"
+        )
+        assert get_response.status_code == 404
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_versioned_apis.py b/openedx/core/djangoapps/content_libraries/tests/test_versioned_apis.py
new file mode 100644
index 000000000000..ad7ea54d8dfb
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/tests/test_versioned_apis.py
@@ -0,0 +1,104 @@
+"""
+Tests that several XBlock APIs support versioning
+"""
+from django.test.utils import override_settings
+from openedx_events.tests.utils import OpenEdxEventsTestMixin
+from xblock.core import XBlock
+
+from openedx.core.djangoapps.content_libraries.tests.base import (
+    ContentLibrariesRestApiTest
+)
+from openedx.core.djangolib.testing.utils import skip_unless_cms
+from .fields_test_block import FieldsTestBlock
+
+
+@skip_unless_cms
+@override_settings(CORS_ORIGIN_WHITELIST=[])  # For some reason, this setting isn't defined in our test environment?
+class VersionedXBlockApisTestCase(ContentLibrariesRestApiTest, OpenEdxEventsTestMixin):
+    """
+    Tests for three APIs implemented by djangoapps.xblock, and used by content
+    libraries. These tests focus on versioning.
+
+    Note the metadata endpoint is different than the similar "metadata" endpoint
+    within the content libraries API, which returns a lot more information. This
+    endpoint pretty much only returns the display name of a block, but it does
+    allow retrieving past versions.
+    """
+
+    @XBlock.register_temp_plugin(FieldsTestBlock, FieldsTestBlock.BLOCK_TYPE)
+    def test_versioned_metadata(self):
+        """
+        Test that metadata endpoint can get different versions of the block's metadata
+        """
+        # Create a library:
+        lib = self._create_library(slug="test-eb-1", title="Test Library", description="")
+        lib_id = lib["id"]
+        # Create an XBlock. This will be the empty version 1:
+        create_response = self._add_block_to_library(lib_id, FieldsTestBlock.BLOCK_TYPE, "block1")
+        block_id = create_response["id"]
+        # Create version 2 of the block by setting its OLX:
+        olx_response = self._set_library_block_olx(block_id, """
+            <fields-test
+                display_name="Field Test Block (Old, v2)"
+                setting_field="Old setting value 2."
+                content_field="Old content value 2."
+            />
+        """)
+        assert olx_response["version_num"] == 2
+        # Create version 3 of the block by setting its OLX again:
+        olx_response = self._set_library_block_olx(block_id, """
+            <fields-test
+                display_name="Field Test Block (Published, v3)"
+                setting_field="Published setting value 3."
+                content_field="Published content value 3."
+            />
+        """)
+        assert olx_response["version_num"] == 3
+        # Publish the library:
+        self._commit_library_changes(lib_id)
+
+        # Create the draft (version 4) of the block:
+        olx_response = self._set_library_block_olx(block_id, """
+            <fields-test
+                display_name="Field Test Block (Draft, v4)"
+                setting_field="Draft setting value 4."
+                content_field="Draft content value 4."
+            />
+        """)
+
+        def check_results(version, display_name, settings_field, content_field):
+            meta = self._get_basic_xblock_metadata(block_id, version=version)
+            assert meta["block_id"] == block_id
+            assert meta["block_type"] == FieldsTestBlock.BLOCK_TYPE
+            assert meta["display_name"] == display_name
+            fields = self._get_library_block_fields(block_id, version=version)
+            assert fields["display_name"] == display_name
+            assert fields["metadata"]["setting_field"] == settings_field
+            rendered = self._render_block_view(block_id, "student_view", version=version)
+            assert rendered["block_id"] == block_id
+            assert f"SF: {settings_field}" in rendered["content"]
+            assert f"CF: {content_field}" in rendered["content"]
+
+        # Now get the metadata. If we don't specify a version, it should be the latest draft (in Studio):
+        check_results(
+            version=None,
+            display_name="Field Test Block (Draft, v4)",
+            settings_field="Draft setting value 4.",
+            content_field="Draft content value 4.",
+        )
+
+        # Get the published version:
+        check_results(
+            version="published",
+            display_name="Field Test Block (Published, v3)",
+            settings_field="Published setting value 3.",
+            content_field="Published content value 3.",
+        )
+
+        # Get a specific version:
+        check_results(
+            version="2",
+            display_name="Field Test Block (Old, v2)",
+            settings_field="Old setting value 2.",
+            content_field="Old content value 2.",
+        )
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_views_collections.py b/openedx/core/djangoapps/content_libraries/tests/test_views_collections.py
new file mode 100644
index 000000000000..43c1627c2c76
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/tests/test_views_collections.py
@@ -0,0 +1,476 @@
+"""
+Tests Library Collections REST API views
+"""
+
+from __future__ import annotations
+import ddt
+
+from openedx_learning.api.authoring_models import Collection
+from opaque_keys.edx.locator import LibraryLocatorV2
+
+from openedx.core.djangolib.testing.utils import skip_unless_cms
+from openedx.core.djangoapps.content_libraries import api
+from openedx.core.djangoapps.content_libraries.tests.base import ContentLibrariesRestApiTest
+from openedx.core.djangoapps.content_libraries.models import ContentLibrary
+from common.djangoapps.student.tests.factories import UserFactory
+
+URL_PREFIX = '/api/libraries/v2/{lib_key}/'
+URL_LIB_COLLECTIONS = URL_PREFIX + 'collections/'
+URL_LIB_COLLECTION = URL_LIB_COLLECTIONS + '{collection_key}/'
+URL_LIB_COLLECTION_RESTORE = URL_LIB_COLLECTIONS + '{collection_key}/restore/'
+URL_LIB_COLLECTION_COMPONENTS = URL_LIB_COLLECTION + 'components/'
+
+
+@ddt.ddt
+@skip_unless_cms  # Content Library Collections REST API is only available in Studio
+class ContentLibraryCollectionsViewsTest(ContentLibrariesRestApiTest):
+    """
+    Tests for Content Library Collection REST API Views
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        # Create Content Libraries
+        self._create_library("test-lib-col-1", "Test Library 1")
+        self._create_library("test-lib-col-2", "Test Library 2")
+        self.lib1 = ContentLibrary.objects.get(slug="test-lib-col-1")
+        self.lib2 = ContentLibrary.objects.get(slug="test-lib-col-2")
+
+        # Create Content Library Collections
+        self.col1 = api.create_library_collection(
+            self.lib1.library_key,
+            "COL1",
+            title="Collection 1",
+            created_by=self.user.id,
+            description="Description for Collection 1",
+        )
+
+        self.col2 = api.create_library_collection(
+            self.lib1.library_key,
+            "COL2",
+            title="Collection 2",
+            created_by=self.user.id,
+            description="Description for Collection 2",
+        )
+        self.col3 = api.create_library_collection(
+            self.lib2.library_key,
+            "COL3",
+            title="Collection 3",
+            created_by=self.user.id,
+            description="Description for Collection 3",
+        )
+
+        # Create some library blocks
+        self.lib1_problem_block = self._add_block_to_library(
+            self.lib1.library_key, "problem", "problem1",
+        )
+        self.lib1_html_block = self._add_block_to_library(
+            self.lib1.library_key, "html", "html1",
+        )
+        self.lib2_problem_block = self._add_block_to_library(
+            self.lib2.library_key, "problem", "problem2",
+        )
+        self.lib2_html_block = self._add_block_to_library(
+            self.lib2.library_key, "html", "html2",
+        )
+
+    def test_get_library_collection(self):
+        """
+        Test retrieving a Content Library Collection
+        """
+        resp = self.client.get(
+            URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key)
+        )
+
+        # Check that correct Content Library Collection data retrieved
+        expected_collection = {
+            "title": "Collection 3",
+            "description": "Description for Collection 3",
+        }
+        assert resp.status_code == 200
+        self.assertDictContainsEntries(resp.data, expected_collection)
+
+        # Check that a random user without permissions cannot access Content Library Collection
+        random_user = UserFactory.create(username="Random", email="random@example.com")
+        with self.as_user(random_user):
+            resp = self.client.get(
+                URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key)
+            )
+            assert resp.status_code == 403
+
+    def test_get_invalid_library_collection(self):
+        """
+        Test retrieving a an invalid Content Library Collection or one that does not exist
+        """
+        # Fetch collection that belongs to a different library, it should fail
+        resp = self.client.get(
+            URL_LIB_COLLECTION.format(lib_key=self.lib1.library_key, collection_key=self.col3.key)
+        )
+
+        assert resp.status_code == 404
+
+        # Fetch collection with invalid ID provided, it should fail
+        resp = self.client.get(
+            URL_LIB_COLLECTION.format(lib_key=self.lib1.library_key, collection_key='123')
+        )
+
+        assert resp.status_code == 404
+
+        # Fetch collection with invalid library_key provided, it should fail
+        resp = self.client.get(
+            URL_LIB_COLLECTION.format(lib_key=123, collection_key='123')
+        )
+        assert resp.status_code == 404
+
+    def test_list_library_collections(self):
+        """
+        Test listing Content Library Collections
+        """
+        resp = self.client.get(URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key))
+
+        # Check that the correct collections are listed
+        assert resp.status_code == 200
+        assert len(resp.data["results"]) == 2
+        expected_collections = [
+            {"key": "COL1", "title": "Collection 1", "description": "Description for Collection 1"},
+            {"key": "COL2", "title": "Collection 2", "description": "Description for Collection 2"},
+        ]
+        for collection, expected in zip(resp.data["results"], expected_collections):
+            self.assertDictContainsEntries(collection, expected)
+
+        # Check that a random user without permissions cannot access Content Library Collections
+        random_user = UserFactory.create(username="Random", email="random@example.com")
+        with self.as_user(random_user):
+            resp = self.client.get(URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key))
+            assert resp.status_code == 403
+
+    def test_list_invalid_library_collections(self):
+        """
+        Test listing invalid Content Library Collections
+        """
+        non_existing_key = LibraryLocatorV2.from_string("lib:DoesNotExist:NE1")
+        resp = self.client.get(URL_LIB_COLLECTIONS.format(lib_key=non_existing_key))
+
+        assert resp.status_code == 404
+
+        # List collections with invalid library_key provided, it should fail
+        resp = resp = self.client.get(URL_LIB_COLLECTIONS.format(lib_key=123))
+        assert resp.status_code == 404
+
+    def test_create_library_collection(self):
+        """
+        Test creating a Content Library Collection
+        """
+        post_data = {
+            "title": "Collection 4",
+            "description": "Description for Collection 4",
+        }
+        resp = self.client.post(
+            URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key), post_data, format="json"
+        )
+        # Check that the new Content Library Collection is returned in response and created in DB
+        assert resp.status_code == 200
+        post_data["key"] = 'collection-4'
+        self.assertDictContainsEntries(resp.data, post_data)
+
+        created_collection = Collection.objects.get(id=resp.data["id"])
+        self.assertIsNotNone(created_collection)
+
+        # Check that user with read only access cannot create new Content Library Collection
+        reader = UserFactory.create(username="Reader", email="reader@example.com")
+        self._add_user_by_email(self.lib1.library_key, reader.email, access_level="read")
+
+        with self.as_user(reader):
+            post_data = {
+                "title": "Collection 5",
+                "description": "Description for Collection 5",
+            }
+            resp = self.client.post(
+                URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key), post_data, format="json"
+            )
+
+            assert resp.status_code == 403
+
+    def test_create_collection_same_key(self):
+        """
+        Test collection creation with same key
+        """
+        post_data = {
+            "title": "Same Collection",
+            "description": "Description for Collection 4",
+        }
+        self.client.post(
+            URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key), post_data, format="json"
+        )
+
+        for i in range(100):
+            resp = self.client.post(
+                URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key), post_data, format="json"
+            )
+            expected_data = {
+                "key": f"same-collection-{i + 1}",
+                "title": "Same Collection",
+                "description": "Description for Collection 4",
+            }
+
+            assert resp.status_code == 200
+            self.assertDictContainsEntries(resp.data, expected_data)
+
+    def test_create_invalid_library_collection(self):
+        """
+        Test creating an invalid Content Library Collection
+        """
+        post_data_missing_title = {
+            "key": "COL_KEY",
+        }
+        resp = self.client.post(
+            URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key), post_data_missing_title, format="json"
+        )
+
+        assert resp.status_code == 400
+
+        post_data_missing_key = {
+            "title": "Collection 4",
+        }
+        resp = self.client.post(
+            URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key), post_data_missing_key, format="json"
+        )
+
+        assert resp.status_code == 400
+
+        # Create collection with an existing collection.key; it should fail
+        post_data_existing_key = {
+            "key": self.col1.key,
+            "title": "Collection 4",
+        }
+        resp = self.client.post(
+            URL_LIB_COLLECTIONS.format(lib_key=self.lib1.library_key),
+            post_data_existing_key,
+            format="json"
+        )
+        assert resp.status_code == 400
+
+        # Create collection with invalid library_key provided, it should fail
+        resp = self.client.post(
+            URL_LIB_COLLECTIONS.format(lib_key=123),
+            {**post_data_missing_title, **post_data_missing_key},
+            format="json"
+        )
+        assert resp.status_code == 404
+
+    def test_update_library_collection(self):
+        """
+        Test updating a Content Library Collection
+        """
+        patch_data = {
+            "title": "Collection 3 Updated",
+        }
+        resp = self.client.patch(
+            URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key),
+            patch_data,
+            format="json"
+        )
+
+        # Check that updated Content Library Collection is returned in response and updated in DB
+        assert resp.status_code == 200
+        self.assertDictContainsEntries(resp.data, patch_data)
+
+        created_collection = Collection.objects.get(id=resp.data["id"])
+        self.assertIsNotNone(created_collection)
+        self.assertEqual(created_collection.title, patch_data["title"])
+
+        # Check that user with read only access cannot update a Content Library Collection
+        reader = UserFactory.create(username="Reader", email="reader@example.com")
+        self._add_user_by_email(self.lib1.library_key, reader.email, access_level="read")
+
+        with self.as_user(reader):
+            patch_data = {
+                "title": "Collection 3 should not update",
+            }
+            resp = self.client.patch(
+                URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key),
+                patch_data,
+                format="json"
+            )
+
+            assert resp.status_code == 403
+
+    def test_update_invalid_library_collection(self):
+        """
+        Test updating an invalid Content Library Collection or one that does not exist
+        """
+        patch_data = {
+            "title": "Collection 3 Updated",
+        }
+        # Update collection that belongs to a different library, it should fail
+        resp = self.client.patch(
+            URL_LIB_COLLECTION.format(lib_key=self.lib1.library_key, collection_key=self.col3.key),
+            patch_data,
+            format="json"
+        )
+
+        assert resp.status_code == 404
+
+        # Update collection with invalid ID provided, it should fail
+        resp = self.client.patch(
+            URL_LIB_COLLECTION.format(lib_key=self.lib1.library_key, collection_key='123'),
+            patch_data,
+            format="json"
+        )
+
+        assert resp.status_code == 404
+
+        # Update collection with invalid library_key provided, it should fail
+        resp = self.client.patch(
+            URL_LIB_COLLECTION.format(lib_key=123, collection_key=self.col3.key),
+            patch_data,
+            format="json"
+        )
+        assert resp.status_code == 404
+
+    def test_delete_library_collection(self):
+        """
+        Test soft-deleting and restoring a Content Library Collection
+        """
+        resp = self.client.delete(
+            URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key)
+        )
+        assert resp.status_code == 204
+
+        resp = self.client.get(
+            URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key)
+        )
+        assert resp.status_code == 404
+
+        resp = self.client.post(
+            URL_LIB_COLLECTION_RESTORE.format(lib_key=self.lib2.library_key, collection_key=self.col3.key)
+        )
+        assert resp.status_code == 204
+
+        resp = self.client.get(
+            URL_LIB_COLLECTION.format(lib_key=self.lib2.library_key, collection_key=self.col3.key)
+        )
+        # Check that correct Content Library Collection data retrieved
+        expected_collection = {
+            "title": "Collection 3",
+            "description": "Description for Collection 3",
+        }
+        assert resp.status_code == 200
+        self.assertDictContainsEntries(resp.data, expected_collection)
+
+    def test_get_components(self):
+        """
+        Retrieving components is not supported by the REST API;
+        use Meilisearch instead.
+        """
+        resp = self.client.get(
+            URL_LIB_COLLECTION_COMPONENTS.format(
+                lib_key=self.lib1.library_key,
+                collection_key=self.col1.key,
+            ),
+        )
+        assert resp.status_code == 405
+
+    def test_update_components(self):
+        """
+        Test adding and removing components from a collection.
+        """
+        # Add two components to col1
+        resp = self.client.patch(
+            URL_LIB_COLLECTION_COMPONENTS.format(
+                lib_key=self.lib1.library_key,
+                collection_key=self.col1.key,
+            ),
+            data={
+                "usage_keys": [
+                    self.lib1_problem_block["id"],
+                    self.lib1_html_block["id"],
+                ]
+            }
+        )
+        assert resp.status_code == 200
+        assert resp.data == {"count": 2}
+
+        # Remove one of the added components from col1
+        resp = self.client.delete(
+            URL_LIB_COLLECTION_COMPONENTS.format(
+                lib_key=self.lib1.library_key,
+                collection_key=self.col1.key,
+            ),
+            data={
+                "usage_keys": [
+                    self.lib1_problem_block["id"],
+                ]
+            }
+        )
+        assert resp.status_code == 200
+        assert resp.data == {"count": 1}
+
+    @ddt.data("patch", "delete")
+    def test_update_components_wrong_collection(self, method):
+        """
+        Collection must belong to the requested library.
+        """
+        resp = getattr(self.client, method)(
+            URL_LIB_COLLECTION_COMPONENTS.format(
+                lib_key=self.lib2.library_key,
+                collection_key=self.col1.key,
+            ),
+            data={
+                "usage_keys": [
+                    self.lib1_problem_block["id"],
+                ]
+            }
+        )
+        assert resp.status_code == 404
+
+    @ddt.data("patch", "delete")
+    def test_update_components_missing_data(self, method):
+        """
+        List of usage keys must contain at least one item.
+        """
+        resp = getattr(self.client, method)(
+            URL_LIB_COLLECTION_COMPONENTS.format(
+                lib_key=self.lib2.library_key,
+                collection_key=self.col3.key,
+            ),
+        )
+        assert resp.status_code == 400
+        assert resp.data == {
+            "usage_keys": ["This field is required."],
+        }
+
+    @ddt.data("patch", "delete")
+    def test_update_components_from_another_library(self, method):
+        """
+        Adding/removing components from another library raises a 404.
+        """
+        resp = getattr(self.client, method)(
+            URL_LIB_COLLECTION_COMPONENTS.format(
+                lib_key=self.lib2.library_key,
+                collection_key=self.col3.key,
+            ),
+            data={
+                "usage_keys": [
+                    self.lib1_problem_block["id"],
+                    self.lib1_html_block["id"],
+                ]
+            }
+        )
+        assert resp.status_code == 404
+
+    @ddt.data("patch", "delete")
+    def test_update_components_permissions(self, method):
+        """
+        Check that a random user without permissions cannot update a Content Library Collection's components.
+        """
+        random_user = UserFactory.create(username="Random", email="random@example.com")
+        with self.as_user(random_user):
+            resp = getattr(self.client, method)(
+                URL_LIB_COLLECTION_COMPONENTS.format(
+                    lib_key=self.lib1.library_key,
+                    collection_key=self.col1.key,
+                ),
+            )
+            assert resp.status_code == 403
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py b/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
index a25d02761dde..b1ee61ca50f9 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
@@ -5,8 +5,6 @@
 from django.conf import settings
 from django.test import TestCase, override_settings
 
-from openedx.core.djangoapps.content_libraries.constants import PROBLEM
-
 from .base import (
     ContentLibrariesRestApiTest,
     URL_LIB_LTI_JWKS,
@@ -60,10 +58,10 @@ def test_lti_url_generation(self):
         """
 
         library = self._create_library(
-            slug="libgg", title="A Test Library", description="Testing library", library_type=PROBLEM,
+            slug="libgg", title="A Test Library", description="Testing library",
         )
 
-        block = self._add_block_to_library(library['id'], PROBLEM, PROBLEM)
+        block = self._add_block_to_library(library['id'], 'problem', 'problem')
         usage_key = str(block['id'])
 
         url = f'/api/libraries/v2/blocks/{usage_key}/lti/'
diff --git a/openedx/core/djangoapps/content_libraries/urls.py b/openedx/core/djangoapps/content_libraries/urls.py
index 6e450df63522..1272d79b3873 100644
--- a/openedx/core/djangoapps/content_libraries/urls.py
+++ b/openedx/core/djangoapps/content_libraries/urls.py
@@ -7,6 +7,7 @@
 from rest_framework import routers
 
 from . import views
+from . import views_collections
 
 
 # Django application name.
@@ -18,6 +19,11 @@
 import_blocks_router = routers.DefaultRouter()
 import_blocks_router.register(r'tasks', views.LibraryImportTaskViewSet, basename='import-block-task')
 
+library_collections_router = routers.DefaultRouter()
+library_collections_router.register(
+    r'collections', views_collections.LibraryCollectionsView, basename="library-collections"
+)
+
 # These URLs are only used in Studio. The LMS already provides all the
 # API endpoints needed to serve XBlocks from content libraries using the
 # standard XBlock REST API (see openedx.core.django_apps.xblock.rest_api.urls)
@@ -45,10 +51,15 @@
             path('import_blocks/', include(import_blocks_router.urls)),
             # Paste contents of clipboard into library
             path('paste_clipboard/', views.LibraryPasteClipboardView.as_view()),
+            # Library Collections
+            path('', include(library_collections_router.urls)),
         ])),
         path('blocks/<str:usage_key_str>/', include([
             # Get metadata about a specific XBlock in this library, or delete the block:
             path('', views.LibraryBlockView.as_view()),
+            path('restore/', views.LibraryBlockRestore.as_view()),
+            # Update collections for a given component
+            path('collections/', views.LibraryBlockCollectionsView.as_view(), name='update-collections'),
             # Get the LTI URL of a specific XBlock
             path('lti/', views.LibraryBlockLtiUrlView.as_view(), name='lti-url'),
             # Get the OLX source code of the specified block:
@@ -56,7 +67,8 @@
             # CRUD for static asset files associated with a block in the library:
             path('assets/', views.LibraryBlockAssetListView.as_view()),
             path('assets/<path:file_path>', views.LibraryBlockAssetView.as_view()),
-            # Future: publish/discard changes for just this one block
+            path('publish/', views.LibraryBlockPublishView.as_view()),
+            # Future: discard changes for just this one block
             # Future: set a block's tags (tags are stored in a Tag bundle and linked in)
         ])),
         re_path(r'^lti/1.3/', include([
@@ -65,4 +77,17 @@
             path('pub/jwks/', views.LtiToolJwksView.as_view(), name='lti-pub-jwks'),
         ])),
     ])),
+    path('library_assets/', include([
+        path(
+            'component_versions/<uuid:component_version_uuid>/<path:asset_path>',
+            views.LibraryComponentAssetView.as_view(),
+            name='library-assets',
+        ),
+        path(
+            'blocks/<usage_v2:usage_key>/<path:asset_path>',
+            views.LibraryComponentDraftAssetView.as_view(),
+            name='library-draft-assets',
+        ),
+    ])
+    ),
 ]
diff --git a/openedx/core/djangoapps/content_libraries/views.py b/openedx/core/djangoapps/content_libraries/views.py
index bde8142d3fcc..4c14651c7961 100644
--- a/openedx/core/djangoapps/content_libraries/views.py
+++ b/openedx/core/djangoapps/content_libraries/views.py
@@ -71,8 +71,9 @@
 from django.conf import settings
 from django.contrib.auth import authenticate, get_user_model, login
 from django.contrib.auth.models import Group
+from django.core.exceptions import ObjectDoesNotExist
 from django.db.transaction import atomic, non_atomic_requests
-from django.http import Http404, HttpResponseBadRequest, JsonResponse
+from django.http import Http404, HttpResponse, HttpResponseBadRequest, JsonResponse, StreamingHttpResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -84,7 +85,9 @@
 from pylti1p3.exception import LtiException, OIDCException
 
 import edx_api_doc_tools as apidocs
+from opaque_keys import InvalidKeyError
 from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
+from openedx_learning.api import authoring
 from organizations.api import ensure_organization
 from organizations.exceptions import InvalidOrganizationException
 from organizations.models import Organization
@@ -105,6 +108,7 @@
     ContentLibraryPermissionLevelSerializer,
     ContentLibraryPermissionSerializer,
     ContentLibraryUpdateSerializer,
+    ContentLibraryComponentCollectionsUpdateSerializer,
     LibraryXBlockCreationSerializer,
     LibraryXBlockMetadataSerializer,
     LibraryXBlockTypeSerializer,
@@ -118,6 +122,7 @@
 from openedx.core.lib.api.view_utils import view_auth_classes
 from openedx.core.djangoapps.safe_sessions.middleware import mark_user_change_as_expected
 from openedx.core.djangoapps.xblock import api as xblock_api
+from openedx.core.types.http import RestRequest
 
 from .models import ContentLibrary, LtiGradedResource, LtiProfile
 
@@ -136,12 +141,21 @@ def convert_exceptions(fn):
     def wrapped_fn(*args, **kwargs):
         try:
             return fn(*args, **kwargs)
+        except InvalidKeyError as exc:
+            log.exception(str(exc))
+            raise NotFound  # lint-amnesty, pylint: disable=raise-missing-from
         except api.ContentLibraryNotFound:
             log.exception("Content library not found")
             raise NotFound  # lint-amnesty, pylint: disable=raise-missing-from
         except api.ContentLibraryBlockNotFound:
             log.exception("XBlock not found in content library")
             raise NotFound  # lint-amnesty, pylint: disable=raise-missing-from
+        except api.ContentLibraryCollectionNotFound:
+            log.exception("Collection not found in content library")
+            raise NotFound  # lint-amnesty, pylint: disable=raise-missing-from
+        except api.LibraryCollectionAlreadyExists as exc:
+            log.exception(str(exc))
+            raise ValidationError(str(exc))  # lint-amnesty, pylint: disable=raise-missing-from
         except api.LibraryBlockAlreadyExists as exc:
             log.exception(str(exc))
             raise ValidationError(str(exc))  # lint-amnesty, pylint: disable=raise-missing-from
@@ -213,14 +227,12 @@ def get(self, request):
         serializer = ContentLibraryFilterSerializer(data=request.query_params)
         serializer.is_valid(raise_exception=True)
         org = serializer.validated_data['org']
-        library_type = serializer.validated_data['type']
         text_search = serializer.validated_data['text_search']
         order = serializer.validated_data['order']
 
         queryset = api.get_libraries_for_user(
             request.user,
             org=org,
-            library_type=library_type,
             text_search=text_search,
             order=order,
         )
@@ -245,7 +257,6 @@ def post(self, request):
         data = dict(serializer.validated_data)
         # Converting this over because using the reserved names 'type' and 'license' would shadow the built-in
         # definitions elsewhere.
-        data['library_type'] = data.pop('type')
         data['library_license'] = data.pop('license')
         key_data = data.pop("key")
         # Move "slug" out of the "key.slug" pseudo-field that the serializer added:
@@ -299,8 +310,6 @@ def patch(self, request, lib_key_str):
         serializer.is_valid(raise_exception=True)
         data = dict(serializer.validated_data)
         # Prevent ourselves from shadowing global names.
-        if 'type' in data:
-            data['library_type'] = data.pop('type')
         if 'license' in data:
             data['library_license'] = data.pop('license')
         try:
@@ -603,11 +612,17 @@ class LibraryBlockView(APIView):
     @convert_exceptions
     def get(self, request, usage_key_str):
         """
-        Get metadata about an existing XBlock in the content library
+        Get metadata about an existing XBlock in the content library.
+
+        This API doesn't support versioning; most of the information it returns
+        is related to the latest draft version, or to all versions of the block.
+        If you need to get the display name of a previous version, use the
+        similar "metadata" API from djangoapps.xblock, which does support
+        versioning.
         """
         key = LibraryUsageLocatorV2.from_string(usage_key_str)
         api.require_permission_for_library_key(key.lib_key, request.user, permissions.CAN_VIEW_THIS_CONTENT_LIBRARY)
-        result = api.get_library_block(key)
+        result = api.get_library_block(key, include_collections=True)
 
         return Response(LibraryXBlockMetadataSerializer(result).data)
 
@@ -630,6 +645,57 @@ def delete(self, request, usage_key_str):  # pylint: disable=unused-argument
         return Response({})
 
 
+@view_auth_classes()
+class LibraryBlockRestore(APIView):
+    """
+    View to restore soft-deleted library xblocks.
+    """
+    @convert_exceptions
+    def post(self, request, usage_key_str) -> Response:
+        """
+        Restores a soft-deleted library block that belongs to a Content Library
+        """
+        key = LibraryUsageLocatorV2.from_string(usage_key_str)
+        api.require_permission_for_library_key(key.lib_key, request.user, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY)
+        api.restore_library_block(key)
+        return Response(None, status=status.HTTP_204_NO_CONTENT)
+
+
+@method_decorator(non_atomic_requests, name="dispatch")
+@view_auth_classes()
+class LibraryBlockCollectionsView(APIView):
+    """
+    View to set collections for a component.
+    """
+    @convert_exceptions
+    def patch(self, request: RestRequest, usage_key_str) -> Response:
+        """
+        Sets Collections for a Component.
+
+        Collection and Components must all be part of the given library/learning package.
+        """
+        key = LibraryUsageLocatorV2.from_string(usage_key_str)
+        content_library = api.require_permission_for_library_key(
+            key.lib_key,
+            request.user,
+            permissions.CAN_EDIT_THIS_CONTENT_LIBRARY
+        )
+        component = api.get_component_from_usage_key(key)
+        serializer = ContentLibraryComponentCollectionsUpdateSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        collection_keys = serializer.validated_data['collection_keys']
+        api.set_library_component_collections(
+            library_key=key.lib_key,
+            component=component,
+            collection_keys=collection_keys,
+            created_by=request.user.id,
+            content_library=content_library,
+        )
+
+        return Response({'count': len(collection_keys)})
+
+
 @method_decorator(non_atomic_requests, name="dispatch")
 @view_auth_classes()
 class LibraryBlockLtiUrlView(APIView):
@@ -661,6 +727,9 @@ class LibraryBlockOlxView(APIView):
     @convert_exceptions
     def get(self, request, usage_key_str):
         """
+        DEPRECATED. Use get_block_olx_view() in xblock REST-API.
+        Can be removed post-Teak.
+
         Get the block's OLX
         """
         key = LibraryUsageLocatorV2.from_string(usage_key_str)
@@ -682,10 +751,10 @@ def post(self, request, usage_key_str):
         serializer.is_valid(raise_exception=True)
         new_olx_str = serializer.validated_data["olx"]
         try:
-            api.set_library_block_olx(key, new_olx_str)
+            version_num = api.set_library_block_olx(key, new_olx_str).version_num
         except ValueError as err:
             raise ValidationError(detail=str(err))  # lint-amnesty, pylint: disable=raise-missing-from
-        return Response(LibraryXBlockOlxSerializer({"olx": new_olx_str}).data)
+        return Response(LibraryXBlockOlxSerializer({"olx": new_olx_str, "version_num": version_num}).data)
 
 
 @method_decorator(non_atomic_requests, name="dispatch")
@@ -731,6 +800,7 @@ def put(self, request, usage_key_str, file_path):
         """
         Replace a static asset file belonging to this block.
         """
+        file_path = file_path.replace(" ", "_")  # Messes up url/name correspondence due to URL encoding.
         usage_key = LibraryUsageLocatorV2.from_string(usage_key_str)
         api.require_permission_for_library_key(
             usage_key.lib_key, request.user, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY,
@@ -746,7 +816,7 @@ def put(self, request, usage_key_str, file_path):
             raise ValidationError("File too big")
         file_content = file_wrapper.read()
         try:
-            result = api.add_library_block_static_asset_file(usage_key, file_path, file_content)
+            result = api.add_library_block_static_asset_file(usage_key, file_path, file_content, request.user)
         except ValueError:
             raise ValidationError("Invalid file path")  # lint-amnesty, pylint: disable=raise-missing-from
         return Response(LibraryXBlockStaticFileSerializer(result).data)
@@ -761,12 +831,26 @@ def delete(self, request, usage_key_str, file_path):
             usage_key.lib_key, request.user, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY,
         )
         try:
-            api.delete_library_block_static_asset_file(usage_key, file_path)
+            api.delete_library_block_static_asset_file(usage_key, file_path, request.user)
         except ValueError:
             raise ValidationError("Invalid file path")  # lint-amnesty, pylint: disable=raise-missing-from
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+@method_decorator(non_atomic_requests, name="dispatch")
+@view_auth_classes()
+class LibraryBlockPublishView(APIView):
+    """
+    Commit/publish all of the draft changes made to the component.
+    """
+
+    @convert_exceptions
+    def post(self, request, usage_key_str):
+        key = LibraryUsageLocatorV2.from_string(usage_key_str)
+        api.publish_component_changes(key, request.user)
+        return Response({})
+
+
 @method_decorator(non_atomic_requests, name="dispatch")
 @view_auth_classes()
 class LibraryImportTaskViewSet(GenericViewSet):
@@ -909,7 +993,7 @@ class LtiToolLaunchView(TemplateResponseMixin, LtiToolView):
     LTI platform.  Other features and resouces are ignored.
     """
 
-    template_name = 'content_libraries/xblock_iframe.html'
+    template_name = 'xblock_v2/xblock_iframe.html'
 
     @property
     def launch_data(self):
@@ -1097,3 +1181,105 @@ def get(self, request):
         Return the JWKS.
         """
         return JsonResponse(self.lti_tool_config.get_jwks(), safe=False)
+
+
+def get_component_version_asset(request, component_version_uuid, asset_path):
+    """
+    Serves static assets associated with particular Component versions.
+
+    Important notes:
+    * This is meant for Studio/authoring use ONLY. It requires read access to
+      the content library.
+    * It uses the UUID because that's easier to parse than the key field (which
+      could be part of an OpaqueKey, but could also be almost anything else).
+    * This is not very performant, and we still want to use the X-Accel-Redirect
+      method for serving LMS traffic in the longer term (and probably Studio
+      eventually).
+    """
+    try:
+        component_version = authoring.get_component_version_by_uuid(
+            component_version_uuid
+        )
+    except ObjectDoesNotExist as exc:
+        raise Http404() from exc
+
+    # Permissions check...
+    learning_package = component_version.component.learning_package
+    library_key = LibraryLocatorV2.from_string(learning_package.key)
+    api.require_permission_for_library_key(
+        library_key, request.user, permissions.CAN_VIEW_THIS_CONTENT_LIBRARY,
+    )
+
+    # We already have logic for getting the correct content and generating the
+    # proper headers in Learning Core, but the response generated here is an
+    # X-Accel-Redirect and lacks the actual content. We eventually want to use
+    # this response in conjunction with a media reverse proxy (Caddy or Nginx),
+    # but in the short term we're just going to remove the redirect and stream
+    # the content directly.
+    redirect_response = authoring.get_redirect_response_for_component_asset(
+        component_version_uuid,
+        asset_path,
+        public=False,
+    )
+
+    # If there was any error, we return that response because it will have the
+    # correct headers set and won't have any X-Accel-Redirect header set.
+    if redirect_response.status_code != 200:
+        return redirect_response
+
+    # If we got here, we know that the asset exists and it's okay to download.
+    cv_content = component_version.componentversioncontent_set.get(key=asset_path)
+    content = cv_content.content
+
+    # Delete the re-direct part of the response headers. We'll copy the rest.
+    headers = redirect_response.headers
+    headers.pop('X-Accel-Redirect')
+
+    # We need to set the content size header manually because this is a
+    # streaming response. It's not included in the redirect headers because it's
+    # not needed there (the reverse-proxy would have direct access to the file).
+    headers['Content-Length'] = content.size
+
+    if request.method == "HEAD":
+        return HttpResponse(headers=headers)
+
+    # Otherwise it's going to be a GET response. We don't support response
+    # offsets or anything fancy, because we don't expect to run this view at
+    # LMS-scale.
+    return StreamingHttpResponse(
+        content.read_file().chunks(),
+        headers=redirect_response.headers,
+    )
+
+
+@view_auth_classes()
+class LibraryComponentAssetView(APIView):
+    """
+    Serves static assets associated with particular Component versions.
+    """
+    @convert_exceptions
+    def get(self, request, component_version_uuid, asset_path):
+        """
+        GET API for fetching static asset for given component_version_uuid.
+        """
+        return get_component_version_asset(request, component_version_uuid, asset_path)
+
+
+@view_auth_classes()
+class LibraryComponentDraftAssetView(APIView):
+    """
+    Serves the draft version of static assets associated with a Library Component.
+
+    See `get_component_version_asset` for more details
+    """
+    @convert_exceptions
+    def get(self, request, usage_key, asset_path):
+        """
+        Fetches component_version_uuid for given usage_key and returns component asset.
+        """
+        try:
+            component_version_uuid = api.get_component_from_usage_key(usage_key).versioning.draft.uuid
+        except ObjectDoesNotExist as exc:
+            raise Http404() from exc
+
+        return get_component_version_asset(request, component_version_uuid, asset_path)
diff --git a/openedx/core/djangoapps/content_libraries/views_collections.py b/openedx/core/djangoapps/content_libraries/views_collections.py
new file mode 100644
index 000000000000..21c4b12dd3da
--- /dev/null
+++ b/openedx/core/djangoapps/content_libraries/views_collections.py
@@ -0,0 +1,217 @@
+"""
+Collections API Views
+"""
+
+from __future__ import annotations
+
+from django.db.models import QuerySet
+from django.utils.text import slugify
+from django.db import transaction
+
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from rest_framework.viewsets import ModelViewSet
+from rest_framework.status import HTTP_204_NO_CONTENT
+
+from opaque_keys.edx.locator import LibraryLocatorV2
+from openedx_learning.api import authoring as authoring_api
+from openedx_learning.api.authoring_models import Collection
+
+from openedx.core.djangoapps.content_libraries import api, permissions
+from openedx.core.djangoapps.content_libraries.models import ContentLibrary
+from openedx.core.djangoapps.content_libraries.views import convert_exceptions
+from openedx.core.djangoapps.content_libraries.serializers import (
+    ContentLibraryCollectionSerializer,
+    ContentLibraryCollectionComponentsUpdateSerializer,
+    ContentLibraryCollectionUpdateSerializer,
+)
+from openedx.core.types.http import RestRequest
+
+
+class LibraryCollectionsView(ModelViewSet):
+    """
+    Views to get, create and update Library Collections.
+    """
+
+    serializer_class = ContentLibraryCollectionSerializer
+    lookup_field = 'key'
+
+    def __init__(self, *args, **kwargs) -> None:
+        """
+        Caches the ContentLibrary for the duration of the request.
+        """
+        super().__init__(*args, **kwargs)
+        self._content_library: ContentLibrary | None = None
+
+    def get_content_library(self) -> ContentLibrary:
+        """
+        Returns the requested ContentLibrary object, if access allows.
+        """
+        if self._content_library:
+            return self._content_library
+
+        lib_key_str = self.kwargs["lib_key_str"]
+        library_key = LibraryLocatorV2.from_string(lib_key_str)
+        permission = (
+            permissions.CAN_VIEW_THIS_CONTENT_LIBRARY
+            if self.request.method in ['OPTIONS', 'GET']
+            else permissions.CAN_EDIT_THIS_CONTENT_LIBRARY
+        )
+
+        self._content_library = api.require_permission_for_library_key(
+            library_key,
+            self.request.user,
+            permission,
+        )
+        return self._content_library
+
+    def get_queryset(self) -> QuerySet[Collection]:
+        """
+        Returns a queryset for the requested Collections, if access allows.
+
+        This method may raise exceptions; these are handled by the @convert_exceptions wrapper on the views.
+        """
+        content_library = self.get_content_library()
+        assert content_library.learning_package_id
+        return authoring_api.get_collections(content_library.learning_package_id)
+
+    def get_object(self) -> Collection:
+        """
+        Returns the requested Collections, if access allows.
+
+        This method may raise exceptions; these are handled by the @convert_exceptions wrapper on the views.
+        """
+        collection = super().get_object()
+        content_library = self.get_content_library()
+
+        # Ensure the ContentLibrary and Collection share the same learning package
+        if collection.learning_package_id != content_library.learning_package_id:
+            raise api.ContentLibraryCollectionNotFound
+        return collection
+
+    @convert_exceptions
+    def retrieve(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        Retrieve the Content Library Collection
+        """
+        # View declared so we can wrap it in @convert_exceptions
+        return super().retrieve(request, *args, **kwargs)
+
+    @convert_exceptions
+    def list(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        List Collections that belong to Content Library
+        """
+        # View declared so we can wrap it in @convert_exceptions
+        return super().list(request, *args, **kwargs)
+
+    @convert_exceptions
+    def create(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        Create a Collection that belongs to a Content Library
+        """
+        content_library = self.get_content_library()
+        create_serializer = ContentLibraryCollectionUpdateSerializer(data=request.data)
+        create_serializer.is_valid(raise_exception=True)
+
+        title = create_serializer.validated_data['title']
+        key = slugify(title)
+
+        attempt = 0
+        collection = None
+        while not collection:
+            modified_key = key if attempt == 0 else key + '-' + str(attempt)
+            try:
+                # Add transaction here to avoid TransactionManagementError on retry
+                with transaction.atomic():
+                    collection = api.create_library_collection(
+                        library_key=content_library.library_key,
+                        content_library=content_library,
+                        collection_key=modified_key,
+                        title=title,
+                        description=create_serializer.validated_data["description"],
+                        created_by=request.user.id,
+                    )
+            except api.LibraryCollectionAlreadyExists:
+                attempt += 1
+
+        serializer = self.get_serializer(collection)
+
+        return Response(serializer.data)
+
+    @convert_exceptions
+    def partial_update(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        Update a Collection that belongs to a Content Library
+        """
+        content_library = self.get_content_library()
+        collection_key = kwargs["key"]
+
+        update_serializer = ContentLibraryCollectionUpdateSerializer(
+            data=request.data, partial=True
+        )
+        update_serializer.is_valid(raise_exception=True)
+        updated_collection = api.update_library_collection(
+            library_key=content_library.library_key,
+            collection_key=collection_key,
+            content_library=content_library,
+            **update_serializer.validated_data
+        )
+        serializer = self.get_serializer(updated_collection)
+
+        return Response(serializer.data)
+
+    @convert_exceptions
+    def destroy(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        Soft-deletes a Collection that belongs to a Content Library
+        """
+        collection = super().get_object()
+        assert collection.learning_package_id
+        authoring_api.delete_collection(
+            collection.learning_package_id,
+            collection.key,
+            hard_delete=False,
+        )
+        return Response(None, status=HTTP_204_NO_CONTENT)
+
+    @convert_exceptions
+    @action(detail=True, methods=['post'], url_path='restore', url_name='collection-restore')
+    def restore(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        Restores a soft-deleted Collection that belongs to a Content Library
+        """
+        content_library = self.get_content_library()
+        assert content_library.learning_package_id
+        collection_key = kwargs["key"]
+        authoring_api.restore_collection(
+            content_library.learning_package_id,
+            collection_key,
+        )
+        return Response(None, status=HTTP_204_NO_CONTENT)
+
+    @convert_exceptions
+    @action(detail=True, methods=['delete', 'patch'], url_path='components', url_name='components-update')
+    def update_components(self, request: RestRequest, *args, **kwargs) -> Response:
+        """
+        Adds (PATCH) or removes (DELETE) Components to/from a Collection.
+
+        Collection and Components must all be part of the given library/learning package.
+        """
+        content_library = self.get_content_library()
+        collection_key = kwargs["key"]
+
+        serializer = ContentLibraryCollectionComponentsUpdateSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        usage_keys = serializer.validated_data["usage_keys"]
+        api.update_library_collection_components(
+            library_key=content_library.library_key,
+            content_library=content_library,
+            collection_key=collection_key,
+            usage_keys=usage_keys,
+            created_by=request.user.id,
+            remove=(request.method == "DELETE"),
+        )
+
+        return Response({'count': len(usage_keys)})
diff --git a/openedx/core/djangoapps/content_staging/api.py b/openedx/core/djangoapps/content_staging/api.py
index 8632d0cb0740..5f85d701faa5 100644
--- a/openedx/core/djangoapps/content_staging/api.py
+++ b/openedx/core/djangoapps/content_staging/api.py
@@ -13,7 +13,7 @@
 from opaque_keys.edx.keys import AssetKey, UsageKey
 from xblock.core import XBlock
 
-from openedx.core.lib.xblock_serializer.api import serialize_xblock_to_olx, StaticFile
+from openedx.core.lib.xblock_serializer.api import StaticFile, XBlockSerializer
 from openedx.core.djangoapps.content.course_overviews.api import get_course_overview_or_none
 from xmodule import block_metadata_utils
 from xmodule.contentstore.content import StaticContent
@@ -34,11 +34,14 @@
 log = logging.getLogger(__name__)
 
 
-def save_xblock_to_user_clipboard(block: XBlock, user_id: int) -> UserClipboardData:
+def save_xblock_to_user_clipboard(block: XBlock, user_id: int, version_num: int | None = None) -> UserClipboardData:
     """
     Copy an XBlock's OLX to the user's clipboard.
     """
-    block_data = serialize_xblock_to_olx(block)
+    block_data = XBlockSerializer(
+        block,
+        fetch_asset_data=True,
+    )
     usage_key = block.usage_key
 
     expired_ids = []
@@ -63,7 +66,8 @@ def save_xblock_to_user_clipboard(block: XBlock, user_id: int) -> UserClipboardD
             olx=block_data.olx_str,
             display_name=block_metadata_utils.display_name_with_default(block),
             suggested_url_name=usage_key.block_id,
-            tags=block_data.tags,
+            tags=block_data.tags or {},
+            version_num=(version_num or 0),
         )
         (clipboard, _created) = _UserClipboard.objects.update_or_create(user_id=user_id, defaults={
             "content": staged_content,
@@ -178,6 +182,7 @@ def get_user_clipboard_json(user_id: int, request: HttpRequest | None = None):
     except _UserClipboard.DoesNotExist:
         # This user does not have any content on their clipboard.
         return {"content": None, "source_usage_key": "", "source_context_title": "", "source_edit_url": ""}
+
     serializer = _UserClipboardSerializer(
         _user_clipboard_model_to_data(clipboard),
         context={'request': request},
@@ -204,7 +209,8 @@ def _user_clipboard_model_to_data(clipboard: _UserClipboard) -> UserClipboardDat
             status=content.status,
             block_type=content.block_type,
             display_name=content.display_name,
-            tags=content.tags,
+            tags=content.tags or {},
+            version_num=content.version_num,
         ),
         source_usage_key=clipboard.source_usage_key,
         source_context_title=clipboard.get_source_context_title(),
diff --git a/openedx/core/djangoapps/content_staging/data.py b/openedx/core/djangoapps/content_staging/data.py
index e952357f4cf9..d077d05a0aa4 100644
--- a/openedx/core/djangoapps/content_staging/data.py
+++ b/openedx/core/djangoapps/content_staging/data.py
@@ -43,6 +43,7 @@ class StagedContentData:
     block_type: str = field(validator=validators.instance_of(str))
     display_name: str = field(validator=validators.instance_of(str))
     tags: dict = field(validator=validators.optional(validators.instance_of(dict)))
+    version_num: int = field(validator=validators.instance_of(int))
 
 
 @frozen
diff --git a/openedx/core/djangoapps/content_staging/migrations/0005_stagedcontent_version_num.py b/openedx/core/djangoapps/content_staging/migrations/0005_stagedcontent_version_num.py
new file mode 100644
index 000000000000..c3438ecb813b
--- /dev/null
+++ b/openedx/core/djangoapps/content_staging/migrations/0005_stagedcontent_version_num.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-10-09 16:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('content_staging', '0004_stagedcontent_tags'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stagedcontent',
+            name='version_num',
+            field=models.PositiveIntegerField(default=0),
+        ),
+    ]
diff --git a/openedx/core/djangoapps/content_staging/models.py b/openedx/core/djangoapps/content_staging/models.py
index 334fc1c6b5d3..5e007bc4485a 100644
--- a/openedx/core/djangoapps/content_staging/models.py
+++ b/openedx/core/djangoapps/content_staging/models.py
@@ -63,9 +63,13 @@ class Meta:
     # A _suggested_ URL name to use for this content. Since this suggestion may already be in use, it's fine to generate
     # a new url_name instead.
     suggested_url_name = models.CharField(max_length=1024)
+    # If applicable, an int >=1 indicating the version of copied content. If not applicable, zero (default).
+    version_num = models.PositiveIntegerField(default=0)
 
     # Tags applied to the original source block(s) will be copied to the new block(s) on paste.
-    tags = models.JSONField(null=True, help_text=_("Content tags applied to these blocks"))
+    tags: models.JSONField[dict | None, dict | None] = models.JSONField(
+        null=True, help_text=_("Content tags applied to these blocks")
+    )
 
     @property
     def olx_filename(self) -> str:
diff --git a/openedx/core/djangoapps/content_staging/tests/test_clipboard.py b/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
index 00c4466b7d48..551f94e90e1a 100644
--- a/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
+++ b/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
@@ -159,7 +159,7 @@ def test_copy_html(self):
             <html url_name="toyhtml" display_name="Text"><![CDATA[
             <a href='/static/handouts/sample_handout.txt'>Sample</a>
             ]]></html>
-        """).lstrip()
+        """).replace("\n", "") + "\n"  # No newlines, expect one trailing newline.
 
         # Now if we GET the clipboard again, the GET response should exactly equal the last POST response:
         assert client.get(CLIPBOARD_ENDPOINT).json() == response_data
diff --git a/openedx/core/djangoapps/content_staging/views.py b/openedx/core/djangoapps/content_staging/views.py
index 1b9790cfbeee..2a08ccfd3873 100644
--- a/openedx/core/djangoapps/content_staging/views.py
+++ b/openedx/core/djangoapps/content_staging/views.py
@@ -101,6 +101,7 @@ def post(self, request):
                         "You must be a member of the course team in Studio to export OLX using this API."
                     )
                 block = modulestore().get_item(usage_key)
+                version_num = None
 
             elif isinstance(course_key, LibraryLocatorV2):
                 lib_api.require_permission_for_library_key(
@@ -109,6 +110,7 @@ def post(self, request):
                     lib_api.permissions.CAN_VIEW_THIS_CONTENT_LIBRARY
                 )
                 block = xblock_api.load_block(usage_key, user=None)
+                version_num = lib_api.get_library_block(usage_key).draft_version_num
 
             else:
                 raise ValidationError("Invalid usage_key for the content.")
@@ -116,7 +118,7 @@ def post(self, request):
         except ItemNotFoundError as exc:
             raise NotFound("The requested usage key does not exist.") from exc
 
-        clipboard = api.save_xblock_to_user_clipboard(block=block, user_id=request.user.id)
+        clipboard = api.save_xblock_to_user_clipboard(block=block, version_num=version_num, user_id=request.user.id)
 
         # Return the current clipboard exactly as if GET was called:
         serializer = UserClipboardSerializer(clipboard, context={"request": request})
diff --git a/openedx/core/djangoapps/content_tagging/api.py b/openedx/core/djangoapps/content_tagging/api.py
index 47b157c1a34e..8a06e483ab78 100644
--- a/openedx/core/djangoapps/content_tagging/api.py
+++ b/openedx/core/djangoapps/content_tagging/api.py
@@ -12,14 +12,17 @@
 import openedx_tagging.core.tagging.api as oel_tagging
 from django.db.models import Exists, OuterRef, Q, QuerySet
 from django.utils.timezone import now
-from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.keys import CourseKey, LibraryCollectionKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import ObjectTag, Taxonomy
 from openedx_tagging.core.tagging.models.utils import TAGS_CSV_SEPARATOR
 from organizations.models import Organization
 from .helpers.objecttag_export_helpers import build_object_tree_with_objecttags, iterate_with_level
-from openedx_events.content_authoring.data import ContentObjectData
-from openedx_events.content_authoring.signals import CONTENT_OBJECT_TAGS_CHANGED
+from openedx_events.content_authoring.data import ContentObjectData, ContentObjectChangedData
+from openedx_events.content_authoring.signals import (
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+    CONTENT_OBJECT_TAGS_CHANGED,
+)
 
 from .models import TaxonomyOrg
 from .types import ContentKey, TagValuesByObjectIdDict, TagValuesByTaxonomyIdDict, TaxonomyDict
@@ -227,7 +230,7 @@ def generate_csv_rows(object_id, buffer) -> Iterator[str]:
     """
     content_key = get_content_key_from_string(object_id)
 
-    if isinstance(content_key, UsageKey):
+    if isinstance(content_key, (UsageKey, LibraryCollectionKey)):
         raise ValueError("The object_id must be a CourseKey or a LibraryLocatorV2.")
 
     all_object_tags, taxonomies = get_all_object_tags(content_key)
@@ -301,6 +304,16 @@ def set_exported_object_tags(
             create_invalid=True,
             taxonomy_export_id=str(taxonomy_export_id),
         )
+
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.send_event(
+            time=now(),
+            content_object=ContentObjectChangedData(
+                object_id=content_key_str,
+                changes=["tags"],
+            )
+        )
+
+        # Emit a (deprecated) CONTENT_OBJECT_TAGS_CHANGED event too
         CONTENT_OBJECT_TAGS_CHANGED.send_event(
             time=now(),
             content_object=ContentObjectData(object_id=content_key_str)
@@ -378,7 +391,7 @@ def tag_object(
     Replaces the existing ObjectTag entries for the given taxonomy + object_id
     with the given list of tags, if the taxonomy can be used by the given object_id.
 
-    This is a wrapper around oel_tagging.tag_object that adds emitting the `CONTENT_OBJECT_TAGS_CHANGED` event
+    This is a wrapper around oel_tagging.tag_object that adds emitting the `CONTENT_OBJECT_ASSOCIATIONS_CHANGED` event
     when tagging an object.
 
     tags: A list of the values of the tags from this taxonomy to apply.
@@ -399,6 +412,15 @@ def tag_object(
             taxonomy=taxonomy,
             tags=tags,
         )
+        CONTENT_OBJECT_ASSOCIATIONS_CHANGED.send_event(
+            time=now(),
+            content_object=ContentObjectChangedData(
+                object_id=object_id,
+                changes=["tags"],
+            )
+        )
+
+        # Emit a (deprecated) CONTENT_OBJECT_TAGS_CHANGED event too
         CONTENT_OBJECT_TAGS_CHANGED.send_event(
             time=now(),
             content_object=ContentObjectData(object_id=object_id)
@@ -418,3 +440,4 @@ def tag_object(
 resync_object_tags = oel_tagging.resync_object_tags
 get_object_tags = oel_tagging.get_object_tags
 add_tag_to_taxonomy = oel_tagging.add_tag_to_taxonomy
+copy_tags_as_read_only = oel_tagging.copy_tags
diff --git a/openedx/core/djangoapps/content_tagging/handlers.py b/openedx/core/djangoapps/content_tagging/handlers.py
index cc86f7e0dcd6..86cbb7167cbe 100644
--- a/openedx/core/djangoapps/content_tagging/handlers.py
+++ b/openedx/core/djangoapps/content_tagging/handlers.py
@@ -20,7 +20,6 @@
     XBLOCK_DUPLICATED,
     LIBRARY_BLOCK_CREATED,
     LIBRARY_BLOCK_UPDATED,
-    LIBRARY_BLOCK_DELETED,
 )
 
 from .api import copy_object_tags
@@ -30,7 +29,6 @@
     update_course_tags,
     update_xblock_tags,
     update_library_block_tags,
-    delete_library_block_tags,
 )
 from .toggles import CONTENT_TAGGING_AUTO
 
@@ -119,22 +117,6 @@ def auto_tag_library_block(**kwargs):
     )
 
 
-@receiver(LIBRARY_BLOCK_DELETED)
-def delete_tag_library_block(**kwargs):
-    """
-    Delete tags associated with a Library XBlock whenever the block is deleted.
-    """
-    library_block_data = kwargs.get("library_block", None)
-    if not library_block_data or not isinstance(library_block_data, LibraryBlockData):
-        log.error("Received null or incorrect data for event")
-        return
-
-    try:
-        delete_library_block_tags(str(library_block_data.usage_key))
-    except Exception as err:  # pylint: disable=broad-except
-        log.error(f"Failed to delete library block tags: {err}")
-
-
 @receiver(XBLOCK_DUPLICATED)
 def duplicate_tags(**kwargs):
     """
diff --git a/openedx/core/djangoapps/content_tagging/models/base.py b/openedx/core/djangoapps/content_tagging/models/base.py
index 8a232d3a7bf4..d799d8795194 100644
--- a/openedx/core/djangoapps/content_tagging/models/base.py
+++ b/openedx/core/djangoapps/content_tagging/models/base.py
@@ -16,6 +16,8 @@ class TaxonomyOrg(models.Model):
 
     We keep this as a separate class from ContentTaxonomy so that class can remain a proxy for Taxonomy, keeping the
     data models and usage simple.
+
+    .. no_pii:
     """
 
     class RelType(models.TextChoices):
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 8bd26230855a..849d3891f207 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py
@@ -7,6 +7,7 @@
 from rest_framework import serializers, fields
 
 from openedx_tagging.core.tagging.rest_api.v1.serializers import (
+    ObjectTagMinimalSerializer,
     TaxonomyListQueryParamsSerializer,
     TaxonomySerializer,
 )
@@ -94,3 +95,24 @@ class Meta:
         model = TaxonomySerializer.Meta.model
         fields = TaxonomySerializer.Meta.fields + ["orgs", "all_orgs"]
         read_only_fields = ["orgs", "all_orgs"]
+
+
+class ObjectTagCopiedMinimalSerializer(ObjectTagMinimalSerializer):
+    """
+    Serializer for Object Tags.
+
+    This override `get_can_delete_objecttag` to avoid delete
+    object tags if is copied.
+    """
+
+    def get_can_delete_objecttag(self, instance):
+        """
+        Verify if the user can delete the object tag.
+
+        Override to return `False` if the object tag is copied.
+        """
+        if instance.is_copied:
+            # The user can't delete copied tags.
+            return False
+
+        return super().get_can_delete_objecttag(instance)
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 f64fba5c3358..5a99868ece66 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
@@ -13,7 +13,8 @@
 import ddt
 from django.contrib.auth import get_user_model
 from django.core.files.uploadedfile import SimpleUploadedFile
-from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
+from edx_django_utils.cache import RequestCache
+from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator, LibraryCollectionLocator
 from openedx_tagging.core.tagging.models import Tag, Taxonomy
 from openedx_tagging.core.tagging.models.system_defined import SystemDefinedTaxonomy
 from openedx_tagging.core.tagging.rest_api.v1.serializers import TaxonomySerializer
@@ -34,7 +35,6 @@
 from openedx.core.djangoapps.content_libraries.api import AccessLevel, create_library, set_library_user_permissions
 from openedx.core.djangoapps.content_tagging import api as tagging_api
 from openedx.core.djangoapps.content_tagging.models import TaxonomyOrg
-from openedx.core.djangoapps.content_tagging.utils import rules_cache
 from openedx.core.djangolib.testing.utils import skip_unless_cms
 
 from ....tests.test_objecttag_export_helpers import TaggedCourseMixin
@@ -111,6 +111,9 @@ def _setUp_library(self):
         )
         self.libraryA = str(self.content_libraryA.key)
 
+    def _setUp_collection(self):
+        self.collection_key = str(LibraryCollectionLocator(self.content_libraryA.key, 'test-collection'))
+
     def _setUp_users(self):
         """
         Create users for testing
@@ -284,9 +287,10 @@ def setUp(self):
         self._setUp_library()
         self._setUp_users()
         self._setUp_taxonomies()
+        self._setUp_collection()
 
-        # Clear the rules cache in between test runs to keep query counts consistent.
-        rules_cache.clear()
+        # Clear all request caches in between test runs to keep query counts consistent.
+        RequestCache.clear_all_namespaces()
 
 
 @skip_unless_cms
@@ -506,12 +510,12 @@ def test_create_taxonomy(self, user_attr: str, expected_status: int) -> None:
 
     @ddt.data(
         ('staff', 11),
-        ("content_creatorA", 16),
-        ("library_staffA", 16),
-        ("library_userA", 16),
-        ("instructorA", 16),
-        ("course_instructorA", 16),
-        ("course_staffA", 16),
+        ("content_creatorA", 17),
+        ("library_staffA", 17),
+        ("library_userA", 17),
+        ("instructorA", 17),
+        ("course_instructorA", 17),
+        ("course_staffA", 17),
     )
     @ddt.unpack
     def test_list_taxonomy_query_count(self, user_attr: str, expected_queries: int):
@@ -1653,6 +1657,87 @@ def test_tag_library_invalid(self, user_attr, taxonomy_attr):
         response = self._call_put_request(self.libraryA, taxonomy.pk, ["invalid"])
         assert response.status_code == status.HTTP_400_BAD_REQUEST
 
+    @ddt.data(
+        # staffA and staff are staff in collection and can tag using enabled taxonomies
+        ("user", "tA1", ["Tag 1"], 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),
+        ("staffA", "tA1", [], status.HTTP_200_OK),
+        ("staff", "tA1", [], status.HTTP_200_OK),
+        ("user", "multiple_taxonomy", ["Tag 1", "Tag 2"], 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),
+        ("staffA", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
+        ("staff", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
+    )
+    @ddt.unpack
+    def test_tag_collection(self, user_attr, taxonomy_attr, tag_values, expected_status):
+        """
+        Tests that only staff and org level users can tag collections
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        taxonomy = getattr(self, taxonomy_attr)
+
+        response = self._call_put_request(self.collection_key, taxonomy.pk, tag_values)
+
+        assert response.status_code == expected_status
+        if status.is_success(expected_status):
+            tags_by_taxonomy = response.data[str(self.collection_key)]["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
+            url = OBJECT_TAG_UPDATE_URL.format(object_id=self.collection_key)
+            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_collection_disabled_taxonomy(self, user_attr):
+        """
+        Nobody can use disabled 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
+
+        response = self._call_put_request(self.collection_key, disabled_taxonomy.pk, ["Tag 1"])
+
+        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_collection_invalid(self, user_attr, taxonomy_attr):
+        """
+        Tests that nobody can add invalid tags to a collection using a closed taxonomy
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        taxonomy = getattr(self, taxonomy_attr)
+
+        response = self._call_put_request(self.collection_key, taxonomy.pk, ["invalid"])
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+
     @ddt.data(
         ("superuser", status.HTTP_200_OK),
         ("staff", status.HTTP_403_FORBIDDEN),
@@ -1765,16 +1850,45 @@ def test_get_tags(self):
         assert status.is_success(response3.status_code)
         assert response3.data[str(self.courseA)]["taxonomies"] == expected_tags
 
+    def test_get_copied_tags(self):
+        self.client.force_authenticate(user=self.staffB)
+
+        object_id_1 = str(self.courseA)
+        object_id_2 = str(self.courseB)
+        tagging_api.tag_object(object_id=object_id_1, taxonomy=self.t1, tags=["android"])
+        tagging_api.tag_object(object_id=object_id_2, taxonomy=self.t1, tags=["anvil"])
+        tagging_api.copy_tags_as_read_only(object_id_1, object_id_2)
+
+        expected_tags = [{
+            'name': self.t1.name,
+            'taxonomy_id': self.t1.pk,
+            'can_tag_object': True,
+            'export_id': self.t1.export_id,
+            'tags': [
+                {'value': 'android', 'lineage': ['ALPHABET', 'android'], 'can_delete_objecttag': False},
+                {'value': 'anvil', 'lineage': ['ALPHABET', 'anvil'], 'can_delete_objecttag': True}
+            ]
+        }]
+
+        get_url = OBJECT_TAGS_URL.format(object_id=self.courseB)
+        response = self.client.get(get_url, format="json")
+        assert status.is_success(response.status_code)
+        assert response.data[str(object_id_2)]["taxonomies"] == expected_tags
+
     @ddt.data(
         ('staff', 'courseA', 8),
         ('staff', 'libraryA', 8),
-        ("content_creatorA", 'courseA', 11, False),
-        ("content_creatorA", 'libraryA', 11, False),
-        ("library_staffA", 'libraryA', 11, False),  # Library users can only view objecttags, not change them?
-        ("library_userA", 'libraryA', 11, False),
-        ("instructorA", 'courseA', 11),
-        ("course_instructorA", 'courseA', 11),
-        ("course_staffA", 'courseA', 11),
+        ('staff', 'collection_key', 8),
+        ("content_creatorA", 'courseA', 12, False),
+        ("content_creatorA", 'libraryA', 12, False),
+        ("content_creatorA", 'collection_key', 12, False),
+        ("library_staffA", 'libraryA', 12, False),  # Library users can only view objecttags, not change them?
+        ("library_staffA", 'collection_key', 12, False),
+        ("library_userA", 'libraryA', 12, False),
+        ("library_userA", 'collection_key', 12, False),
+        ("instructorA", 'courseA', 12),
+        ("course_instructorA", 'courseA', 12),
+        ("course_staffA", 'courseA', 12),
     )
     @ddt.unpack
     def test_object_tags_query_count(
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 71b210b9e561..615406ffccc5 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
@@ -10,11 +10,15 @@
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied, ValidationError
-from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from openedx_events.content_authoring.data import ContentObjectData
-from openedx_events.content_authoring.signals import CONTENT_OBJECT_TAGS_CHANGED
+from openedx_events.content_authoring.data import ContentObjectData, ContentObjectChangedData
+from openedx_events.content_authoring.signals import (
+    CONTENT_OBJECT_ASSOCIATIONS_CHANGED,
+    CONTENT_OBJECT_TAGS_CHANGED,
+)
+
+from openedx.core.types.http import RestRequest
 
 from ...auth import has_view_object_tags_access
 from ...api import (
@@ -28,7 +32,12 @@
 )
 from ...rules import get_admin_orgs
 from .filters import ObjectTagTaxonomyOrgFilterBackend, UserOrgFilterBackend
-from .serializers import TaxonomyOrgListQueryParamsSerializer, TaxonomyOrgSerializer, TaxonomyUpdateOrgBodySerializer
+from .serializers import (
+    ObjectTagCopiedMinimalSerializer,
+    TaxonomyOrgListQueryParamsSerializer,
+    TaxonomyOrgSerializer,
+    TaxonomyUpdateOrgBodySerializer,
+)
 
 
 class TaxonomyOrgView(TaxonomyView):
@@ -91,7 +100,7 @@ def perform_create(self, serializer):
         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:  # type: ignore
+    def create_import(self, request: RestRequest, **kwargs) -> Response:  # type: ignore
         """
         Creates a new taxonomy with the given orgs and imports the tags from the uploaded file.
         """
@@ -145,18 +154,29 @@ class ObjectTagOrgView(ObjectTagView):
 
     Refer to ObjectTagView docstring for usage details.
     """
+    minimal_serializer_class = ObjectTagCopiedMinimalSerializer
     filter_backends = [ObjectTagTaxonomyOrgFilterBackend]
 
     def update(self, request, *args, **kwargs) -> Response:
         """
-        Extend the update method to fire CONTENT_OBJECT_TAGS_CHANGED event
+        Extend the update method to fire CONTENT_OBJECT_ASSOCIATIONS_CHANGED event
         """
         response = super().update(request, *args, **kwargs)
         if response.status_code == 200:
             object_id = kwargs.get('object_id')
+
+            CONTENT_OBJECT_ASSOCIATIONS_CHANGED.send_event(
+                content_object=ContentObjectChangedData(
+                    object_id=object_id,
+                    changes=["tags"],
+                )
+            )
+
+            # Emit a (deprecated) CONTENT_OBJECT_TAGS_CHANGED event too
             CONTENT_OBJECT_TAGS_CHANGED.send_event(
                 content_object=ContentObjectData(object_id=object_id)
             )
+
         return response
 
 
@@ -164,7 +184,7 @@ class ObjectTagExportView(APIView):
     """"
     View to export a CSV with all children and tags for a given course/context.
     """
-    def get(self, request: Request, **kwargs) -> StreamingHttpResponse:
+    def get(self, request: RestRequest, **kwargs) -> StreamingHttpResponse:
         """
         Export a CSV with all children and tags for a given course/context.
         """
diff --git a/openedx/core/djangoapps/content_tagging/tests/test_api.py b/openedx/core/djangoapps/content_tagging/tests/test_api.py
index 1bc80b73727a..b693f7ee0f56 100644
--- a/openedx/core/djangoapps/content_tagging/tests/test_api.py
+++ b/openedx/core/djangoapps/content_tagging/tests/test_api.py
@@ -5,7 +5,7 @@
 import ddt
 from django.test.testcases import TestCase
 from fs.osfs import OSFS
-from opaque_keys.edx.keys import CourseKey, UsageKey
+from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryCollectionKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import ObjectTag
 from organizations.models import Organization
@@ -380,6 +380,23 @@ def test_copy_cross_org_tags(self):
         with self.assertNumQueries(31):  # TODO why so high?
             self._test_copy_object_tags(src_key, dst_key, expected_tags)
 
+    def test_tag_collection(self):
+        collection_key = LibraryCollectionKey.from_string("lib-collection:orgA:libX:1")
+
+        api.tag_object(
+            object_id=str(collection_key),
+            taxonomy=self.taxonomy_3,
+            tags=["Tag 3.1"],
+        )
+
+        with self.assertNumQueries(1):
+            object_tags, taxonomies = api.get_all_object_tags(collection_key)
+
+        assert object_tags == {'lib-collection:orgA:libX:1': {3: ['Tag 3.1']}}
+        assert taxonomies == {
+            self.taxonomy_3.id: self.taxonomy_3,
+        }
+
 
 class TestExportImportTags(TaggedCourseMixin):
     """
diff --git a/openedx/core/djangoapps/content_tagging/tests/test_objecttag_export_helpers.py b/openedx/core/djangoapps/content_tagging/tests/test_objecttag_export_helpers.py
index d3306844ac40..f196549dd1a9 100644
--- a/openedx/core/djangoapps/content_tagging/tests/test_objecttag_export_helpers.py
+++ b/openedx/core/djangoapps/content_tagging/tests/test_objecttag_export_helpers.py
@@ -4,14 +4,15 @@
 import time
 from unittest.mock import patch
 
+from openedx_tagging.core.tagging.models import ObjectTag
+from organizations.models import Organization
+
 from openedx.core.djangoapps.content_libraries import api as library_api
 from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory
 
 from .. import api
 from ..helpers.objecttag_export_helpers import TaggedContent, build_object_tree_with_objecttags, iterate_with_level
-from openedx_tagging.core.tagging.models import ObjectTag
-from organizations.models import Organization
 
 
 class TestGetAllObjectTagsMixin:
diff --git a/openedx/core/djangoapps/content_tagging/tests/test_tasks.py b/openedx/core/djangoapps/content_tagging/tests/test_tasks.py
index c14adfcce13a..d0e10ecfb7ae 100644
--- a/openedx/core/djangoapps/content_tagging/tests/test_tasks.py
+++ b/openedx/core/djangoapps/content_tagging/tests/test_tasks.py
@@ -14,7 +14,9 @@
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangolib.testing.utils import skip_unless_cms
 from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, ModuleStoreTestCase
-from openedx.core.djangoapps.content_libraries.api import create_library, create_library_block, delete_library_block
+from openedx.core.djangoapps.content_libraries.api import (
+    create_library, create_library_block, delete_library_block, restore_library_block
+)
 
 from .. import api
 from ..models.base import TaxonomyOrg
@@ -267,7 +269,7 @@ def test_waffle_disabled_create_delete_xblock(self):
         # Still no tags
         assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, None)
 
-    def test_create_delete_library_block(self):
+    def test_create_delete_restore_library_block(self):
         # Create library
         library = create_library(
             org=self.orgA,
@@ -287,11 +289,17 @@ def test_create_delete_library_block(self):
         # Check if the tags are created in the Library Block with the user's preferred language
         assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, 'Português (Brasil)')
 
-        # Delete the XBlock
+        # Soft delete the XBlock
         delete_library_block(library_block.usage_key)
 
-        # Check if the tags are deleted
-        assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, None)
+        # Check that the tags are not deleted
+        assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, 'Português (Brasil)')
+
+        # Restore the XBlock
+        restore_library_block(library_block.usage_key)
+
+        # Check if the tags are still present in the Library Block with the user's preferred language
+        assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, 'Português (Brasil)')
 
     @override_waffle_flag(CONTENT_TAGGING_AUTO, active=False)
     def test_waffle_disabled_create_delete_library_block(self):
@@ -319,3 +327,10 @@ def test_waffle_disabled_create_delete_library_block(self):
 
         # Still no tags
         assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, None)
+
+        # Restore the XBlock
+        with patch('crum.get_current_request', return_value=fake_request):
+            restore_library_block(library_block.usage_key)
+
+        # Still no tags
+        assert self._check_tag(usage_key_str, LANGUAGE_TAXONOMY_ID, None)
diff --git a/openedx/core/djangoapps/content_tagging/types.py b/openedx/core/djangoapps/content_tagging/types.py
index 64fa0d58f000..9ffb090d61e3 100644
--- a/openedx/core/djangoapps/content_tagging/types.py
+++ b/openedx/core/djangoapps/content_tagging/types.py
@@ -5,11 +5,11 @@
 
 from typing import Dict, List, Union
 
-from opaque_keys.edx.keys import CourseKey, UsageKey
+from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryCollectionKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import Taxonomy
 
-ContentKey = Union[LibraryLocatorV2, CourseKey, UsageKey]
+ContentKey = Union[LibraryLocatorV2, CourseKey, UsageKey, LibraryCollectionKey]
 ContextKey = Union[LibraryLocatorV2, CourseKey]
 
 TagValuesByTaxonomyIdDict = Dict[int, List[str]]
diff --git a/openedx/core/djangoapps/content_tagging/utils.py b/openedx/core/djangoapps/content_tagging/utils.py
index 8cc9c9e7f7a9..39dd925c1acd 100644
--- a/openedx/core/djangoapps/content_tagging/utils.py
+++ b/openedx/core/djangoapps/content_tagging/utils.py
@@ -5,7 +5,7 @@
 
 from edx_django_utils.cache import RequestCache
 from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import CourseKey, UsageKey
+from opaque_keys.edx.keys import CourseKey, UsageKey, LibraryCollectionKey
 from opaque_keys.edx.locator import LibraryLocatorV2
 from openedx_tagging.core.tagging.models import Taxonomy
 from organizations.models import Organization
@@ -26,8 +26,14 @@ def get_content_key_from_string(key_str: str) -> ContentKey:
         except InvalidKeyError:
             try:
                 return UsageKey.from_string(key_str)
-            except InvalidKeyError as usage_key_error:
-                raise ValueError("object_id must be a CourseKey, LibraryLocatorV2 or a UsageKey") from usage_key_error
+            except InvalidKeyError:
+                try:
+                    return LibraryCollectionKey.from_string(key_str)
+                except InvalidKeyError as usage_key_error:
+                    raise ValueError(
+                        "object_id must be one of the following "
+                        "keys: CourseKey, LibraryLocatorV2, UsageKey or LibCollectionKey"
+                    ) from usage_key_error
 
 
 def get_context_key_from_key(content_key: ContentKey) -> ContextKey:
@@ -38,6 +44,10 @@ def get_context_key_from_key(content_key: ContentKey) -> ContextKey:
     if isinstance(content_key, (CourseKey, LibraryLocatorV2)):
         return content_key
 
+    # If the content key is a LibraryCollectionKey, return the LibraryLocatorV2
+    if isinstance(content_key, LibraryCollectionKey):
+        return content_key.library_key
+
     # If the content key is a UsageKey, return the context key
     context_key = content_key.context_key
 
diff --git a/openedx/core/djangoapps/contentserver/test/test_contentserver.py b/openedx/core/djangoapps/contentserver/test/test_contentserver.py
index e1c5e01c0a7f..4c0180c402e9 100644
--- a/openedx/core/djangoapps/contentserver/test/test_contentserver.py
+++ b/openedx/core/djangoapps/contentserver/test/test_contentserver.py
@@ -1,5 +1,5 @@
 """
-Tests for StaticContentServer
+Tests for content server.
 """
 
 
@@ -27,7 +27,7 @@
 from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase
 from xmodule.modulestore.xml_importer import import_course_from_xml
 
-from ..views import HTTP_DATE_FORMAT, StaticContentServer, parse_range_header
+from .. import views
 
 log = logging.getLogger(__name__)
 
@@ -246,7 +246,6 @@ def test_range_request_multiple_ranges(self):
         """
         first_byte = self.length_unlocked / 4
         last_byte = self.length_unlocked / 2
-        # lint-amnesty, pylint: disable=bad-option-value, unicode-format-string
         resp = self.client.get(self.url_unlocked, HTTP_RANGE='bytes={first}-{last}, -100'.format(
             first=first_byte, last=last_byte))
 
@@ -356,8 +355,8 @@ def test_cache_headers_without_ttl_locked(self, mock_get_cache_ttl):
         assert 'private, no-cache, no-store' == resp['Cache-Control']
 
     def test_get_expiration_value(self):
-        start_dt = datetime.datetime.strptime("Thu, 01 Dec 1983 20:00:00 GMT", HTTP_DATE_FORMAT)
-        near_expire_dt = StaticContentServer.get_expiration_value(start_dt, 55)
+        start_dt = datetime.datetime.strptime("Thu, 01 Dec 1983 20:00:00 GMT", views.HTTP_DATE_FORMAT)
+        near_expire_dt = views.get_expiration_value(start_dt, 55)
         assert 'Thu, 01 Dec 1983 20:00:55 GMT' == near_expire_dt
 
     @patch('openedx.core.djangoapps.contentserver.models.CdnUserAgentsConfig.get_cdn_user_agents')
@@ -371,7 +370,7 @@ def test_cache_is_cdn_with_normal_request(self, mock_get_cdn_user_agents):
         request_factory = RequestFactory()
         browser_request = request_factory.get('/fake', HTTP_USER_AGENT='Chrome 1234')
 
-        is_from_cdn = StaticContentServer.is_cdn_request(browser_request)
+        is_from_cdn = views.is_cdn_request(browser_request)
         assert is_from_cdn is False
 
     @patch('openedx.core.djangoapps.contentserver.models.CdnUserAgentsConfig.get_cdn_user_agents')
@@ -385,7 +384,7 @@ def test_cache_is_cdn_with_cdn_request(self, mock_get_cdn_user_agents):
         request_factory = RequestFactory()
         browser_request = request_factory.get('/fake', HTTP_USER_AGENT='Amazon CloudFront')
 
-        is_from_cdn = StaticContentServer.is_cdn_request(browser_request)
+        is_from_cdn = views.is_cdn_request(browser_request)
         assert is_from_cdn is True
 
     @patch('openedx.core.djangoapps.contentserver.models.CdnUserAgentsConfig.get_cdn_user_agents')
@@ -400,7 +399,7 @@ def test_cache_is_cdn_with_cdn_request_multiple_user_agents(self, mock_get_cdn_u
         request_factory = RequestFactory()
         browser_request = request_factory.get('/fake', HTTP_USER_AGENT='Amazon CloudFront')
 
-        is_from_cdn = StaticContentServer.is_cdn_request(browser_request)
+        is_from_cdn = views.is_cdn_request(browser_request)
         assert is_from_cdn is True
 
 
@@ -415,7 +414,7 @@ def setUp(self):
         self.content_length = 10000
 
     def test_bytes_unit(self):
-        unit, __ = parse_range_header('bytes=100-', self.content_length)
+        unit, __ = views.parse_range_header('bytes=100-', self.content_length)
         assert unit == 'bytes'
 
     @ddt.data(
@@ -428,7 +427,7 @@ def test_bytes_unit(self):
     )
     @ddt.unpack
     def test_valid_syntax(self, header_value, excepted_ranges_length, expected_ranges):
-        __, ranges = parse_range_header(header_value, self.content_length)
+        __, ranges = views.parse_range_header(header_value, self.content_length)
         assert len(ranges) == excepted_ranges_length
         assert ranges == expected_ranges
 
@@ -446,5 +445,5 @@ def test_valid_syntax(self, header_value, excepted_ranges_length, expected_range
     @ddt.unpack
     def test_invalid_syntax(self, header_value, exception_class, exception_message_regex):
         self.assertRaisesRegex(
-            exception_class, exception_message_regex, parse_range_header, header_value, self.content_length
+            exception_class, exception_message_regex, views.parse_range_header, header_value, self.content_length
         )
diff --git a/openedx/core/djangoapps/contentserver/views.py b/openedx/core/djangoapps/contentserver/views.py
index 7c40026415bb..3a267f085222 100644
--- a/openedx/core/djangoapps/contentserver/views.py
+++ b/openedx/core/djangoapps/contentserver/views.py
@@ -1,22 +1,9 @@
 """
 Views for serving course assets.
 
-Historically, this was implemented as a *middleware* (StaticContentServer) that
-intercepted requests with paths matching certain patterns, rather than using
-urlpatterns and a view. There wasn't any good reason for this, as far as I can
-tell. It causes some problems for telemetry: When the code-owner middleware asks
-Django what view handled the request, it does so by looking at the result of the
-`resolve` utility, but these URLs get a Resolver404 (because there's no
-registered urlpattern).
-
-We've turned it into a proper view, with a few warts remaining:
-
-- The view implementation is all bundled into a StaticContentServer class that
-  doesn't appear to have any state. The methods could likely just be extracted
-  as top-level functions.
-- All three urlpatterns are registered to the same view, which then has to
-  re-parse the URL to determine which pattern is in effect. We should probably
-  have 3 views as entry points.
+For historical reasons, this is just one view that matches to three different URL patterns, and then has to
+re-parse the URL to determine which pattern is in effect. We should probably
+have 3 views as entry points.
 """
 import datetime
 import logging
@@ -51,7 +38,7 @@ def course_assets_view(request):
     """
     Serve course assets to end users. Colloquially referred to as "contentserver."
     """
-    return IMPL.process_request(request)
+    return process_request(request)
 
 
 log = logging.getLogger(__name__)
@@ -62,264 +49,261 @@ def course_assets_view(request):
 HTTP_DATE_FORMAT = "%a, %d %b %Y %H:%M:%S GMT"
 
 
-class StaticContentServer():
-    """
-    Serves course assets to end users.  Colloquially referred to as "contentserver."
-    """
-    def is_asset_request(self, request):
-        """Determines whether the given request is an asset request"""
-        # Don't change this without updating urls.py! See docstring of views.py.
-        return (
-            request.path.startswith('/' + XASSET_LOCATION_TAG + '/')
-            or
-            request.path.startswith('/' + AssetLocator.CANONICAL_NAMESPACE)
-            or
-            StaticContent.is_versioned_asset_path(request.path)
-        )
-
-    # pylint: disable=too-many-statements
-    def process_request(self, request):
-        """Process the given request"""
-        asset_path = request.path
-
-        if self.is_asset_request(request):  # lint-amnesty, pylint: disable=too-many-nested-blocks
-            # Make sure we can convert this request into a location.
-            if AssetLocator.CANONICAL_NAMESPACE in asset_path:
-                asset_path = asset_path.replace('block/', 'block@', 1)
-
-            # If this is a versioned request, pull out the digest and chop off the prefix.
-            requested_digest = None
-            if StaticContent.is_versioned_asset_path(asset_path):
-                requested_digest, asset_path = StaticContent.parse_versioned_asset_path(asset_path)
-
-            # Make sure we have a valid location value for this asset.
-            try:
-                loc = StaticContent.get_location_from_path(asset_path)
-            except (InvalidLocationError, InvalidKeyError):
-                return HttpResponseBadRequest()
-
-            # Attempt to load the asset to make sure it exists, and grab the asset digest
-            # if we're able to load it.
-            actual_digest = None
+def is_asset_request(request):
+    """Determines whether the given request is an asset request"""
+    # Don't change this without updating urls.py! See docstring of views.py.
+    return (
+        request.path.startswith('/' + XASSET_LOCATION_TAG + '/')
+        or
+        request.path.startswith('/' + AssetLocator.CANONICAL_NAMESPACE)
+        or
+        StaticContent.is_versioned_asset_path(request.path)
+    )
+
+
+# pylint: disable=too-many-statements
+def process_request(request):
+    """Process the given request"""
+    asset_path = request.path
+
+    if is_asset_request(request):
+        # Make sure we can convert this request into a location.
+        if AssetLocator.CANONICAL_NAMESPACE in asset_path:
+            asset_path = asset_path.replace('block/', 'block@', 1)
+
+        # If this is a versioned request, pull out the digest and chop off the prefix.
+        requested_digest = None
+        if StaticContent.is_versioned_asset_path(asset_path):
+            requested_digest, asset_path = StaticContent.parse_versioned_asset_path(asset_path)
+
+        # Make sure we have a valid location value for this asset.
+        try:
+            loc = StaticContent.get_location_from_path(asset_path)
+        except (InvalidLocationError, InvalidKeyError):
+            return HttpResponseBadRequest()
+
+        # Attempt to load the asset to make sure it exists, and grab the asset digest
+        # if we're able to load it.
+        actual_digest = None
+        try:
+            content = load_asset_from_location(loc)
+            actual_digest = getattr(content, "content_digest", None)
+        except (ItemNotFoundError, NotFoundError):
+            return HttpResponseNotFound()
+
+        # If this was a versioned asset, and the digest doesn't match, redirect
+        # them to the actual version.
+        if requested_digest is not None and actual_digest is not None and (actual_digest != requested_digest):
+            actual_asset_path = StaticContent.add_version_to_asset_path(asset_path, actual_digest)
+            return HttpResponsePermanentRedirect(actual_asset_path)
+
+        # Set the basics for this request. Make sure that the course key for this
+        # asset has a run, which old-style courses do not.  Otherwise, this will
+        # explode when the key is serialized to be sent to NR.
+        safe_course_key = loc.course_key
+        if safe_course_key.run is None:
+            safe_course_key = safe_course_key.replace(run='only')
+
+        set_custom_attribute('course_id', safe_course_key)
+        set_custom_attribute('org', loc.org)
+        set_custom_attribute('contentserver.path', loc.path)
+
+        # Figure out if this is a CDN using us as the origin.
+        is_from_cdn = is_cdn_request(request)
+        set_custom_attribute('contentserver.from_cdn', is_from_cdn)
+
+        # Check if this content is locked or not.
+        locked = is_content_locked(content)
+        set_custom_attribute('contentserver.locked', locked)
+
+        # Check that user has access to the content.
+        if not is_user_authorized(request, content, loc):
+            return HttpResponseForbidden('Unauthorized')
+
+        # Figure out if the client sent us a conditional request, and let them know
+        # if this asset has changed since then.
+        last_modified_at_str = content.last_modified_at.strftime(HTTP_DATE_FORMAT)
+        if 'HTTP_IF_MODIFIED_SINCE' in request.META:
+            if_modified_since = request.META['HTTP_IF_MODIFIED_SINCE']
+            if if_modified_since == last_modified_at_str:
+                return HttpResponseNotModified()
+
+        # *** File streaming within a byte range ***
+        # If a Range is provided, parse Range attribute of the request
+        # Add Content-Range in the response if Range is structurally correct
+        # Request -> Range attribute structure: "Range: bytes=first-[last]"
+        # Response -> Content-Range attribute structure: "Content-Range: bytes first-last/totalLength"
+        # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
+        response = None
+        if request.META.get('HTTP_RANGE'):
+            # If we have a StaticContent, get a StaticContentStream.  Can't manipulate the bytes otherwise.
+            if isinstance(content, StaticContent):
+                content = AssetManager.find(loc, as_stream=True)
+
+            header_value = request.META['HTTP_RANGE']
             try:
-                content = self.load_asset_from_location(loc)
-                actual_digest = getattr(content, "content_digest", None)
-            except (ItemNotFoundError, NotFoundError):
-                return HttpResponseNotFound()
-
-            # If this was a versioned asset, and the digest doesn't match, redirect
-            # them to the actual version.
-            if requested_digest is not None and actual_digest is not None and (actual_digest != requested_digest):
-                actual_asset_path = StaticContent.add_version_to_asset_path(asset_path, actual_digest)
-                return HttpResponsePermanentRedirect(actual_asset_path)
-
-            # Set the basics for this request. Make sure that the course key for this
-            # asset has a run, which old-style courses do not.  Otherwise, this will
-            # explode when the key is serialized to be sent to NR.
-            safe_course_key = loc.course_key
-            if safe_course_key.run is None:
-                safe_course_key = safe_course_key.replace(run='only')
-
-            set_custom_attribute('course_id', safe_course_key)
-            set_custom_attribute('org', loc.org)
-            set_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)
-            set_custom_attribute('contentserver.from_cdn', is_from_cdn)
-
-            # Check if this content is locked or not.
-            locked = self.is_content_locked(content)
-            set_custom_attribute('contentserver.locked', locked)
-
-            # Check that user has access to the content.
-            if not self.is_user_authorized(request, content, loc):
-                return HttpResponseForbidden('Unauthorized')
-
-            # Figure out if the client sent us a conditional request, and let them know
-            # if this asset has changed since then.
-            last_modified_at_str = content.last_modified_at.strftime(HTTP_DATE_FORMAT)
-            if 'HTTP_IF_MODIFIED_SINCE' in request.META:
-                if_modified_since = request.META['HTTP_IF_MODIFIED_SINCE']
-                if if_modified_since == last_modified_at_str:
-                    return HttpResponseNotModified()
-
-            # *** File streaming within a byte range ***
-            # If a Range is provided, parse Range attribute of the request
-            # Add Content-Range in the response if Range is structurally correct
-            # Request -> Range attribute structure: "Range: bytes=first-[last]"
-            # Response -> Content-Range attribute structure: "Content-Range: bytes first-last/totalLength"
-            # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
-            response = None
-            if request.META.get('HTTP_RANGE'):
-                # If we have a StaticContent, get a StaticContentStream.  Can't manipulate the bytes otherwise.
-                if isinstance(content, StaticContent):
-                    content = AssetManager.find(loc, as_stream=True)
-
-                header_value = request.META['HTTP_RANGE']
-                try:
-                    unit, ranges = parse_range_header(header_value, content.length)
-                except ValueError as exception:
-                    # If the header field is syntactically invalid it should be ignored.
-                    log.exception(
-                        "%s in Range header: %s for content: %s",
-                        str(exception), header_value, str(loc)
+                unit, ranges = parse_range_header(header_value, content.length)
+            except ValueError as exception:
+                # If the header field is syntactically invalid it should be ignored.
+                log.exception(
+                    "%s in Range header: %s for content: %s",
+                    str(exception), header_value, str(loc)
+                )
+            else:
+                if unit != 'bytes':
+                    # Only accept ranges in bytes
+                    log.warning("Unknown unit in Range header: %s for content: %s", header_value, str(loc))
+                elif len(ranges) > 1:
+                    # According to Http/1.1 spec content for multiple ranges should be sent as a multipart message.
+                    # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.16
+                    # But we send back the full content.
+                    log.warning(
+                        "More than 1 ranges in Range header: %s for content: %s", header_value, str(loc)
                     )
                 else:
-                    if unit != 'bytes':
-                        # Only accept ranges in bytes
-                        log.warning("Unknown unit in Range header: %s for content: %s", header_value, str(loc))
-                    elif len(ranges) > 1:
-                        # According to Http/1.1 spec content for multiple ranges should be sent as a multipart message.
-                        # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.16
-                        # But we send back the full content.
-                        log.warning(
-                            "More than 1 ranges in Range header: %s for content: %s", header_value, str(loc)
+                    first, last = ranges[0]
+
+                    if 0 <= first <= last < content.length:
+                        # If the byte range is satisfiable
+                        response = HttpResponse(content.stream_data_in_range(first, last))
+                        response['Content-Range'] = 'bytes {first}-{last}/{length}'.format(
+                            first=first, last=last, length=content.length
                         )
+                        response['Content-Length'] = str(last - first + 1)
+                        response.status_code = 206  # Partial Content
+
+                        set_custom_attribute('contentserver.ranged', True)
                     else:
-                        first, last = ranges[0]
-
-                        if 0 <= first <= last < content.length:
-                            # If the byte range is satisfiable
-                            response = HttpResponse(content.stream_data_in_range(first, last))
-                            response['Content-Range'] = 'bytes {first}-{last}/{length}'.format(
-                                first=first, last=last, length=content.length
-                            )
-                            response['Content-Length'] = str(last - first + 1)
-                            response.status_code = 206  # Partial Content
-
-                            set_custom_attribute('contentserver.ranged', True)
-                        else:
-                            log.warning(
-                                "Cannot satisfy ranges in Range header: %s for content: %s",
-                                header_value, str(loc)
-                            )
-                            return HttpResponse(status=416)  # Requested Range Not Satisfiable
-
-            # If Range header is absent or syntactically invalid return a full content response.
-            if response is None:
-                response = HttpResponse(content.stream_data())
-                response['Content-Length'] = content.length
-
-            set_custom_attribute('contentserver.content_len', content.length)
-            set_custom_attribute('contentserver.content_type', content.content_type)
-
-            # "Accept-Ranges: bytes" tells the user that only "bytes" ranges are allowed
-            response['Accept-Ranges'] = 'bytes'
-            response['Content-Type'] = content.content_type
-            response['X-Frame-Options'] = 'ALLOW'
-
-            # Set any caching headers, and do any response cleanup needed.  Based on how much
-            # middleware we have in place, there's no easy way to use the built-in Django
-            # utilities and properly sanitize and modify a response to ensure that it is as
-            # cacheable as possible, which is why we do it ourselves.
-            self.set_caching_headers(content, response)
-
-            return response
-
-    def set_caching_headers(self, content, response):
-        """
-        Sets caching headers based on whether or not the asset is locked.
-        """
-
-        is_locked = getattr(content, "locked", False)
-
-        # We want to signal to the end user's browser, and to any intermediate proxies/caches,
-        # whether or not this asset is cacheable.  If we have a TTL configured, we inform the
-        # caller, for unlocked assets, how long they are allowed to cache it.  Since locked
-        # assets should be restricted to enrolled students, we simply send headers that
-        # indicate there should be no caching whatsoever.
-        cache_ttl = CourseAssetCacheTtlConfig.get_cache_ttl()
-        if cache_ttl > 0 and not is_locked:
-            set_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:
-            set_custom_attribute('contentserver.cacheable', False)
-
-            response['Cache-Control'] = "private, no-cache, no-store"
-
-        response['Last-Modified'] = content.last_modified_at.strftime(HTTP_DATE_FORMAT)
-
-        # Force the Vary header to only vary responses on Origin, so that XHR and browser requests get cached
-        # separately and don't screw over one another. i.e. a browser request that doesn't send Origin, and
-        # caches a version of the response without CORS headers, in turn breaking XHR requests.
-        force_header_for_response(response, 'Vary', 'Origin')
-
-    @staticmethod
-    def is_cdn_request(request):
-        """
-        Attempts to determine whether or not the given request is coming from a CDN.
-
-        Currently, this is a static check because edx.org only uses CloudFront, but may
-        be expanded in the future.
-        """
-        cdn_user_agents = CdnUserAgentsConfig.get_cdn_user_agents()
-        user_agent = request.META.get('HTTP_USER_AGENT', '')
-        if user_agent in cdn_user_agents:
-            # This is a CDN request.
-            return True
+                        log.warning(
+                            "Cannot satisfy ranges in Range header: %s for content: %s",
+                            header_value, str(loc)
+                        )
+                        return HttpResponse(status=416)  # Requested Range Not Satisfiable
 
-        return False
+        # If Range header is absent or syntactically invalid return a full content response.
+        if response is None:
+            response = HttpResponse(content.stream_data())
+            response['Content-Length'] = content.length
 
-    @staticmethod
-    def get_expiration_value(now, cache_ttl):
-        """Generates an RFC1123 datetime string based on a future offset."""
-        expire_dt = now + datetime.timedelta(seconds=cache_ttl)
-        return expire_dt.strftime(HTTP_DATE_FORMAT)
-
-    def is_content_locked(self, content):
-        """
-        Determines whether or not the given content is locked.
-        """
-        return bool(getattr(content, "locked", False))
-
-    def is_user_authorized(self, request, content, location):
-        """
-        Determines whether or not the user for this request is authorized to view the given asset.
-        """
-        if not self.is_content_locked(content):
-            return True
-
-        if not hasattr(request, "user") or not request.user.is_authenticated:
-            return False
+        set_custom_attribute('contentserver.content_len', content.length)
+        set_custom_attribute('contentserver.content_type', content.content_type)
+
+        # "Accept-Ranges: bytes" tells the user that only "bytes" ranges are allowed
+        response['Accept-Ranges'] = 'bytes'
+        response['Content-Type'] = content.content_type
+        response['X-Frame-Options'] = 'ALLOW'
+
+        # Set any caching headers, and do any response cleanup needed.  Based on how much
+        # middleware we have in place, there's no easy way to use the built-in Django
+        # utilities and properly sanitize and modify a response to ensure that it is as
+        # cacheable as possible, which is why we do it ourselves.
+        set_caching_headers(content, response)
+
+        return response
+
+
+def set_caching_headers(content, response):
+    """
+    Sets caching headers based on whether or not the asset is locked.
+    """
+
+    is_locked = getattr(content, "locked", False)
+
+    # We want to signal to the end user's browser, and to any intermediate proxies/caches,
+    # whether or not this asset is cacheable.  If we have a TTL configured, we inform the
+    # caller, for unlocked assets, how long they are allowed to cache it.  Since locked
+    # assets should be restricted to enrolled students, we simply send headers that
+    # indicate there should be no caching whatsoever.
+    cache_ttl = CourseAssetCacheTtlConfig.get_cache_ttl()
+    if cache_ttl > 0 and not is_locked:
+        set_custom_attribute('contentserver.cacheable', True)
+
+        response['Expires'] = 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:
+        set_custom_attribute('contentserver.cacheable', False)
+
+        response['Cache-Control'] = "private, no-cache, no-store"
+
+    response['Last-Modified'] = content.last_modified_at.strftime(HTTP_DATE_FORMAT)
 
-        if not request.user.is_staff:
-            deprecated = getattr(location, 'deprecated', False)
-            if deprecated and not CourseEnrollment.is_enrolled_by_partial(request.user, location.course_key):
-                return False
-            if not deprecated and not CourseEnrollment.is_enrolled(request.user, location.course_key):
-                return False
+    # Force the Vary header to only vary responses on Origin, so that XHR and browser requests get cached
+    # separately and don't screw over one another. i.e. a browser request that doesn't send Origin, and
+    # caches a version of the response without CORS headers, in turn breaking XHR requests.
+    force_header_for_response(response, 'Vary', 'Origin')
 
+
+@staticmethod
+def is_cdn_request(request):
+    """
+    Attempts to determine whether or not the given request is coming from a CDN.
+
+    Currently, this is a static check because edx.org only uses CloudFront, but may
+    be expanded in the future.
+    """
+    cdn_user_agents = CdnUserAgentsConfig.get_cdn_user_agents()
+    user_agent = request.META.get('HTTP_USER_AGENT', '')
+    if user_agent in cdn_user_agents:
+        # This is a CDN request.
         return True
 
-    def load_asset_from_location(self, location):
-        """
-        Loads an asset based on its location, either retrieving it from a cache
-        or loading it directly from the contentstore.
-        """
+    return False
 
-        # See if we can load this item from cache.
-        content = get_cached_content(location)
-        if content is None:
-            # Not in cache, so just try and load it from the asset manager.
-            try:
-                content = AssetManager.find(location, as_stream=True)
-            except (ItemNotFoundError, NotFoundError):  # lint-amnesty, pylint: disable=try-except-raise
-                raise
 
-            # Now that we fetched it, let's go ahead and try to cache it. We cap this at 1MB
-            # because it's the default for memcached and also we don't want to do too much
-            # buffering in memory when we're serving an actual request.
-            if content.length is not None and content.length < 1048576:
-                content = content.copy_to_in_mem()
-                set_cached_content(content)
+@staticmethod
+def get_expiration_value(now, cache_ttl):
+    """Generates an RFC1123 datetime string based on a future offset."""
+    expire_dt = now + datetime.timedelta(seconds=cache_ttl)
+    return expire_dt.strftime(HTTP_DATE_FORMAT)
+
+
+def is_content_locked(content):
+    """
+    Determines whether or not the given content is locked.
+    """
+    return bool(getattr(content, "locked", False))
+
+
+def is_user_authorized(request, content, location):
+    """
+    Determines whether or not the user for this request is authorized to view the given asset.
+    """
+    if not is_content_locked(content):
+        return True
+
+    if not hasattr(request, "user") or not request.user.is_authenticated:
+        return False
+
+    if not request.user.is_staff:
+        deprecated = getattr(location, 'deprecated', False)
+        if deprecated and not CourseEnrollment.is_enrolled_by_partial(request.user, location.course_key):
+            return False
+        if not deprecated and not CourseEnrollment.is_enrolled(request.user, location.course_key):
+            return False
+
+    return True
+
+
+def load_asset_from_location(location):
+    """
+    Loads an asset based on its location, either retrieving it from a cache
+    or loading it directly from the contentstore.
+    """
 
-        return content
+    # See if we can load this item from cache.
+    content = get_cached_content(location)
+    if content is None:
+        # Not in cache, so just try and load it from the asset manager.
+        content = AssetManager.find(location, as_stream=True)
 
+        # Now that we fetched it, let's go ahead and try to cache it. We cap this at 1MB
+        # because it's the default for memcached and also we don't want to do too much
+        # buffering in memory when we're serving an actual request.
+        if content.length is not None and content.length < 1048576:
+            content = content.copy_to_in_mem()
+            set_cached_content(content)
 
-IMPL = StaticContentServer()
+    return content
 
 
 def parse_range_header(header_value, content_length):
diff --git a/openedx/core/djangoapps/cors_csrf/tests/test_middleware.py b/openedx/core/djangoapps/cors_csrf/tests/test_middleware.py
index a546cbbcd4bb..119824607ded 100644
--- a/openedx/core/djangoapps/cors_csrf/tests/test_middleware.py
+++ b/openedx/core/djangoapps/cors_csrf/tests/test_middleware.py
@@ -270,14 +270,13 @@ def _assert_cookie_sent(self, response, is_set):
         if is_set:
             assert self.COOKIE_NAME in response.cookies
             cookie_header = str(response.cookies[self.COOKIE_NAME])
-            # lint-amnesty, pylint: disable=bad-option-value, unicode-format-string
+
             expected = 'Set-Cookie: {name}={value}; Domain={domain};'.format(
                 name=self.COOKIE_NAME,
                 value=self.COOKIE_VALUE,
                 domain=self.COOKIE_DOMAIN
             )
             assert expected in cookie_header
-            # added lower function because in python 3 the value of cookie_header has Secure and secure in python 2
-            assert 'Max-Age=31449600; Path=/; secure'.lower() in cookie_header.lower()
+            assert 'Max-Age=31449600; Path=/; Secure' in cookie_header
         else:
             assert self.COOKIE_NAME not in response.cookies
diff --git a/openedx/core/djangoapps/course_live/models.py b/openedx/core/djangoapps/course_live/models.py
index a871ec024447..c311c6fb3f2f 100644
--- a/openedx/core/djangoapps/course_live/models.py
+++ b/openedx/core/djangoapps/course_live/models.py
@@ -12,6 +12,8 @@
 class CourseLiveConfiguration(TimeStampedModel):
     """
     Associates a Course with a LTI provider and configuration
+
+    .. no_pii:
     """
     course_key = CourseKeyField(max_length=255, db_index=True, null=False)
     enabled = models.BooleanField(
diff --git a/openedx/core/djangoapps/courseware_api/views.py b/openedx/core/djangoapps/courseware_api/views.py
index 7f56133b3459..07e219f83d81 100644
--- a/openedx/core/djangoapps/courseware_api/views.py
+++ b/openedx/core/djangoapps/courseware_api/views.py
@@ -19,6 +19,7 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
 from xmodule.modulestore.search import path_to_location
@@ -594,30 +595,40 @@ def get(self, request, usage_key_string, *args, **kwargs):  # lint-amnesty, pyli
             usage_key = UsageKey.from_string(usage_key_string)
         except InvalidKeyError as exc:
             raise NotFound(f"Invalid usage key: '{usage_key_string}'.") from exc
+
+        staff_access = has_access(request.user, 'staff', usage_key.course_key)
+        is_preview = request.GET.get('preview', '0') == '1'
         _, request.user = setup_masquerade(
             request,
             usage_key.course_key,
-            staff_access=has_access(request.user, 'staff', usage_key.course_key),
+            staff_access=staff_access,
             reset_masquerade_data=True,
         )
 
-        sequence, _ = get_block_by_usage_id(
-            self.request,
-            str(usage_key.course_key),
-            str(usage_key),
-            disable_staff_debug_info=True,
-            will_recheck_access=True)
+        branch_type = (
+            ModuleStoreEnum.Branch.draft_preferred
+        ) if is_preview and staff_access else (
+            ModuleStoreEnum.Branch.published_only
+        )
+
+        with modulestore().branch_setting(branch_type, usage_key.course_key):
+            sequence, _ = get_block_by_usage_id(
+                self.request,
+                str(usage_key.course_key),
+                str(usage_key),
+                disable_staff_debug_info=True,
+                will_recheck_access=True)
 
-        if not hasattr(sequence, 'get_metadata'):
-            # Looks like we were asked for metadata on something that is not a sequence (or section).
-            return Response(status=status.HTTP_422_UNPROCESSABLE_ENTITY)
+            if not hasattr(sequence, 'get_metadata'):
+                # Looks like we were asked for metadata on something that is not a sequence (or section).
+                return Response(status=status.HTTP_422_UNPROCESSABLE_ENTITY)
 
-        view = STUDENT_VIEW
-        if request.user.is_anonymous:
-            view = PUBLIC_VIEW
+            view = STUDENT_VIEW
+            if request.user.is_anonymous:
+                view = PUBLIC_VIEW
 
-        context = {'specific_masquerade': is_masquerading_as_specific_student(request.user, usage_key.course_key)}
-        return Response(sequence.get_metadata(view=view, context=context))
+            context = {'specific_masquerade': is_masquerading_as_specific_student(request.user, usage_key.course_key)}
+            return Response(sequence.get_metadata(view=view, context=context))
 
 
 class Resume(DeveloperErrorViewMixin, APIView):
diff --git a/openedx/core/djangoapps/crawlers/models.py b/openedx/core/djangoapps/crawlers/models.py
index b7f9d23d6544..fe0ae3193b0f 100644
--- a/openedx/core/djangoapps/crawlers/models.py
+++ b/openedx/core/djangoapps/crawlers/models.py
@@ -42,16 +42,14 @@ def is_crawler(cls, request):
 
         # If there was no user agent detected or no crawler agents configured,
         # then just return False.
-        if (not req_user_agent) or (not crawler_agents):
+        if not req_user_agent or not crawler_agents:
             return False
 
-        # The crawler_agents list we pull from our model always has unicode objects, but the
-        # req_user_agent we get from HTTP headers ultimately comes to us via WSGI. That
-        # value is an ISO-8859-1 encoded byte string in Python 2.7 (and in the HTTP spec), but
-        # it will be a unicode str when we move to Python 3.x. This code should work under
-        # either version.
+        # Decode req_user_agent if it's bytes, so we can work with consistent string types.
         if isinstance(req_user_agent, bytes):
-            crawler_agents = [crawler_agent.encode('iso-8859-1') for crawler_agent in crawler_agents]
+            req_user_agent = req_user_agent.decode('iso-8859-1')
+
+        crawler_agents = [crawler_agent.strip() for crawler_agent in crawler_agents]
 
         # We perform prefix matching of the crawler agent here so that we don't
         # have to worry about version bumps.
diff --git a/openedx/core/djangoapps/discussions/config/waffle.py b/openedx/core/djangoapps/discussions/config/waffle.py
index 1d4c67e9e17b..eca6fc970856 100644
--- a/openedx/core/djangoapps/discussions/config/waffle.py
+++ b/openedx/core/djangoapps/discussions/config/waffle.py
@@ -2,6 +2,8 @@
 This module contains various configuration settings via
 waffle switches for the discussions app.
 """
+from django.conf import settings
+
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
 
 WAFFLE_FLAG_NAMESPACE = "discussions"
@@ -43,3 +45,31 @@
 ENABLE_NEW_STRUCTURE_DISCUSSIONS = CourseWaffleFlag(
     f"{WAFFLE_FLAG_NAMESPACE}.enable_new_structure_discussions", __name__
 )
+
+# .. toggle_name: discussions.enable_forum_v2
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to use the forum v2 instead of v1(cs_comment_service)
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2024-9-26
+# .. toggle_target_removal_date: 2025-12-05
+ENABLE_FORUM_V2 = CourseWaffleFlag(f"{WAFFLE_FLAG_NAMESPACE}.enable_forum_v2", __name__)
+
+
+def is_forum_v2_enabled(course_key):
+    """
+    Returns whether forum V2 is enabled on the course. This is a 2-step check:
+
+    1. Check value of settings.DISABLE_FORUM_V2: if it exists and is true, this setting overrides any course flag.
+    2. Else, check the value of the corresponding course waffle flag.
+    """
+    if is_forum_v2_disabled_globally():
+        return False
+    return ENABLE_FORUM_V2.is_enabled(course_key)
+
+
+def is_forum_v2_disabled_globally() -> bool:
+    """
+    Return True if DISABLE_FORUM_V2 is defined and true-ish.
+    """
+    return getattr(settings, "DISABLE_FORUM_V2", False)
diff --git a/openedx/core/djangoapps/discussions/models.py b/openedx/core/djangoapps/discussions/models.py
index 9d97c9051397..f47b661c9ad2 100644
--- a/openedx/core/djangoapps/discussions/models.py
+++ b/openedx/core/djangoapps/discussions/models.py
@@ -318,6 +318,8 @@ def get_supported_providers() -> List[str]:
 class ProviderFilter(StackedConfigurationModel):
     """
     Associate allow/deny-lists of discussions providers with courses/orgs
+
+    .. no_pii:
     """
 
     allow = ListCharField(
@@ -406,6 +408,8 @@ def get_available_providers(cls, course_key: CourseKey) -> List[str]:
 class DiscussionsConfiguration(TimeStampedModel):
     """
     Associates a learning context with discussion provider and configuration
+
+    .. no_pii:
     """
 
     context_key = LearningContextKeyField(
@@ -554,6 +558,8 @@ def lti_discussion_enabled(cls, course_key: CourseKey) -> bool:
 class DiscussionTopicLink(models.Model):
     """
     A model linking discussion topics ids to the part of a course they are linked to.
+
+    ..no_pii:
     """
     context_key = LearningContextKeyField(
         db_index=True,
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/comment.py b/openedx/core/djangoapps/django_comment_common/comment_client/comment.py
index 0b7a695a1c3e..ba95c620496d 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/comment.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/comment.py
@@ -1,10 +1,12 @@
 # pylint: disable=missing-docstring,protected-access
-
+from bs4 import BeautifulSoup
 
 from openedx.core.djangoapps.django_comment_common.comment_client import models, settings
 
 from .thread import Thread, _url_for_flag_abuse_thread, _url_for_unflag_abuse_thread
-from .utils import CommentClientRequestError, perform_request
+from .utils import CommentClientRequestError, get_course_key, perform_request
+from forum import api as forum_api
+from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled
 
 
 class Comment(models.Model):
@@ -68,14 +70,21 @@ def flagAbuse(self, user, voteable):
             url = _url_for_flag_abuse_comment(voteable.id)
         else:
             raise CommentClientRequestError("Can only flag/unflag threads or comments")
-        params = {'user_id': user.id}
-        response = perform_request(
-            'put',
-            url,
-            params,
-            metric_tags=self._metric_tags,
-            metric_action='comment.abuse.flagged'
-        )
+        course_key = get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            if voteable.type == 'thread':
+                response = forum_api.update_thread_flag(voteable.id, "flag", user.id, str(course_key))
+            else:
+                response = forum_api.update_comment_flag(voteable.id, "flag", user.id, str(course_key))
+        else:
+            params = {'user_id': user.id}
+            response = perform_request(
+                'put',
+                url,
+                params,
+                metric_tags=self._metric_tags,
+                metric_action='comment.abuse.flagged'
+            )
         voteable._update_from_response(response)
 
     def unFlagAbuse(self, user, voteable, removeAll):
@@ -85,20 +94,47 @@ def unFlagAbuse(self, user, voteable, removeAll):
             url = _url_for_unflag_abuse_comment(voteable.id)
         else:
             raise CommentClientRequestError("Can flag/unflag for threads or comments")
-        params = {'user_id': user.id}
-
-        if removeAll:
-            params['all'] = True
-
-        response = perform_request(
-            'put',
-            url,
-            params,
-            metric_tags=self._metric_tags,
-            metric_action='comment.abuse.unflagged'
-        )
+        course_key = get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            if voteable.type == "thread":
+                response = forum_api.update_thread_flag(
+                    thread_id=voteable.id,
+                    action="unflag",
+                    user_id=user.id,
+                    update_all=bool(removeAll),
+                    course_id=str(course_key)
+                )
+            else:
+                response = forum_api.update_comment_flag(
+                    comment_id=voteable.id,
+                    action="unflag",
+                    user_id=user.id,
+                    update_all=bool(removeAll),
+                    course_id=str(course_key)
+                )
+        else:
+            params = {'user_id': user.id}
+
+            if removeAll:
+                params['all'] = True
+
+            response = perform_request(
+                'put',
+                url,
+                params,
+                metric_tags=self._metric_tags,
+                metric_action='comment.abuse.unflagged'
+            )
         voteable._update_from_response(response)
 
+    @property
+    def body_text(self):
+        """
+        Return the text content of the comment html body.
+        """
+        soup = BeautifulSoup(self.body, 'html.parser')
+        return soup.get_text()
+
 
 def _url_for_thread_comments(thread_id):
     return f"{settings.PREFIX}/threads/{thread_id}/comments"
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/course.py b/openedx/core/djangoapps/django_comment_common/comment_client/course.py
index 67d7efd22838..8cbb580e7831 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/course.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/course.py
@@ -7,8 +7,10 @@
 from edx_django_utils.monitoring import function_trace
 from opaque_keys.edx.keys import CourseKey
 
+from forum import api as forum_api
 from openedx.core.djangoapps.django_comment_common.comment_client import settings
 from openedx.core.djangoapps.django_comment_common.comment_client.utils import perform_request
+from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled
 
 
 def get_course_commentable_counts(course_key: CourseKey) -> Dict[str, Dict[str, int]]:
@@ -29,17 +31,20 @@ def get_course_commentable_counts(course_key: CourseKey) -> Dict[str, Dict[str,
             }
 
     """
-    url = f"{settings.PREFIX}/commentables/{course_key}/counts"
-    response = perform_request(
-        'get',
-        url,
-        metric_tags=[
-            f"course_key:{course_key}",
-            "function:get_course_commentable_counts",
-        ],
-        metric_action='commentable_stats.retrieve',
-    )
-    return response
+    if is_forum_v2_enabled(course_key):
+        commentable_stats = forum_api.get_commentables_stats(str(course_key))
+    else:
+        url = f"{settings.PREFIX}/commentables/{course_key}/counts"
+        commentable_stats = perform_request(
+            'get',
+            url,
+            metric_tags=[
+                f"course_key:{course_key}",
+                "function:get_course_commentable_counts",
+            ],
+            metric_action='commentable_stats.retrieve',
+        )
+    return commentable_stats
 
 
 @function_trace("get_course_user_stats")
@@ -76,17 +81,21 @@ def get_course_user_stats(course_key: CourseKey, params: Optional[Dict] = None)
     """
     if params is None:
         params = {}
-    url = f"{settings.PREFIX}/users/{course_key}/stats"
-    return perform_request(
-        'get',
-        url,
-        params,
-        metric_action='user.course_stats',
-        metric_tags=[
-            f"course_key:{course_key}",
-            "function:get_course_user_stats",
-        ],
-    )
+    if is_forum_v2_enabled(course_key):
+        course_stats = forum_api.get_user_course_stats(str(course_key), **params)
+    else:
+        url = f"{settings.PREFIX}/users/{course_key}/stats"
+        course_stats = perform_request(
+            'get',
+            url,
+            params,
+            metric_action='user.course_stats',
+            metric_tags=[
+                f"course_key:{course_key}",
+                "function:get_course_user_stats",
+            ],
+        )
+    return course_stats
 
 
 @function_trace("update_course_users_stats")
@@ -100,13 +109,17 @@ def update_course_users_stats(course_key: CourseKey) -> Dict:
     Returns:
         dict: data returned by API. Contains count of users updated.
     """
-    url = f"{settings.PREFIX}/users/{course_key}/update_stats"
-    return perform_request(
-        'post',
-        url,
-        metric_action='user.update_course_stats',
-        metric_tags=[
-            f"course_key:{course_key}",
-            "function:update_course_users_stats",
-        ],
-    )
+    if is_forum_v2_enabled(course_key):
+        course_stats = forum_api.update_users_in_course(str(course_key))
+    else:
+        url = f"{settings.PREFIX}/users/{course_key}/update_stats"
+        course_stats = perform_request(
+            'post',
+            url,
+            metric_action='user.update_course_stats',
+            metric_tags=[
+                f"course_key:{course_key}",
+                "function:update_course_users_stats",
+            ],
+        )
+    return course_stats
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/models.py b/openedx/core/djangoapps/django_comment_common/comment_client/models.py
index 4e602809c82a..9b6c9ca03f3d 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/models.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/models.py
@@ -2,8 +2,11 @@
 
 
 import logging
+import typing as t
 
-from .utils import CommentClientRequestError, extract, perform_request
+from .utils import CommentClientRequestError, extract, perform_request, get_course_key
+from forum import api as forum_api
+from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled, is_forum_v2_disabled_globally
 
 log = logging.getLogger(__name__)
 
@@ -69,14 +72,27 @@ def retrieve(self, *args, **kwargs):
         return self
 
     def _retrieve(self, *args, **kwargs):
-        url = self.url(action='get', params=self.attributes)
-        response = perform_request(
-            'get',
-            url,
-            self.default_retrieve_params,
-            metric_tags=self._metric_tags,
-            metric_action='model.retrieve'
-        )
+        course_id = self.attributes.get("course_id") or kwargs.get("course_id")
+        if course_id:
+            course_key = get_course_key(course_id)
+            use_forumv2 = is_forum_v2_enabled(course_key)
+        else:
+            use_forumv2, course_id = is_forum_v2_enabled_for_comment(self.id)
+        response = None
+        if use_forumv2:
+            if self.type == "comment":
+                response = forum_api.get_parent_comment(comment_id=self.attributes["id"], course_id=course_id)
+            if response is None:
+                raise CommentClientRequestError("Forum v2 API call is missing")
+        else:
+            url = self.url(action='get', params=self.attributes)
+            response = perform_request(
+                'get',
+                url,
+                self.default_retrieve_params,
+                metric_tags=self._metric_tags,
+                metric_action='model.retrieve'
+            )
         self._update_from_response(response)
 
     @property
@@ -151,33 +167,27 @@ def save(self, params=None):
         """
         self.before_save(self)
         if self.id:   # if we have id already, treat this as an update
-            request_params = self.updatable_attributes()
-            if params:
-                request_params.update(params)
-            url = self.url(action='put', params=self.attributes)
-            response = perform_request(
-                'put',
-                url,
-                request_params,
-                metric_tags=self._metric_tags,
-                metric_action='model.update'
-            )
-        else:   # otherwise, treat this as an insert
-            url = self.url(action='post', params=self.attributes)
-            response = perform_request(
-                'post',
-                url,
-                self.initializable_attributes(),
-                metric_tags=self._metric_tags,
-                metric_action='model.insert'
-            )
+            response = self.handle_update(params)
+        else:  # otherwise, treat this as an insert
+            response = self.handle_create(params)
+
         self.retrieved = True
         self._update_from_response(response)
         self.after_save(self)
 
     def delete(self):
-        url = self.url(action='delete', params=self.attributes)
-        response = perform_request('delete', url, metric_tags=self._metric_tags, metric_action='model.delete')
+        course_key = get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            response = None
+            if self.type == "comment":
+                response = forum_api.delete_comment(comment_id=self.attributes["id"], course_id=str(course_key))
+            elif self.type == "thread":
+                response = forum_api.delete_thread(thread_id=self.attributes["id"], course_id=str(course_key))
+            if response is None:
+                raise CommentClientRequestError("Forum v2 API call is missing")
+        else:
+            url = self.url(action='delete', params=self.attributes)
+            response = perform_request('delete', url, metric_tags=self._metric_tags, metric_action='model.delete')
         self.retrieved = True
         self._update_from_response(response)
 
@@ -208,3 +218,176 @@ def url(cls, action, params=None):
                 raise CommentClientRequestError(f"Cannot perform action {action} without id")  # lint-amnesty, pylint: disable=raise-missing-from
         else:   # action must be in DEFAULT_ACTIONS_WITHOUT_ID now
             return cls.url_without_id()
+
+    def handle_update(self, params=None):
+        request_params = self.updatable_attributes()
+        if params:
+            request_params.update(params)
+        course_id = self.attributes.get("course_id") or request_params.get("course_id")
+        course_key = get_course_key(course_id)
+        if is_forum_v2_enabled(course_key):
+            response = None
+            if self.type == "comment":
+                response = self.handle_update_comment(request_params, str(course_key))
+            elif self.type == "thread":
+                response = self.handle_update_thread(request_params, str(course_key))
+            elif self.type == "user":
+                response = self.handle_update_user(request_params, str(course_key))
+            if response is None:
+                raise CommentClientRequestError("Forum v2 API call is missing")
+        else:
+            response = self.perform_http_put_request(request_params)
+        return response
+
+    def handle_update_user(self, request_params, course_id):
+        try:
+            username = request_params["username"]
+            external_id = str(request_params["external_id"])
+        except KeyError as e:
+            raise e
+        response = forum_api.update_user(
+            external_id,
+            username=username,
+            course_id=course_id,
+        )
+        return response
+
+    def handle_update_comment(self, request_params, course_id):
+        request_data = {
+            "comment_id": self.attributes["id"],
+            "body": request_params.get("body"),
+            "course_id": request_params.get("course_id"),
+            "user_id": request_params.get("user_id"),
+            "anonymous": request_params.get("anonymous"),
+            "anonymous_to_peers": request_params.get("anonymous_to_peers"),
+            "endorsed": request_params.get("endorsed"),
+            "closed": request_params.get("closed"),
+            "editing_user_id": request_params.get("editing_user_id"),
+            "edit_reason_code": request_params.get("edit_reason_code"),
+            "endorsement_user_id": request_params.get("endorsement_user_id"),
+            "course_key": course_id
+        }
+        request_data = {k: v for k, v in request_data.items() if v is not None}
+        response = forum_api.update_comment(**request_data)
+        return response
+
+    def handle_update_thread(self, request_params, course_id):
+        request_data = {
+            "thread_id": self.attributes["id"],
+            "title": request_params.get("title"),
+            "body": request_params.get("body"),
+            "course_id": request_params.get("course_id"),
+            "anonymous": request_params.get("anonymous"),
+            "anonymous_to_peers": request_params.get("anonymous_to_peers"),
+            "closed": request_params.get("closed"),
+            "commentable_id": request_params.get("commentable_id"),
+            "user_id": request_params.get("user_id"),
+            "editing_user_id": request_params.get("editing_user_id"),
+            "pinned": request_params.get("pinned"),
+            "thread_type": request_params.get("thread_type"),
+            "edit_reason_code": request_params.get("edit_reason_code"),
+            "close_reason_code": request_params.get("close_reason_code"),
+            "closing_user_id": request_params.get("closing_user_id"),
+            "endorsed": request_params.get("endorsed"),
+            "course_key": course_id
+        }
+        request_data = {k: v for k, v in request_data.items() if v is not None}
+        response = forum_api.update_thread(**request_data)
+        return response
+
+    def perform_http_put_request(self, request_params):
+        url = self.url(action="put", params=self.attributes)
+        response = perform_request(
+            "put",
+            url,
+            request_params,
+            metric_tags=self._metric_tags,
+            metric_action="model.update",
+        )
+        return response
+
+    def perform_http_post_request(self):
+        url = self.url(action="post", params=self.attributes)
+        response = perform_request(
+            "post",
+            url,
+            self.initializable_attributes(),
+            metric_tags=self._metric_tags,
+            metric_action="model.insert",
+        )
+        return response
+
+    def handle_create(self, params=None):
+        course_id = self.attributes.get("course_id") or params.get("course_id")
+        course_key = get_course_key(course_id)
+        if is_forum_v2_enabled(course_key):
+            response = None
+            if self.type == "comment":
+                response = self.handle_create_comment(str(course_key))
+            elif self.type == "thread":
+                response = self.handle_create_thread(str(course_key))
+            if response is None:
+                raise CommentClientRequestError("Forum v2 API call is missing")
+        else:
+            response = self.perform_http_post_request()
+        return response
+
+    def handle_create_comment(self, course_id):
+        request_data = self.initializable_attributes()
+        body = request_data["body"]
+        user_id = request_data["user_id"]
+        course_id = course_id or str(request_data["course_id"])
+        if parent_id := self.attributes.get("parent_id"):
+            response = forum_api.create_child_comment(
+                parent_id,
+                body,
+                user_id,
+                course_id,
+                request_data.get("anonymous", False),
+                request_data.get("anonymous_to_peers", False),
+            )
+        else:
+            response = forum_api.create_parent_comment(
+                self.attributes["thread_id"],
+                body,
+                user_id,
+                course_id,
+                request_data.get("anonymous", False),
+                request_data.get("anonymous_to_peers", False),
+            )
+        return response
+
+    def handle_create_thread(self, course_id):
+        request_data = self.initializable_attributes()
+        response = forum_api.create_thread(
+            title=request_data["title"],
+            body=request_data["body"],
+            course_id=course_id or str(request_data["course_id"]),
+            user_id=str(request_data["user_id"]),
+            anonymous=request_data.get("anonymous", False),
+            anonymous_to_peers=request_data.get("anonymous_to_peers", False),
+            commentable_id=request_data.get("commentable_id", "course"),
+            thread_type=request_data.get("thread_type", "discussion"),
+            group_id=request_data.get("group_id", None),
+            context=request_data.get("context", None),
+        )
+        return response
+
+
+def is_forum_v2_enabled_for_comment(comment_id: str) -> tuple[bool, t.Optional[str]]:
+    """
+    Figure out whether we use forum v2 for a given comment.
+
+    See is_forum_v2_enabled_for_thread.
+
+    Return:
+
+        enabled (bool)
+        course_id (str or None)
+    """
+    if is_forum_v2_disabled_globally():
+        return False, None
+
+    course_id = forum_api.get_course_id_by_comment(comment_id)
+    course_key = get_course_key(course_id)
+    return is_forum_v2_enabled(course_key), course_id
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/subscriptions.py b/openedx/core/djangoapps/django_comment_common/comment_client/subscriptions.py
index 545948a092cc..2130dfc56be6 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/subscriptions.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/subscriptions.py
@@ -4,6 +4,8 @@
 import logging
 
 from . import models, settings, utils
+from forum import api as forum_api
+from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled
 
 log = logging.getLogger(__name__)
 
@@ -21,7 +23,7 @@ class Subscription(models.Model):
     base_url = f"{settings.PREFIX}/threads"
 
     @classmethod
-    def fetch(cls, thread_id, query_params):
+    def fetch(cls, thread_id, course_id, query_params):
         """
         Fetches the subscriptions for a given thread_id
         """
@@ -33,14 +35,23 @@ def fetch(cls, thread_id, query_params):
         params.update(
             utils.strip_blank(utils.strip_none(query_params))
         )
-        response = utils.perform_request(
-            'get',
-            cls.url(action='get', params=params) + "/subscriptions",
-            params,
-            metric_tags=[],
-            metric_action='subscription.get',
-            paged_results=True
-        )
+        course_key = utils.get_course_key(course_id)
+        if is_forum_v2_enabled(course_key):
+            response = forum_api.get_thread_subscriptions(
+                thread_id=thread_id,
+                page=params["page"],
+                per_page=params["per_page"],
+                course_id=str(course_key)
+            )
+        else:
+            response = utils.perform_request(
+                'get',
+                cls.url(action='get', params=params) + "/subscriptions",
+                params,
+                metric_tags=[],
+                metric_action='subscription.get',
+                paged_results=True
+            )
         return utils.SubscriptionsPaginatedResult(
             collection=response.get('collection', []),
             page=response.get('page', 1),
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/thread.py b/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
index ef5accbad25d..ecf420cfae56 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
@@ -2,10 +2,13 @@
 
 
 import logging
+import typing as t
 
 from eventtracking import tracker
 
 from . import models, settings, utils
+from forum import api as forum_api
+from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled, is_forum_v2_disabled_globally
 
 log = logging.getLogger(__name__)
 
@@ -59,14 +62,35 @@ def search(cls, query_params):
             url = cls.url(action='get_all', params=utils.extract(params, 'commentable_id'))
             if params.get('commentable_id'):
                 del params['commentable_id']
-        response = utils.perform_request(
-            'get',
-            url,
-            params,
-            metric_tags=['course_id:{}'.format(query_params['course_id'])],
-            metric_action='thread.search',
-            paged_results=True
-        )
+
+        if is_forum_v2_enabled(utils.get_course_key(query_params['course_id'])):
+            if query_params.get('text'):
+                search_params = utils.strip_none(params)
+                if user_id := search_params.get('user_id'):
+                    search_params['user_id'] = str(user_id)
+                if group_ids := search_params.get('group_ids'):
+                    search_params['group_ids'] = [int(group_id) for group_id in group_ids.split(',')]
+                elif group_id := search_params.get('group_id'):
+                    search_params['group_ids'] = [int(group_id)]
+                    search_params.pop('group_id', None)
+                if commentable_ids := search_params.get('commentable_ids'):
+                    search_params['commentable_ids'] = commentable_ids.split(',')
+                elif commentable_id := search_params.get('commentable_id'):
+                    search_params['commentable_ids'] = [commentable_id]
+                    search_params.pop('commentable_id', None)
+                response = forum_api.search_threads(**search_params)
+            else:
+                response = forum_api.get_user_threads(**params)
+        else:
+            response = utils.perform_request(
+                'get',
+                url,
+                params,
+                metric_tags=['course_id:{}'.format(query_params['course_id'])],
+                metric_action='thread.search',
+                paged_results=True
+            )
+
         if query_params.get('text'):
             search_query = query_params['text']
             course_id = query_params['course_id']
@@ -148,14 +172,28 @@ def _retrieve(self, *args, **kwargs):
             'merge_question_type_responses': kwargs.get('merge_question_type_responses', False)
         }
         request_params = utils.strip_none(request_params)
-
-        response = utils.perform_request(
-            'get',
-            url,
-            request_params,
-            metric_action='model.retrieve',
-            metric_tags=self._metric_tags
-        )
+        course_id = kwargs.get("course_id")
+        if course_id:
+            course_key = utils.get_course_key(course_id)
+            use_forumv2 = is_forum_v2_enabled(course_key)
+        else:
+            use_forumv2, course_id = is_forum_v2_enabled_for_thread(self.id)
+        if use_forumv2:
+            if user_id := request_params.get('user_id'):
+                request_params['user_id'] = str(user_id)
+            response = forum_api.get_thread(
+                thread_id=self.id,
+                params=request_params,
+                course_id=course_id,
+            )
+        else:
+            response = utils.perform_request(
+                'get',
+                url,
+                request_params,
+                metric_action='model.retrieve',
+                metric_tags=self._metric_tags
+            )
         self._update_from_response(response)
 
     def flagAbuse(self, user, voteable):
@@ -163,14 +201,18 @@ def flagAbuse(self, user, voteable):
             url = _url_for_flag_abuse_thread(voteable.id)
         else:
             raise utils.CommentClientRequestError("Can only flag/unflag threads or comments")
-        params = {'user_id': user.id}
-        response = utils.perform_request(
-            'put',
-            url,
-            params,
-            metric_action='thread.abuse.flagged',
-            metric_tags=self._metric_tags
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            response = forum_api.update_thread_flag(voteable.id, "flag", user.id, str(course_key))
+        else:
+            params = {'user_id': user.id}
+            response = utils.perform_request(
+                'put',
+                url,
+                params,
+                metric_action='thread.abuse.flagged',
+                metric_tags=self._metric_tags
+            )
         voteable._update_from_response(response)
 
     def unFlagAbuse(self, user, voteable, removeAll):
@@ -178,42 +220,68 @@ def unFlagAbuse(self, user, voteable, removeAll):
             url = _url_for_unflag_abuse_thread(voteable.id)
         else:
             raise utils.CommentClientRequestError("Can only flag/unflag for threads or comments")
-        params = {'user_id': user.id}
-        #if you're an admin, when you unflag, remove ALL flags
-        if removeAll:
-            params['all'] = True
-
-        response = utils.perform_request(
-            'put',
-            url,
-            params,
-            metric_tags=self._metric_tags,
-            metric_action='thread.abuse.unflagged'
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            response = forum_api.update_thread_flag(
+                thread_id=voteable.id,
+                action="unflag",
+                user_id=user.id,
+                update_all=bool(removeAll),
+                course_id=str(course_key)
+            )
+        else:
+            params = {'user_id': user.id}
+            #if you're an admin, when you unflag, remove ALL flags
+            if removeAll:
+                params['all'] = True
+
+            response = utils.perform_request(
+                'put',
+                url,
+                params,
+                metric_tags=self._metric_tags,
+                metric_action='thread.abuse.unflagged'
+            )
         voteable._update_from_response(response)
 
     def pin(self, user, thread_id):
-        url = _url_for_pin_thread(thread_id)
-        params = {'user_id': user.id}
-        response = utils.perform_request(
-            'put',
-            url,
-            params,
-            metric_tags=self._metric_tags,
-            metric_action='thread.pin'
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            response = forum_api.pin_thread(
+                user_id=user.id,
+                thread_id=thread_id,
+                course_id=str(course_key)
+            )
+        else:
+            url = _url_for_pin_thread(thread_id)
+            params = {'user_id': user.id}
+            response = utils.perform_request(
+                'put',
+                url,
+                params,
+                metric_tags=self._metric_tags,
+                metric_action='thread.pin'
+            )
         self._update_from_response(response)
 
     def un_pin(self, user, thread_id):
-        url = _url_for_un_pin_thread(thread_id)
-        params = {'user_id': user.id}
-        response = utils.perform_request(
-            'put',
-            url,
-            params,
-            metric_tags=self._metric_tags,
-            metric_action='thread.unpin'
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            response = forum_api.unpin_thread(
+                user_id=user.id,
+                thread_id=thread_id,
+                course_id=str(course_key)
+            )
+        else:
+            url = _url_for_un_pin_thread(thread_id)
+            params = {'user_id': user.id}
+            response = utils.perform_request(
+                'put',
+                url,
+                params,
+                metric_tags=self._metric_tags,
+                metric_action='thread.unpin'
+            )
         self._update_from_response(response)
 
 
@@ -231,3 +299,28 @@ def _url_for_pin_thread(thread_id):
 
 def _url_for_un_pin_thread(thread_id):
     return f"{settings.PREFIX}/threads/{thread_id}/unpin"
+
+
+def is_forum_v2_enabled_for_thread(thread_id: str) -> tuple[bool, t.Optional[str]]:
+    """
+    Figure out whether we use forum v2 for a given thread.
+
+    This is a complex affair... First, we check the value of the DISABLE_FORUM_V2
+    setting, which overrides everything. If this setting does not exist, then we need to
+    find the course ID that corresponds to the thread ID. Then, we return the value of
+    the course waffle flag for this course ID.
+
+    Note that to fetch the course ID associated to a thread ID, we need to connect both
+    to mongodb and mysql. As a consequence, when forum v2 needs adequate connection
+    strings for both backends.
+
+    Return:
+
+        enabled (bool)
+        course_id (str or None)
+    """
+    if is_forum_v2_disabled_globally():
+        return False, None
+    course_id = forum_api.get_course_id_by_thread(thread_id)
+    course_key = utils.get_course_key(course_id)
+    return is_forum_v2_enabled(course_key), course_id
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/user.py b/openedx/core/djangoapps/django_comment_common/comment_client/user.py
index 684469c9e787..2de4fbbfa95a 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/user.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/user.py
@@ -1,8 +1,10 @@
 # pylint: disable=missing-docstring,protected-access
 """ User model wrapper for comment service"""
 
-
 from . import models, settings, utils
+from forum import api as forum_api
+from forum.utils import ForumV2RequestError, str_to_bool
+from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled
 
 
 class User(models.Model):
@@ -34,34 +36,55 @@ def read(self, source):
         """
         Calls cs_comments_service to mark thread as read for the user
         """
-        params = {'source_type': source.type, 'source_id': source.id}
-        utils.perform_request(
-            'post',
-            _url_for_read(self.id),
-            params,
-            metric_action='user.read',
-            metric_tags=self._metric_tags + [f'target.type:{source.type}'],
-        )
+        course_id = self.attributes.get("course_id")
+        course_key = utils.get_course_key(course_id)
+        if is_forum_v2_enabled(course_key):
+            forum_api.mark_thread_as_read(self.id, source.id, course_id=str(course_id))
+        else:
+            params = {'source_type': source.type, 'source_id': source.id}
+            utils.perform_request(
+                'post',
+                _url_for_read(self.id),
+                params,
+                metric_action='user.read',
+                metric_tags=self._metric_tags + [f'target.type:{source.type}'],
+            )
 
     def follow(self, source):
-        params = {'source_type': source.type, 'source_id': source.id}
-        utils.perform_request(
-            'post',
-            _url_for_subscription(self.id),
-            params,
-            metric_action='user.follow',
-            metric_tags=self._metric_tags + [f'target.type:{source.type}'],
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            forum_api.create_subscription(
+                user_id=self.id,
+                source_id=source.id,
+                course_id=str(course_key)
+            )
+        else:
+            params = {'source_type': source.type, 'source_id': source.id}
+            utils.perform_request(
+                'post',
+                _url_for_subscription(self.id),
+                params,
+                metric_action='user.follow',
+                metric_tags=self._metric_tags + [f'target.type:{source.type}'],
+            )
 
     def unfollow(self, source):
-        params = {'source_type': source.type, 'source_id': source.id}
-        utils.perform_request(
-            'delete',
-            _url_for_subscription(self.id),
-            params,
-            metric_action='user.unfollow',
-            metric_tags=self._metric_tags + [f'target.type:{source.type}'],
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            forum_api.delete_subscription(
+                user_id=self.id,
+                source_id=source.id,
+                course_id=str(course_key)
+            )
+        else:
+            params = {'source_type': source.type, 'source_id': source.id}
+            utils.perform_request(
+                'delete',
+                _url_for_subscription(self.id),
+                params,
+                metric_action='user.unfollow',
+                metric_tags=self._metric_tags + [f'target.type:{source.type}'],
+            )
 
     def vote(self, voteable, value):
         if voteable.type == 'thread':
@@ -70,14 +93,31 @@ def vote(self, voteable, value):
             url = _url_for_vote_comment(voteable.id)
         else:
             raise utils.CommentClientRequestError("Can only vote / unvote for threads or comments")
-        params = {'user_id': self.id, 'value': value}
-        response = utils.perform_request(
-            'put',
-            url,
-            params,
-            metric_action='user.vote',
-            metric_tags=self._metric_tags + [f'target.type:{voteable.type}'],
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            if voteable.type == 'thread':
+                response = forum_api.update_thread_votes(
+                    thread_id=voteable.id,
+                    user_id=self.id,
+                    value=value,
+                    course_id=str(course_key)
+                )
+            else:
+                response = forum_api.update_comment_votes(
+                    comment_id=voteable.id,
+                    user_id=self.id,
+                    value=value,
+                    course_id=str(course_key)
+                )
+        else:
+            params = {'user_id': self.id, 'value': value}
+            response = utils.perform_request(
+                'put',
+                url,
+                params,
+                metric_action='user.vote',
+                metric_tags=self._metric_tags + [f'target.type:{voteable.type}'],
+            )
         voteable._update_from_response(response)
 
     def unvote(self, voteable):
@@ -87,14 +127,29 @@ def unvote(self, voteable):
             url = _url_for_vote_comment(voteable.id)
         else:
             raise utils.CommentClientRequestError("Can only vote / unvote for threads or comments")
-        params = {'user_id': self.id}
-        response = utils.perform_request(
-            'delete',
-            url,
-            params,
-            metric_action='user.unvote',
-            metric_tags=self._metric_tags + [f'target.type:{voteable.type}'],
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            if voteable.type == 'thread':
+                response = forum_api.delete_thread_vote(
+                    thread_id=voteable.id,
+                    user_id=self.id,
+                    course_id=str(course_key)
+                )
+            else:
+                response = forum_api.delete_comment_vote(
+                    comment_id=voteable.id,
+                    user_id=self.id,
+                    course_id=str(course_key)
+                )
+        else:
+            params = {'user_id': self.id}
+            response = utils.perform_request(
+                'delete',
+                url,
+                params,
+                metric_action='user.unvote',
+                metric_tags=self._metric_tags + [f'target.type:{voteable.type}'],
+            )
         voteable._update_from_response(response)
 
     def active_threads(self, query_params=None):
@@ -105,14 +160,28 @@ def active_threads(self, query_params=None):
         url = _url_for_user_active_threads(self.id)
         params = {'course_id': str(self.course_id)}
         params.update(query_params)
-        response = utils.perform_request(
-            'get',
-            url,
-            params,
-            metric_action='user.active_threads',
-            metric_tags=self._metric_tags,
-            paged_results=True,
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            if user_id := params.get("user_id"):
+                params["user_id"] = str(user_id)
+            if page := params.get("page"):
+                params["page"] = int(page)
+            if per_page := params.get("per_page"):
+                params["per_page"] = int(per_page)
+            if count_flagged := params.get("count_flagged", False):
+                params["count_flagged"] = str_to_bool(count_flagged)
+            if not params.get("course_id"):
+                params["course_id"] = str(course_key)
+            response = forum_api.get_user_active_threads(**params)
+        else:
+            response = utils.perform_request(
+                'get',
+                url,
+                params,
+                metric_action='user.active_threads',
+                metric_tags=self._metric_tags,
+                paged_results=True,
+            )
         return response.get('collection', []), response.get('page', 1), response.get('num_pages', 1)
 
     def subscribed_threads(self, query_params=None):
@@ -125,14 +194,28 @@ def subscribed_threads(self, query_params=None):
         url = _url_for_user_subscribed_threads(self.id)
         params = {'course_id': str(self.course_id)}
         params.update(query_params)
-        response = utils.perform_request(
-            'get',
-            url,
-            params,
-            metric_action='user.subscribed_threads',
-            metric_tags=self._metric_tags,
-            paged_results=True
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            if user_id := params.get("user_id"):
+                params["user_id"] = str(user_id)
+            if page := params.get("page"):
+                params["page"] = int(page)
+            if per_page := params.get("per_page"):
+                params["per_page"] = int(per_page)
+            if count_flagged := params.get("count_flagged", False):
+                params["count_flagged"] = str_to_bool(count_flagged)
+            if not params.get("course_id"):
+                params["course_id"] = str(course_key)
+            response = forum_api.get_user_threads(**params)
+        else:
+            response = utils.perform_request(
+                'get',
+                url,
+                params,
+                metric_action='user.subscribed_threads',
+                metric_tags=self._metric_tags,
+                paged_results=True
+            )
         return utils.CommentClientPaginatedResult(
             collection=response.get('collection', []),
             page=response.get('page', 1),
@@ -144,23 +227,39 @@ def _retrieve(self, *args, **kwargs):
         url = self.url(action='get', params=self.attributes)
         retrieve_params = self.default_retrieve_params.copy()
         retrieve_params.update(kwargs)
+
         if self.attributes.get('course_id'):
             retrieve_params['course_id'] = str(self.course_id)
         if self.attributes.get('group_id'):
             retrieve_params['group_id'] = self.group_id
-        try:
-            response = utils.perform_request(
-                'get',
-                url,
-                retrieve_params,
-                metric_action='model.retrieve',
-                metric_tags=self._metric_tags,
-            )
-        except utils.CommentClientRequestError as e:
-            if e.status_code == 404:
-                # attempt to gracefully recover from a previous failure
-                # to sync this user to the comments service.
-                self.save()
+
+        # course key -> id conversation
+        course_id = retrieve_params.get('course_id')
+        if course_id:
+            course_id = str(course_id)
+            retrieve_params['course_id'] = course_id
+        course_key = utils.get_course_key(course_id)
+
+        if is_forum_v2_enabled(course_key):
+            group_ids = [retrieve_params['group_id']] if 'group_id' in retrieve_params else []
+            is_complete = retrieve_params['complete']
+            try:
+                response = forum_api.get_user(
+                    self.attributes["id"],
+                    group_ids=group_ids,
+                    course_id=course_id,
+                    complete=is_complete
+                )
+            except ForumV2RequestError as e:
+                self.save({"course_id": course_id})
+                response = forum_api.get_user(
+                    self.attributes["id"],
+                    group_ids=group_ids,
+                    course_id=course_id,
+                    complete=is_complete
+                )
+        else:
+            try:
                 response = utils.perform_request(
                     'get',
                     url,
@@ -168,33 +267,52 @@ def _retrieve(self, *args, **kwargs):
                     metric_action='model.retrieve',
                     metric_tags=self._metric_tags,
                 )
-            else:
-                raise
+            except utils.CommentClientRequestError as e:
+                if e.status_code == 404:
+                    # attempt to gracefully recover from a previous failure
+                    # to sync this user to the comments service.
+                    self.save()
+                    response = utils.perform_request(
+                        'get',
+                        url,
+                        retrieve_params,
+                        metric_action='model.retrieve',
+                        metric_tags=self._metric_tags,
+                    )
+                else:
+                    raise
         self._update_from_response(response)
 
     def retire(self, retired_username):
-        url = _url_for_retire(self.id)
-        params = {'retired_username': retired_username}
-
-        utils.perform_request(
-            'post',
-            url,
-            params,
-            raw=True,
-            metric_action='user.retire',
-            metric_tags=self._metric_tags
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            forum_api.retire_user(user_id=self.id, retired_username=retired_username, course_id=str(course_key))
+        else:
+            url = _url_for_retire(self.id)
+            params = {'retired_username': retired_username}
+            utils.perform_request(
+                'post',
+                url,
+                params,
+                raw=True,
+                metric_action='user.retire',
+                metric_tags=self._metric_tags
+            )
 
     def replace_username(self, new_username):
-        url = _url_for_username_replacement(self.id)
-        params = {"new_username": new_username}
-
-        utils.perform_request(
-            'post',
-            url,
-            params,
-            raw=True,
-        )
+        course_key = utils.get_course_key(self.attributes.get("course_id"))
+        if is_forum_v2_enabled(course_key):
+            forum_api.update_username(user_id=self.id, new_username=new_username, course_id=str(course_key))
+        else:
+            url = _url_for_username_replacement(self.id)
+            params = {"new_username": new_username}
+
+            utils.perform_request(
+                'post',
+                url,
+                params,
+                raw=True,
+            )
 
 
 def _url_for_vote_comment(comment_id):
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
index a67cdbdbc483..e77f39e6277d 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
@@ -7,6 +7,7 @@
 
 import requests
 from django.utils.translation import get_language
+from opaque_keys.edx.keys import CourseKey
 
 from .settings import SERVICE_HOST as COMMENTS_SERVICE
 
@@ -167,3 +168,19 @@ def check_forum_heartbeat():
             return 'forum', False, res.get('check', 'Forum heartbeat failed')
     except Exception as fail:
         return 'forum', False, str(fail)
+
+
+def get_course_key(course_id: CourseKey | str | None) -> CourseKey | None:
+    """
+    Returns a CourseKey if the provided course_id is a valid string representation of a CourseKey.
+    If course_id is None or already a CourseKey object, it returns the course_id as is.
+    Args:
+        course_id (CourseKey | str | None): The course ID to be converted.
+    Returns:
+        CourseKey | None: The corresponding CourseKey object or None if the input is None.
+    Raises:
+        KeyError: If course_id is not a valid string representation of a CourseKey.
+    """
+    if course_id and isinstance(course_id, str):
+        course_id = CourseKey.from_string(course_id)
+    return course_id
diff --git a/openedx/core/djangoapps/learner_pathway/admin.py b/openedx/core/djangoapps/learner_pathway/admin.py
deleted file mode 100644
index f69e12dccdf6..000000000000
--- a/openedx/core/djangoapps/learner_pathway/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-Admin interface for learner_pathway App.
-"""
diff --git a/openedx/core/djangoapps/learner_pathway/apps.py b/openedx/core/djangoapps/learner_pathway/apps.py
deleted file mode 100644
index 101ffd557015..000000000000
--- a/openedx/core/djangoapps/learner_pathway/apps.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-Configuration for learner_pathway Django app
-"""
-
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-
-class LearnerPathwayConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'learner_pathway'
-    verbose_name = _("Learner Pathways")
diff --git a/openedx/core/djangoapps/learner_pathway/migrations/__init__.py b/openedx/core/djangoapps/learner_pathway/migrations/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/core/djangoapps/learner_pathway/models.py b/openedx/core/djangoapps/learner_pathway/models.py
deleted file mode 100644
index a03ee95ad3ae..000000000000
--- a/openedx/core/djangoapps/learner_pathway/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-Models for learner_pathway App.
-"""
diff --git a/openedx/core/djangoapps/learner_pathway/tests/__init__.py b/openedx/core/djangoapps/learner_pathway/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/core/djangoapps/learner_pathway/views.py b/openedx/core/djangoapps/learner_pathway/views.py
deleted file mode 100644
index 8a87b81297d3..000000000000
--- a/openedx/core/djangoapps/learner_pathway/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-Views for learner_pathway App.
-"""
diff --git a/openedx/core/djangoapps/models/course_details.py b/openedx/core/djangoapps/models/course_details.py
index d8d5deae0110..c00d7d0b8816 100644
--- a/openedx/core/djangoapps/models/course_details.py
+++ b/openedx/core/djangoapps/models/course_details.py
@@ -371,10 +371,6 @@ def validate_certificate_settings(cls, certificate_available_date, certificates_
             tuple[str, str]: updated certificate_available_date, updated certificates_display_behavior
             None
         """
-        # If V2 is not enable, return original values
-        if not settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False):
-            return (certificate_available_date, certificates_display_behavior)
-
         # "early_no_info" will always show regardless of settings
         if certificates_display_behavior == CertificatesDisplayBehaviors.EARLY_NO_INFO:
             return (None, CertificatesDisplayBehaviors.EARLY_NO_INFO)
diff --git a/openedx/core/djangoapps/models/tests/test_course_details.py b/openedx/core/djangoapps/models/tests/test_course_details.py
index 86301740c7f1..41e739ecb4c8 100644
--- a/openedx/core/djangoapps/models/tests/test_course_details.py
+++ b/openedx/core/djangoapps/models/tests/test_course_details.py
@@ -8,7 +8,6 @@
 import pytest
 import ddt
 from pytz import UTC
-from unittest.mock import patch  # lint-amnesty, pylint: disable=wrong-import-order
 
 from django.conf import settings
 from xmodule.modulestore import ModuleStoreEnum
@@ -212,30 +211,7 @@ def test_fetch_video(self):
         ),
     )
     @ddt.unpack
-    @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
-    def test_validate_certificate_settings_v2(self, stored_date, stored_behavior, expected_date, expected_behavior):
-        assert CourseDetails.validate_certificate_settings(
-            stored_date, stored_behavior
-        ) == (expected_date, expected_behavior)
-
-    @ddt.data(
-        (
-            EXAMPLE_CERTIFICATE_AVAILABLE_DATE,
-            CertificatesDisplayBehaviors.END_WITH_DATE,
-            EXAMPLE_CERTIFICATE_AVAILABLE_DATE,
-            CertificatesDisplayBehaviors.END_WITH_DATE
-        ),
-        (
-            None,
-            "invalid_option",
-            None,
-            "invalid_option"
-        ),
-    )
-    @ddt.unpack
-    @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=False)
-    def test_validate_certificate_settings_v1(self, stored_date, stored_behavior, expected_date, expected_behavior):
-        """Test that method just returns passed in arguments if v2 is off"""
+    def test_validate_certificate_settings(self, stored_date, stored_behavior, expected_date, expected_behavior):
         assert CourseDetails.validate_certificate_settings(
             stored_date, stored_behavior
         ) == (expected_date, expected_behavior)
diff --git a/openedx/core/djangoapps/notifications/base_notification.py b/openedx/core/djangoapps/notifications/base_notification.py
index a417d4540588..91a1635aec10 100644
--- a/openedx/core/djangoapps/notifications/base_notification.py
+++ b/openedx/core/djangoapps/notifications/base_notification.py
@@ -7,11 +7,10 @@
 from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
 from .utils import find_app_in_normalized_apps, find_pref_in_normalized_prefs
 from ..django_comment_common.models import FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA
-from .notification_content import get_notification_type_content_function
+from .notification_content import get_notification_type_context_function
 
 FILTER_AUDIT_EXPIRED_USERS_WITH_NO_ROLE = 'filter_audit_expired_users_with_no_role'
 
-
 COURSE_NOTIFICATION_TYPES = {
     'new_comment_on_response': {
         'notification_app': 'discussion',
@@ -32,6 +31,8 @@
         'is_core': True,
         'content_template': _('<{p}><{strong}>{replier_name}</{strong}> commented on <{strong}>{author_name}'
                               '</{strong}> response to your post <{strong}>{post_title}</{strong}></{p}>'),
+        'grouped_content_template': _('<{p}><{strong}>{replier_name}</{strong}> commented on <{strong}>{author_name}'
+                                      '</{strong}> response to your post <{strong}>{post_title}</{strong}></{p}>'),
         'content_context': {
             'post_title': 'Post title',
             'author_name': 'author name',
@@ -64,6 +65,8 @@
         'push': False,
         'non_editable': [],
         'content_template': _('<{p}><{strong}>{username}</{strong}> posted <{strong}>{post_title}</{strong}></{p}>'),
+        'grouped_content_template': _('<{p}><{strong}>{replier_name}</{strong}> and others started new discussions'
+                                      '</{p}>'),
         'content_context': {
             'post_title': 'Post title',
             'username': 'Post author name',
@@ -207,6 +210,26 @@
         'filters': [FILTER_AUDIT_EXPIRED_USERS_WITH_NO_ROLE],
         'visible_to': [CourseStaffRole.ROLE, CourseInstructorRole.ROLE]
     },
+    'ora_grade_assigned': {
+        'notification_app': 'grading',
+        'name': 'ora_grade_assigned',
+        'is_core': False,
+        'info': '',
+        'web': True,
+        'email': True,
+        'push': False,
+        'email_cadence': EmailCadence.DAILY,
+        'non_editable': [],
+        'content_template': _('<{p}>You have received {points_earned} out of {points_possible} on your assessment: '
+                              '<{strong}>{ora_name}</{strong}></{p}>'),
+        'content_context': {
+            'ora_name': 'Name of ORA in course',
+            'points_earned': 'Points earned',
+            'points_possible': 'Points possible',
+        },
+        'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED_USERS_WITH_NO_ROLE],
+    },
 }
 
 COURSE_NOTIFICATION_APPS = {
@@ -461,21 +484,46 @@ def get_notification_app_preferences(self):
 def get_notification_content(notification_type, context):
     """
     Returns notification content for the given notification type with provided context.
+
+    Args:
+    notification_type (str): The type of notification (e.g., 'course_update').
+    context (dict): The context data to be used in the notification template.
+
+    Returns:
+    str: Rendered notification content based on the template and context.
     """
-    html_tags_context = {
+    context.update({
         'strong': 'strong',
         'p': 'p',
-    }
-    content_function = get_notification_type_content_function(notification_type)
+    })
+
+    # Retrieve the function associated with the notification type.
+    context_function = get_notification_type_context_function(notification_type)
+
+    # Fix a specific case where 'course_update' needs to be renamed to 'course_updates'.
     if notification_type == 'course_update':
         notification_type = 'course_updates'
+
+    # Retrieve the notification type object from NotificationTypeManager.
     notification_type = NotificationTypeManager().notification_types.get(notification_type, None)
+
     if notification_type:
-        if content_function:
-            return content_function(notification_type, context)
-        notification_type_content_template = notification_type.get('content_template', None)
-        if notification_type_content_template:
-            return notification_type_content_template.format(**context, **html_tags_context)
+        # Check if the notification is grouped.
+        is_grouped = context.get('grouped', False)
+
+        # Determine the correct template key based on whether it's grouped or not.
+        template_key = "grouped_content_template" if is_grouped else "content_template"
+
+        # Get the corresponding template from the notification type.
+        template = notification_type.get(template_key, None)
+
+        # Apply the context function to transform or modify the context.
+        context = context_function(context)
+
+        if template:
+            # Handle grouped templates differently by modifying the context using a different function.
+            return template.format(**context)
+
     return ''
 
 
diff --git a/openedx/core/djangoapps/notifications/config/waffle.py b/openedx/core/djangoapps/notifications/config/waffle.py
index af89bb68574f..b74cd84dcab1 100644
--- a/openedx/core/djangoapps/notifications/config/waffle.py
+++ b/openedx/core/djangoapps/notifications/config/waffle.py
@@ -28,3 +28,34 @@
 # .. toggle_warning: When the flag is ON, Email Notifications feature is enabled.
 # .. toggle_tickets: INF-1259
 ENABLE_EMAIL_NOTIFICATIONS = WaffleFlag(f'{WAFFLE_NAMESPACE}.enable_email_notifications', __name__)
+
+# .. toggle_name: notifications.enable_ora_grade_notifications
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to enable ORA grade notifications
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2024-09-10
+# .. toggle_target_removal_date: 2024-10-10
+# .. toggle_tickets: INF-1304
+ENABLE_ORA_GRADE_NOTIFICATION = CourseWaffleFlag(f"{WAFFLE_NAMESPACE}.enable_ora_grade_notifications", __name__)
+
+# .. toggle_name: notifications.enable_notification_grouping
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to enable the Notifications Grouping feature
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2024-07-22
+# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_warning: When the flag is ON, Notifications Grouping feature is enabled.
+# .. toggle_tickets: INF-1472
+ENABLE_NOTIFICATION_GROUPING = CourseWaffleFlag(f'{WAFFLE_NAMESPACE}.enable_notification_grouping', __name__)
+
+# .. toggle_name: notifications.enable_new_notification_view
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to enable new notification view
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2024-09-30
+# .. toggle_target_removal_date: 2025-10-10
+# .. toggle_tickets: INF-1603
+ENABLE_NEW_NOTIFICATION_VIEW = WaffleFlag(f"{WAFFLE_NAMESPACE}.enable_new_notification_view", __name__)
diff --git a/openedx/core/djangoapps/notifications/email/events.py b/openedx/core/djangoapps/notifications/email/events.py
index 165539a018cb..a575d78eaeb5 100644
--- a/openedx/core/djangoapps/notifications/email/events.py
+++ b/openedx/core/djangoapps/notifications/email/events.py
@@ -12,19 +12,29 @@
 EMAIL_DIGEST_SENT = "edx.notifications.email_digest"
 
 
-def send_user_email_digest_sent_event(user, cadence_type, notifications):
+def send_user_email_digest_sent_event(user, cadence_type, notifications, message_context):
     """
     Sends tracker and segment email for user email digest
     """
     notification_breakdown = {key: 0 for key in COURSE_NOTIFICATION_APPS.keys()}
     for notification in notifications:
         notification_breakdown[notification.app_name] += 1
+
+    truncated_count = {}
+    email_content = message_context.get("email_content", [])
+    for app in email_content:
+        truncated_count[app.get("title", "")] = {
+            "total": app.get("total", -1),
+            "remaining_count": app.get("remaining_count", -1),
+        }
+
     event_data = {
         "username": user.username,
         "email": user.email,
         "cadence_type": cadence_type,
         "total_notifications_count": len(notifications),
         "count_breakdown": notification_breakdown,
+        "truncated_count": truncated_count,
         "notification_ids": [notification.id for notification in notifications],
         "send_at": str(datetime.datetime.now())
     }
diff --git a/openedx/core/djangoapps/notifications/email/tasks.py b/openedx/core/djangoapps/notifications/email/tasks.py
index 0d450fe9a917..c2e0a2fa375d 100644
--- a/openedx/core/djangoapps/notifications/email/tasks.py
+++ b/openedx/core/djangoapps/notifications/email/tasks.py
@@ -103,7 +103,7 @@ def send_digest_email_to_user(user, cadence_type, start_date, end_date, course_l
     ).personalize(recipient, course_language, message_context)
     message = add_headers_to_email_message(message, message_context)
     ace.send(message)
-    send_user_email_digest_sent_event(user, cadence_type, notifications)
+    send_user_email_digest_sent_event(user, cadence_type, notifications, message_context)
     logger.info(f'<Email Cadence> Email sent to {user.username} ==Temp Log==')
 
 
diff --git a/openedx/core/djangoapps/notifications/email/tests/test_utils.py b/openedx/core/djangoapps/notifications/email/tests/test_utils.py
index 6e79c497a4fe..6c7f5b7144cf 100644
--- a/openedx/core/djangoapps/notifications/email/tests/test_utils.py
+++ b/openedx/core/djangoapps/notifications/email/tests/test_utils.py
@@ -16,7 +16,6 @@
     COURSE_NOTIFICATION_TYPES,
 )
 from openedx.core.djangoapps.notifications.config.waffle import ENABLE_EMAIL_NOTIFICATIONS
-from openedx.core.djangoapps.notifications.email_notifications import EmailCadence
 from openedx.core.djangoapps.notifications.models import CourseNotificationPreference, Notification
 from openedx.core.djangoapps.notifications.email.utils import (
     add_additional_attributes_to_notifications,
@@ -149,8 +148,18 @@ def test_email_digest_context(self, digest_frequency):
             {'title': 'Updates', 'count': 1},
         ]
         expected_email_content = [
-            {'title': 'Discussion', 'help_text': '', 'help_text_url': '', 'notifications': [discussion_notification]},
-            {'title': 'Updates', 'help_text': '', 'help_text_url': '', 'notifications': [update_notification]}
+            {
+                'title': 'Discussion', 'help_text': '', 'help_text_url': '',
+                'notifications': [discussion_notification],
+                'total': 1, 'show_remaining_count': False, 'remaining_count': 0,
+                'url': 'http://learner-home-mfe/?showNotifications=true&app=discussion'
+            },
+            {
+                'title': 'Updates', 'help_text': '', 'help_text_url': '',
+                'notifications': [update_notification],
+                'total': 1, 'show_remaining_count': False, 'remaining_count': 0,
+                'url': 'http://learner-home-mfe/?showNotifications=true&app=updates'
+            }
         ]
         assert context['start_date'] == expected_start_date
         assert context['end_date'] == 'Sunday, Mar 24'
@@ -320,9 +329,7 @@ def test_value_with_channel_param(self, param_channel, new_value):
                         if channel == param_channel:
                             assert type_prefs[channel] == new_value
                             if channel == 'email':
-                                cadence_value = EmailCadence.NEVER
-                                if new_value:
-                                    cadence_value = self.get_default_cadence_value(app_name, noti_type)
+                                cadence_value = self.get_default_cadence_value(app_name, noti_type)
                                 assert type_prefs['email_cadence'] == cadence_value
                         else:
                             default_app_json = self.default_json[app_name]
@@ -381,9 +388,7 @@ def test_value_with_app_name_param(self, param_app_name, new_value):
                         if app_name == param_app_name:
                             assert type_prefs[channel] == new_value
                             if channel == 'email':
-                                cadence_value = EmailCadence.NEVER
-                                if new_value:
-                                    cadence_value = self.get_default_cadence_value(app_name, noti_type)
+                                cadence_value = self.get_default_cadence_value(app_name, noti_type)
                                 assert type_prefs['email_cadence'] == cadence_value
                         else:
                             default_app_json = self.default_json[app_name]
@@ -415,9 +420,7 @@ def test_value_with_notification_type_param(self, param_notification_type, new_v
                         if noti_type == param_notification_type:
                             assert type_prefs[channel] == new_value
                             if channel == 'email':
-                                cadence_value = EmailCadence.NEVER
-                                if new_value:
-                                    cadence_value = self.get_default_cadence_value(app_name, noti_type)
+                                cadence_value = self.get_default_cadence_value(app_name, noti_type)
                                 assert type_prefs['email_cadence'] == cadence_value
                         else:
                             default_app_json = self.default_json[app_name]
diff --git a/openedx/core/djangoapps/notifications/email/utils.py b/openedx/core/djangoapps/notifications/email/utils.py
index 582e867d629d..34c245308785 100644
--- a/openedx/core/djangoapps/notifications/email/utils.py
+++ b/openedx/core/djangoapps/notifications/email/utils.py
@@ -9,7 +9,7 @@
 from django.contrib.auth import get_user_model
 from django.shortcuts import get_object_or_404
 from pytz import utc
-from waffle import get_waffle_flag_model   # pylint: disable=invalid-django-waffle-import
+from waffle import get_waffle_flag_model  # pylint: disable=invalid-django-waffle-import
 
 from common.djangoapps.student.models import CourseEnrollment
 from lms.djangoapps.branding.api import get_logo_url_for_email
@@ -29,7 +29,6 @@
 
 from .notification_icons import NotificationTypeIcons
 
-
 User = get_user_model()
 
 
@@ -130,17 +129,29 @@ def create_email_digest_context(app_notifications_dict, username, start_date, en
         }
         for key, value in app_notifications_dict.items()
     ])
-    email_content = [
-        {
+
+    email_content = []
+    notifications_in_app = 5
+    for key, value in app_notifications_dict.items():
+        total = value['count']
+        app_content = {
             'title': value['title'],
             'help_text': value.get('help_text', ''),
             'help_text_url': value.get('help_text_url', ''),
             'notifications': add_additional_attributes_to_notifications(
                 value.get('notifications', []), courses_data=courses_data
-            )
+            ),
+            'total': total,
+            'show_remaining_count': False,
+            'remaining_count': 0,
+            'url': f'{settings.LEARNER_HOME_MICROFRONTEND_URL}/?showNotifications=true&app={key}'
         }
-        for key, value in app_notifications_dict.items()
-    ]
+        if total > notifications_in_app:
+            app_content['notifications'] = app_content['notifications'][:notifications_in_app]
+            app_content['show_remaining_count'] = True
+            app_content['remaining_count'] = total - notifications_in_app
+        email_content.append(app_content)
+
     context.update({
         "start_date": start_date_str,
         "end_date": end_date_str,
@@ -295,6 +306,7 @@ def filter_notification_with_email_enabled_preferences(notifications, preference
     for notification in notifications:
         if notification.notification_type in enabled_course_prefs[notification.course_id]:
             filtered_notifications.append(notification)
+    filtered_notifications.sort(key=lambda elem: elem.created, reverse=True)
     return filtered_notifications
 
 
@@ -357,14 +369,6 @@ def is_name_match(name, param_name):
         """
         return True if param_name is None else name == param_name
 
-    def is_editable(app_name, notification_type, channel):
-        """
-        Returns if notification type channel is editable
-        """
-        if notification_type == 'core':
-            return channel not in COURSE_NOTIFICATION_APPS[app_name]['non_editable']
-        return channel not in COURSE_NOTIFICATION_TYPES[notification_type]['non_editable']
-
     def get_default_cadence_value(app_name, notification_type):
         """
         Returns default email cadence value
@@ -404,11 +408,18 @@ def get_updated_preference(pref):
                 for channel in ['web', 'email', 'push']:
                     if not is_name_match(channel, channel_value):
                         continue
-                    if is_editable(app_name, noti_type, channel):
+                    if is_notification_type_channel_editable(app_name, noti_type, channel):
                         type_prefs[channel] = pref_value
-                        if channel == 'email':
-                            cadence_value = get_default_cadence_value(app_name, noti_type)\
-                                if pref_value else EmailCadence.NEVER
-                            type_prefs['email_cadence'] = cadence_value
+                        if channel == 'email' and pref_value and type_prefs.get('email_cadence') == EmailCadence.NEVER:
+                            type_prefs['email_cadence'] = get_default_cadence_value(app_name, noti_type)
         preference.save()
     notification_preference_unsubscribe_event(user)
+
+
+def is_notification_type_channel_editable(app_name, notification_type, channel):
+    """
+    Returns if notification type channel is editable
+    """
+    if notification_type == 'core':
+        return channel not in COURSE_NOTIFICATION_APPS[app_name]['non_editable']
+    return channel not in COURSE_NOTIFICATION_TYPES[notification_type]['non_editable']
diff --git a/openedx/core/djangoapps/notifications/events.py b/openedx/core/djangoapps/notifications/events.py
index 91b12075a8a1..74e6e56e41e3 100644
--- a/openedx/core/djangoapps/notifications/events.py
+++ b/openedx/core/djangoapps/notifications/events.py
@@ -167,6 +167,5 @@ def notification_preference_unsubscribe_event(user):
         'username': user.username,
         'event_type': 'email_digest_unsubscribe'
     }
-    with tracker.get_tracker().context(NOTIFICATION_PREFERENCE_UNSUBSCRIBE, event_data):
-        tracker.emit(NOTIFICATION_PREFERENCE_UNSUBSCRIBE, event_data)
-        segment.track(user.id, NOTIFICATION_PREFERENCE_UNSUBSCRIBE, event_data)
+    tracker.emit(NOTIFICATION_PREFERENCE_UNSUBSCRIBE, event_data)
+    segment.track(user.id, NOTIFICATION_PREFERENCE_UNSUBSCRIBE, event_data)
diff --git a/openedx/core/djangoapps/notifications/grouping_notifications.py b/openedx/core/djangoapps/notifications/grouping_notifications.py
new file mode 100644
index 000000000000..0e84ea3f109a
--- /dev/null
+++ b/openedx/core/djangoapps/notifications/grouping_notifications.py
@@ -0,0 +1,145 @@
+"""
+Notification grouping utilities for notifications
+"""
+import datetime
+from typing import Dict, Type, Union
+
+from pytz import utc
+
+from abc import ABC, abstractmethod
+
+from openedx.core.djangoapps.notifications.models import Notification
+
+
+class BaseNotificationGrouper(ABC):
+    """
+    Base class for notification groupers.
+    """
+
+    @abstractmethod
+    def group(self, new_notification, old_notification):
+        pass
+
+
+class NotificationRegistry:
+    """
+    Registry for notification groupers.
+    """
+    _groupers: Dict[str, Type[BaseNotificationGrouper]] = {}
+
+    @classmethod
+    def register(cls, notification_type: str):
+        """
+        Registers a notification grouper for the given notification type.
+        Args
+            notification_type: The type of notification for which to register the grouper.
+
+        Returns:
+            A decorator that registers the grouper class for the given notification type.
+        """
+
+        def decorator(grouper_class: Type[BaseNotificationGrouper]) -> Type[BaseNotificationGrouper]:
+            """
+            Registers the grouper class for the given notification type.
+            """
+            cls._groupers[notification_type] = grouper_class
+            return grouper_class
+
+        return decorator
+
+    @classmethod
+    def get_grouper(cls, notification_type: str) -> Union[BaseNotificationGrouper, None]:
+        """Retrieves the appropriate notification grouper based on the given notification type.
+
+        Args:
+            notification_type: The type of notification for which to retrieve the grouper.
+
+        Returns:
+            The corresponding BaseNotificationGrouper instance or None if no grouper is found.
+        """
+        grouper_class = cls._groupers.get(notification_type)
+        if not grouper_class:
+            return None
+        return grouper_class()
+
+
+@NotificationRegistry.register('new_comment')
+class NewCommentGrouper(BaseNotificationGrouper):
+    """
+    Groups new comment notifications based on the replier name.
+    """
+
+    def group(self, new_notification, old_notification):
+        """
+        Groups new comment notifications based on the replier name.
+        """
+        context = old_notification.content_context.copy()
+        if not context.get('grouped'):
+            context['replier_name_list'] = [context['replier_name']]
+            context['grouped_count'] = 1
+        context['grouped'] = True
+        context['replier_name_list'].append(new_notification.content_context['replier_name'])
+        context['grouped_count'] += 1
+        context['email_content'] = new_notification.content_context.get('email_content', '')
+        return context
+
+
+@NotificationRegistry.register('new_discussion_post')
+class NewPostGrouper(BaseNotificationGrouper):
+    """
+    Groups new post notifications based on the author name.
+    """
+
+    def group(self, new_notification, old_notification):
+        """
+        Groups new post notifications based on the author name.
+        """
+        if (
+            old_notification.content_context['username'] == new_notification.content_context['username']
+            and not old_notification.content_context.get('grouped', False)
+        ):
+            return {**new_notification.content_context}
+        return {
+            **old_notification.content_context,
+            "grouped": True,
+            "replier_name": new_notification.content_context["replier_name"]
+        }
+
+
+def group_user_notifications(new_notification: Notification, old_notification: Notification):
+    """
+    Groups user notification based on notification type and group_id
+    """
+    notification_type = new_notification.notification_type
+    grouper_class = NotificationRegistry.get_grouper(notification_type)
+
+    if grouper_class:
+        old_notification.content_context = grouper_class.group(new_notification, old_notification)
+        old_notification.web = old_notification.web or new_notification.web
+        old_notification.email = old_notification.email or new_notification.email
+        old_notification.content_url = new_notification.content_url
+        old_notification.last_read = None
+        old_notification.last_seen = None
+        old_notification.created = utc.localize(datetime.datetime.now())
+        old_notification.save()
+
+
+def get_user_existing_notifications(user_ids, notification_type, group_by_id, course_id):
+    """
+    Returns user last group able notification
+    """
+    notifications = Notification.objects.filter(
+        user__in=user_ids,
+        notification_type=notification_type,
+        group_by_id=group_by_id,
+        course_id=course_id,
+        last_seen__isnull=True,
+    )
+    notifications_mapping = {user_id: [] for user_id in user_ids}
+    for notification in notifications:
+        notifications_mapping[notification.user_id].append(notification)
+
+    for user_id, notifications in notifications_mapping.items():
+        notifications.sort(key=lambda elem: elem.created)
+        notifications_mapping[user_id] = notifications[0] if notifications else None
+    return notifications_mapping
diff --git a/openedx/core/djangoapps/notifications/handlers.py b/openedx/core/djangoapps/notifications/handlers.py
index 505f4b5e7024..f28cb594ea6f 100644
--- a/openedx/core/djangoapps/notifications/handlers.py
+++ b/openedx/core/djangoapps/notifications/handlers.py
@@ -21,7 +21,7 @@
     ForumRoleAudienceFilter,
     TeamAudienceFilter
 )
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS, ENABLE_ORA_GRADE_NOTIFICATION
 from openedx.core.djangoapps.notifications.models import CourseNotificationPreference
 
 log = logging.getLogger(__name__)
@@ -72,6 +72,12 @@ def generate_user_notifications(signal, sender, notification_data, metadata, **k
     """
     Watches for USER_NOTIFICATION_REQUESTED signal and calls send_web_notifications task
     """
+    if (
+        notification_data.notification_type == 'ora_grade_assigned'
+        and not ENABLE_ORA_GRADE_NOTIFICATION.is_enabled(notification_data.course_key)
+    ):
+        return
+
     from openedx.core.djangoapps.notifications.tasks import send_notifications
     notification_data = notification_data.__dict__
     notification_data['course_key'] = str(notification_data['course_key'])
diff --git a/openedx/core/djangoapps/notifications/models.py b/openedx/core/djangoapps/notifications/models.py
index e1bdf94acc33..77f7b991b546 100644
--- a/openedx/core/djangoapps/notifications/models.py
+++ b/openedx/core/djangoapps/notifications/models.py
@@ -23,7 +23,7 @@
 ADDITIONAL_NOTIFICATION_CHANNEL_SETTINGS = ['email_cadence']
 
 # Update this version when there is a change to any course specific notification type or app.
-COURSE_NOTIFICATION_CONFIG_VERSION = 11
+COURSE_NOTIFICATION_CONFIG_VERSION = 12
 
 
 def get_course_notification_preference_config():
diff --git a/openedx/core/djangoapps/notifications/notification_content.py b/openedx/core/djangoapps/notifications/notification_content.py
index 1dcdc4fb5a6c..c2103cb8356d 100644
--- a/openedx/core/djangoapps/notifications/notification_content.py
+++ b/openedx/core/djangoapps/notifications/notification_content.py
@@ -1,35 +1,47 @@
 """
 Helper functions for overriding notification content for given notification type.
 """
+from typing import Dict
 
 
-def get_notification_type_content_function(notification_type):
+def get_notification_type_context_function(notification_type) -> callable:
     """
-        Returns the content function for the given notification if it exists.
+    Returns:
+         callable : The function that returns the context for the given notification type.
     """
     try:
-        return globals()[f"get_{notification_type}_notification_content"]
+        return globals()[f"get_{notification_type}_notification_context"]
     except KeyError:
-        return None
+        return lambda context: context
 
 
-def get_notification_content_with_author_pronoun(notification_type, context):
+def get_notification_context_with_author_pronoun(context: Dict) -> Dict:
     """
-        Helper function to get notification content with author's pronoun.
+    Returns the context for the given notification type with the author pronoun.
+
     """
     html_tags_context = {
         'strong': 'strong',
         'p': 'p',
     }
-    notification_type_content_template = notification_type.get('content_template', None)
+    context.update(html_tags_context)
     if 'author_pronoun' in context:
         context['author_name'] = context['author_pronoun']
-    if notification_type_content_template:
-        return notification_type_content_template.format(**context, **html_tags_context)
-    return ''
+    return context
 
 
 # Returns notification content for the new_comment notification.
-get_new_comment_notification_content = get_notification_content_with_author_pronoun
+def get_new_comment_notification_context(context):
+    """
+    Returns the context for the new_comment notification
+    """
+    if not context.get('grouped'):
+        return get_notification_context_with_author_pronoun(context)
+    num_repliers = context['grouped_count']
+    repliers_string = f"{num_repliers - 1} other{'s' if num_repliers > 2 else ''}"
+    context['replier_name'] = f"{context['replier_name_list'][0]} and {repliers_string}"
+    return context
+
+
 # Returns notification content for the comment_on_followed_post notification.
-get_comment_on_followed_post_notification_content = get_notification_content_with_author_pronoun
+get_comment_on_followed_post_notification_context = get_notification_context_with_author_pronoun
diff --git a/openedx/core/djangoapps/notifications/policies.py b/openedx/core/djangoapps/notifications/policies.py
new file mode 100644
index 000000000000..8d0a2d8d43a5
--- /dev/null
+++ b/openedx/core/djangoapps/notifications/policies.py
@@ -0,0 +1,41 @@
+"""Policies for the notifications app."""
+
+from edx_ace.channel import ChannelType
+from edx_ace.policy import Policy, PolicyResult
+from opaque_keys.edx.keys import CourseKey
+
+from .models import CourseNotificationPreference
+
+
+class CoursePushNotificationOptout(Policy):
+    """
+    Course Push Notification optOut Policy.
+    """
+
+    def check(self, message):
+        """
+        Check if the user has opted out of push notifications for the given course.
+        :param message:
+        :return: PolicyResult
+        """
+        course_ids = message.context.get('course_ids', [])
+        app_label = message.context.get('app_label')
+
+        if not (app_label or message.context.get('push_notification_extra_context', {})):
+            return PolicyResult(deny={ChannelType.PUSH})
+
+        course_keys = [CourseKey.from_string(course_id) for course_id in course_ids]
+        for course_key in course_keys:
+            course_notification_preference = CourseNotificationPreference.get_user_course_preference(
+                message.recipient.lms_user_id,
+                course_key
+            )
+            push_notification_preference = course_notification_preference.get_notification_type_config(
+                app_label,
+                notification_type='push',
+            ).get('push', False)
+
+            if not push_notification_preference:
+                return PolicyResult(deny={ChannelType.PUSH})
+
+        return PolicyResult(deny=frozenset())
diff --git a/openedx/core/djangoapps/notifications/serializers.py b/openedx/core/djangoapps/notifications/serializers.py
index 79c8c4af9d13..80b1577b6355 100644
--- a/openedx/core/djangoapps/notifications/serializers.py
+++ b/openedx/core/djangoapps/notifications/serializers.py
@@ -1,6 +1,7 @@
 """
 Serializers for the notifications API.
 """
+
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
 
@@ -9,9 +10,12 @@
 from openedx.core.djangoapps.notifications.models import (
     CourseNotificationPreference,
     Notification,
-    get_notification_channels, get_additional_notification_channel_settings
+    get_additional_notification_channel_settings,
+    get_notification_channels
 )
+
 from .base_notification import COURSE_NOTIFICATION_APPS, COURSE_NOTIFICATION_TYPES, EmailCadence
+from .email.utils import is_notification_type_channel_editable
 from .utils import remove_preferences_with_no_access
 
 
@@ -202,3 +206,113 @@ class Meta:
             'last_seen',
             'created',
         )
+
+
+def validate_email_cadence(email_cadence: str) -> str:
+    """
+    Validate email cadence value.
+    """
+    if EmailCadence.get_email_cadence_value(email_cadence) is None:
+        raise ValidationError(f'{email_cadence} is not a valid email cadence.')
+    return email_cadence
+
+
+def validate_notification_app(notification_app: str) -> str:
+    """
+    Validate notification app value.
+    """
+    if not COURSE_NOTIFICATION_APPS.get(notification_app):
+        raise ValidationError(f'{notification_app} is not a valid notification app.')
+    return notification_app
+
+
+def validate_notification_app_enabled(notification_app: str) -> str:
+    """
+    Validate notification app is enabled.
+    """
+
+    if COURSE_NOTIFICATION_APPS.get(notification_app) and COURSE_NOTIFICATION_APPS.get(notification_app)['enabled']:
+        return notification_app
+    raise ValidationError(f'{notification_app} is not a valid notification app.')
+
+
+def validate_notification_type(notification_type: str) -> str:
+    """
+    Validate notification type value.
+    """
+    if not COURSE_NOTIFICATION_TYPES.get(notification_type):
+        raise ValidationError(f'{notification_type} is not a valid notification type.')
+    return notification_type
+
+
+def validate_notification_channel(notification_channel: str) -> str:
+    """
+    Validate notification channel value.
+    """
+    valid_channels = set(get_notification_channels()) | set(get_additional_notification_channel_settings())
+    if notification_channel not in valid_channels:
+        raise ValidationError(f'{notification_channel} is not a valid notification channel setting.')
+    return notification_channel
+
+
+class UserNotificationPreferenceUpdateAllSerializer(serializers.Serializer):
+    """
+    Serializer for user notification preferences update with custom field validators.
+    """
+    notification_app = serializers.CharField(
+        required=True,
+        validators=[validate_notification_app, validate_notification_app_enabled]
+    )
+    value = serializers.BooleanField(required=False)
+    notification_type = serializers.CharField(
+        required=True,
+    )
+    notification_channel = serializers.CharField(
+        required=False,
+        validators=[validate_notification_channel]
+    )
+    email_cadence = serializers.CharField(
+        required=False,
+        validators=[validate_email_cadence]
+    )
+
+    def validate(self, attrs):
+        """
+        Cross-field validation for notification preference update.
+        """
+        notification_app = attrs.get('notification_app')
+        notification_type = attrs.get('notification_type')
+        notification_channel = attrs.get('notification_channel')
+        email_cadence = attrs.get('email_cadence')
+
+        # Validate email_cadence requirements
+        if email_cadence and not notification_type:
+            raise ValidationError({
+                'notification_type': 'notification_type is required for email_cadence.'
+            })
+
+        # Validate notification_channel requirements
+        if not email_cadence and notification_type and not notification_channel:
+            raise ValidationError({
+                'notification_channel': 'notification_channel is required for notification_type.'
+            })
+
+        # Validate notification type
+        if all([not COURSE_NOTIFICATION_TYPES.get(notification_type), notification_type != "core"]):
+            raise ValidationError(f'{notification_type} is not a valid notification type.')
+
+        # Validate notification type and channel is editable
+        if notification_channel and notification_type:
+            if not is_notification_type_channel_editable(
+                notification_app,
+                notification_type,
+                notification_channel
+            ):
+                raise ValidationError({
+                    'notification_channel': (
+                        f'{notification_channel} is not editable for notification type '
+                        f'{notification_type}.'
+                    )
+                })
+
+        return attrs
diff --git a/openedx/core/djangoapps/notifications/tasks.py b/openedx/core/djangoapps/notifications/tasks.py
index 2934355e0365..a1792d27c3c9 100644
--- a/openedx/core/djangoapps/notifications/tasks.py
+++ b/openedx/core/djangoapps/notifications/tasks.py
@@ -14,13 +14,17 @@
 from pytz import UTC
 
 from common.djangoapps.student.models import CourseEnrollment
+from openedx.core.djangoapps.notifications.audience_filters import NotificationFilter
 from openedx.core.djangoapps.notifications.base_notification import (
     get_default_values_of_preference,
     get_notification_content
 )
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATION_GROUPING, ENABLE_NOTIFICATIONS
 from openedx.core.djangoapps.notifications.events import notification_generated_event
-from openedx.core.djangoapps.notifications.audience_filters import NotificationFilter
+from openedx.core.djangoapps.notifications.grouping_notifications import (
+    get_user_existing_notifications,
+    group_user_notifications, NotificationRegistry,
+)
 from openedx.core.djangoapps.notifications.models import (
     CourseNotificationPreference,
     Notification,
@@ -28,6 +32,7 @@
 )
 from openedx.core.djangoapps.notifications.utils import clean_arguments, get_list_in_batches
 
+
 logger = get_task_logger(__name__)
 
 
@@ -124,7 +129,10 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
 
     user_ids = list(set(user_ids))
     batch_size = settings.NOTIFICATION_CREATION_BATCH_SIZE
-
+    group_by_id = context.pop('group_by_id', '')
+    grouping_function = NotificationRegistry.get_grouper(notification_type)
+    waffle_flag_enabled = ENABLE_NOTIFICATION_GROUPING.is_enabled(course_key)
+    grouping_enabled = waffle_flag_enabled and group_by_id and grouping_function is not None
     notifications_generated = False
     notification_content = ''
     sender_id = context.pop('sender_id', None)
@@ -136,6 +144,10 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
         batch_user_ids = NotificationFilter().apply_filters(batch_user_ids, course_key, notification_type)
         logger.debug(f'After applying filters, sending notifications to {len(batch_user_ids)} users in {course_key}')
 
+        existing_notifications = (
+            get_user_existing_notifications(batch_user_ids, notification_type, group_by_id, course_key))\
+            if grouping_enabled else {}
+
         # 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,
@@ -160,18 +172,24 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
                 preference.get_app_config(app_name).get('enabled', False)
             ):
                 notification_preferences = preference.get_channels_for_notification_type(app_name, notification_type)
-                notifications.append(
-                    Notification(
-                        user_id=user_id,
-                        app_name=app_name,
-                        notification_type=notification_type,
-                        content_context=context,
-                        content_url=content_url,
-                        course_id=course_key,
-                        web='web' in notification_preferences,
-                        email='email' in notification_preferences,
-                    )
+                new_notification = Notification(
+                    user_id=user_id,
+                    app_name=app_name,
+                    notification_type=notification_type,
+                    content_context=context,
+                    content_url=content_url,
+                    course_id=course_key,
+                    web='web' in notification_preferences,
+                    email='email' in notification_preferences,
+                    group_by_id=group_by_id,
                 )
+                if grouping_enabled and existing_notifications.get(user_id, None):
+                    group_user_notifications(new_notification, existing_notifications[user_id])
+                    if not notifications_generated:
+                        notifications_generated = True
+                        notification_content = new_notification.content
+                else:
+                    notifications.append(new_notification)
                 generated_notification_audience.append(user_id)
 
         # send notification to users but use bulk_create
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
index f2e239bb7e6e..51966f96f574 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
@@ -1,5 +1,5 @@
 {% for notification_app in email_content %}
-    <h3 style="font-size: 1.375rem; font-weight:700; line-height:28px; margin: 0.75rem 0 0;">
+    <h3 style="font-size: 22px; font-weight:700; line-height:28px; margin: 0.75rem 0 0;">
         {{ notification_app.title }}
     </h3>
     {% if notification_app.help_text %}
@@ -28,8 +28,9 @@ <h3 style="font-size: 1.375rem; font-weight:700; line-height:28px; margin: 0.75r
                                 style="max-height: 28px; max-width: 28px; margin: 0.75rem 1rem 0.75rem 0"
                             />
                         </td>
-                        <td class="notification-content" width="100%" align="left" valign="top" style=" padding: 1rem 1rem 1rem 0.5rem">
-                            <blockquote style="font-size: 0.875rem; font-weight:400; line-height:24px; color:#454545; margin: 0 0 0.5rem 0;">
+                        <td class="notification-content" width="100%" align="left" valign="top" style="padding: 1rem 1rem 1rem 0.5rem;">
+                            <blockquote style="font-size: 14px; font-weight:400; line-height:24px; color:#454545; margin: 0 0 0.5rem 0;">
+                                <style> strong {color: #00262B; font-weight:500} </style>
                                 {{ notification.email_content | truncatechars_html:600 | safe }}
                             </blockquote>
                             {% if notification.details %}
@@ -37,7 +38,7 @@ <h3 style="font-size: 1.375rem; font-weight:700; line-height:28px; margin: 0.75r
                                     {{ notification.details | safe }}
                                 </blockquote>
                             {% endif %}
-                            <blockquote style="color:#707070; margin: 0">
+                            <blockquote style="color:#707070; margin: 0; font-size: 14px; font-style: normal; font-weight: 400; line-height: 24px;">
                                 <span style="float: left">
                                     <span>{{ notification.course_name }}</span>
                                     <span style="padding: 0 0.375rem">{{ "&middot;"|safe }}</span>
@@ -55,5 +56,13 @@ <h3 style="font-size: 1.375rem; font-weight:700; line-height:28px; margin: 0.75r
             </tbody>
         </table>
     </p>
-    <p style="height: 0.75rem; margin: 0;" />
+    <p style="height: 0.375rem; margin: 0;" />
+    {% if notification_app.show_remaining_count %}
+        <p style="margin: 0; height: 0.75rem; font-weight: 400; font-size: 14px; line-height: 24px;">
+            <a href="{{notification_app.url}}" style="color: #00688d; margin: 0; float:right; text-decoration: none;">
+                + {{ notification_app.remaining_count }} more
+            </a>
+        </p>
+    {% endif %}
+    <p style="height: 0.375rem; margin: 0;" />
 {% endfor %}
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
index 4fa903d127ac..34f4bf09d808 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
@@ -1,4 +1,4 @@
-<table cellpadding="0" cellspacing="0" style="color:black; font-weight:400; font-size:0.75rem;line-height:20px" width="100%">
+<table cellpadding="0" cellspacing="0" style="color:black; font-weight:400; font-size:12px;line-height:20px" width="100%">
     <tbody>
         <tr>
             <td>
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
index 1f22ced20049..84a702d4c29e 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
@@ -19,7 +19,7 @@
         </tr>
         <tr style="height: 20px"></tr>
         <tr align="center">
-            <td style="font-family: Inter; font-size: 32px; font-style: normal; font-weight: 700; line-height: 36px">
+            <td style="font-family: Inter, Arial, Verdana, sans-serif; font-size: 32px; font-style: normal; font-weight: 700; line-height: 36px">
                 {{ digest_frequency }} email digest
             </td>
         </tr>
@@ -28,7 +28,7 @@
             <td
                 style="
                     color: #bfc9ca;
-                    font-family: Inter;
+                    font-family: Inter, Arial, Verdana, sans-serif;
                     font-size: 14px;
                     font-style: normal;
                     font-weight: 400;
@@ -54,7 +54,7 @@
                                                 </td>
                                             </tr>
                                             <tr align="center">
-                                                <td style="font-weight: 600; font-size: 0.875rem; line-height: 20px; padding: 0">
+                                                <td style="font-weight: 600; font-size: 14px; line-height: 20px; padding: 0">
                                                     {{update.title}}
                                                 </td>
                                             </tr>
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html b/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
index 76658a043665..4d4daa7ca2a3 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
@@ -1,5 +1,9 @@
-<div style="margin:0; padding:0; min-width: 100%; background-color:#C9C9C9">
-    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="line-height:1.5; max-width:600px; font-family:Inter">
+<head>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap'" rel="stylesheet" type="text/css">
+</head>
+
+<div style="margin:0; padding:0; min-width: 100%; background-color:#C9C9C9; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-smooth: never;">
+    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="line-height:1.5; max-width:600px; font-family:Inter, Arial, Verdana, sans-serif">
         <tbody style="background-color:#f5f5f5">
             <tr>
                 <td>
diff --git a/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
new file mode 100644
index 000000000000..a3aace632c8b
--- /dev/null
+++ b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
@@ -0,0 +1,248 @@
+"""
+Tests for notification grouping module
+"""
+
+import ddt
+import unittest
+from unittest.mock import MagicMock, patch
+from datetime import datetime
+from pytz import utc
+
+from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangoapps.notifications.grouping_notifications import (
+    BaseNotificationGrouper,
+    NotificationRegistry,
+    NewCommentGrouper,
+    group_user_notifications,
+    get_user_existing_notifications, NewPostGrouper
+)
+from openedx.core.djangoapps.notifications.models import Notification
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class TestNotificationRegistry(unittest.TestCase):
+    """
+    Tests for the NotificationRegistry class
+    """
+
+    def test_register_and_get_grouper(self):
+        """
+        Test that the register and get_grouper methods work as expected
+        """
+
+        class TestGrouper(BaseNotificationGrouper):
+            def group(self, new_notification, old_notification):
+                pass
+
+        NotificationRegistry.register('test_notification')(TestGrouper)
+        grouper = NotificationRegistry.get_grouper('test_notification')
+        self.assertIsInstance(grouper, TestGrouper)
+
+    def test_get_grouper_returns_none_for_unregistered_type(self):
+        """
+        Test that get_grouper returns None for an unregistered notification type
+        """
+        grouper = NotificationRegistry.get_grouper('non_existent')
+        self.assertIsNone(grouper)
+
+
+class TestNewCommentGrouper(unittest.TestCase):
+    """
+    Tests for the NewCommentGrouper class
+    """
+
+    def setUp(self):
+        """
+        Set up the test
+        """
+        self.new_notification = MagicMock(spec=Notification)
+        self.old_notification = MagicMock(spec=Notification)
+        self.old_notification.content_context = {
+            'replier_name': 'User1'
+        }
+
+    def test_group_creates_grouping_keys(self):
+        """
+        Test that the function creates the grouping keys
+        """
+        updated_context = NewCommentGrouper().group(self.new_notification, self.old_notification)
+
+        self.assertIn('replier_name_list', updated_context)
+        self.assertIn('grouped_count', updated_context)
+        self.assertEqual(updated_context['grouped_count'], 2)
+        self.assertTrue(updated_context['grouped'])
+
+    def test_group_appends_to_existing_grouping(self):
+        """
+        Test that the function appends to the existing grouping
+        """
+        # Mock a pre-grouped notification
+        self.old_notification.content_context = {
+            'replier_name': 'User1',
+            'replier_name_list': ['User1', 'User2'],
+            'grouped': True,
+            'grouped_count': 2
+        }
+        self.new_notification.content_context = {'replier_name': 'User3'}
+
+        updated_context = NewCommentGrouper().group(self.new_notification, self.old_notification)
+
+        self.assertIn('replier_name_list', updated_context)
+        self.assertEqual(len(updated_context['replier_name_list']), 3)
+        self.assertEqual(updated_context['grouped_count'], 3)
+
+    def test_group_email_content(self):
+        """
+        Tests email_content in content_context when grouping notification
+        """
+        self.old_notification.content_context['email_content'] = 'old content'
+        self.new_notification.content_context = {
+            'email_content': 'new content',
+            'replier_name': 'user_2',
+        }
+        content_context = NewCommentGrouper().group(self.new_notification, self.old_notification)
+        self.assertIn('email_content', content_context)
+        self.assertEqual(content_context['email_content'], 'new content')
+
+
+class TestNewPostGrouper(unittest.TestCase):
+    """
+    Tests for the NewPostGrouper class
+    """
+
+    def test_group(self):
+        """
+        Test that the function groups new post notifications based on the author name
+        """
+        new_notification = MagicMock(spec=Notification)
+        old_notification = MagicMock(spec=Notification)
+        old_notification.content_context = {
+            'author_name': 'User1',
+            'username': 'User1'
+        }
+
+        updated_context = NewPostGrouper().group(new_notification, old_notification)
+
+        self.assertTrue(updated_context['grouped'])
+        self.assertEqual(updated_context['replier_name'], new_notification.content_context['replier_name'])
+
+    def test_new_post_with_same_user(self):
+        """
+        Test that the function does not group notifications with same authors if notification is not
+        already grouped
+        """
+        new_notification = MagicMock(spec=Notification)
+        old_notification = MagicMock(spec=Notification)
+        old_notification.content_context = {
+            'username': 'User1',
+            'grouped': False
+        }
+        new_notification.content_context = {
+            'username': 'User1',
+        }
+
+        updated_context = NewPostGrouper().group(new_notification, old_notification)
+
+        self.assertFalse(updated_context.get('grouped', False))
+
+
+@ddt.ddt
+class TestGroupUserNotifications(ModuleStoreTestCase):
+    """
+    Tests for the group_user_notifications function
+    """
+
+    @patch('openedx.core.djangoapps.notifications.grouping_notifications.NotificationRegistry.get_grouper')
+    def test_group_user_notifications(self, mock_get_grouper):
+        """
+        Test that the function groups notifications using the appropriate grou
+        """
+        # Mock the grouper
+        mock_grouper = MagicMock(spec=NewCommentGrouper)
+        mock_get_grouper.return_value = mock_grouper
+
+        new_notification = MagicMock(spec=Notification)
+        old_notification = MagicMock(spec=Notification)
+
+        group_user_notifications(new_notification, old_notification)
+
+        mock_grouper.group.assert_called_once_with(new_notification, old_notification)
+        self.assertTrue(old_notification.save.called)
+        self.assertIsNone(old_notification.last_read)
+        self.assertIsNone(old_notification.last_seen)
+        self.assertIsNotNone(old_notification.created)
+
+    def test_group_user_notifications_no_grouper(self):
+        """
+        Test that the function does nothing if no grouper is found
+        """
+        new_notification = MagicMock(spec=Notification)
+        old_notification = MagicMock(spec=Notification)
+
+        group_user_notifications(new_notification, old_notification)
+
+        self.assertFalse(old_notification.save.called)
+
+    @ddt.data(datetime(2023, 1, 1, tzinfo=utc), None)
+    def test_not_grouped_when_notification_is_seen(self, last_seen):
+        """
+        Notification is not grouped if the notification is marked as seen
+        """
+        course = CourseFactory()
+        user = UserFactory()
+        notification_params = {
+            'app_name': 'discussion',
+            'notification_type': 'new_discussion_post',
+            'course_id': course.id,
+            'group_by_id': course.id,
+            'content_url': 'http://example.com',
+            'user': user,
+            'last_seen': last_seen,
+        }
+        Notification.objects.create(content_context={
+            'username': 'User1',
+            'post_title': ' Post title',
+            'replier_name': 'User 1',
+
+        }, **notification_params)
+        existing_notifications = get_user_existing_notifications(
+            [user.id], 'new_discussion_post', course.id, course.id
+        )
+        if last_seen is None:
+            assert existing_notifications[user.id] is not None
+        else:
+            assert existing_notifications[user.id] is None
+
+
+class TestGetUserExistingNotifications(unittest.TestCase):
+    """
+    Tests for the get_user_existing_notifications function
+    """
+
+    @patch('openedx.core.djangoapps.notifications.models.Notification.objects.filter')
+    def test_get_user_existing_notifications(self, mock_filter):
+        """
+        Test that the function returns the last notification for each user
+        """
+        # Mock the notification objects returned by the filter
+        mock_notification1 = MagicMock(spec=Notification)
+        mock_notification1.user_id = 1
+        mock_notification1.created = datetime(2023, 9, 1, tzinfo=utc)
+
+        mock_notification2 = MagicMock(spec=Notification)
+        mock_notification2.user_id = 1
+        mock_notification2.created = datetime(2023, 9, 2, tzinfo=utc)
+
+        mock_filter.return_value = [mock_notification1, mock_notification2]
+
+        user_ids = [1, 2]
+        notification_type = 'new_comment'
+        group_by_id = 'group_id_1'
+        course_id = 'course_1'
+
+        result = get_user_existing_notifications(user_ids, notification_type, group_by_id, course_id)
+
+        # Verify the results
+        self.assertEqual(result[1], mock_notification1)
+        self.assertIsNone(result[2])  # user 2 has no notifications
diff --git a/openedx/core/djangoapps/notifications/tests/test_tasks.py b/openedx/core/djangoapps/notifications/tests/test_tasks.py
index 706ae2989842..6dca9fd1f944 100644
--- a/openedx/core/djangoapps/notifications/tests/test_tasks.py
+++ b/openedx/core/djangoapps/notifications/tests/test_tasks.py
@@ -15,7 +15,7 @@
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
-from ..config.waffle import ENABLE_NOTIFICATIONS
+from ..config.waffle import ENABLE_NOTIFICATIONS, ENABLE_NOTIFICATION_GROUPING
 from ..models import CourseNotificationPreference, Notification
 from ..tasks import (
     create_notification_pref_if_not_exists,
@@ -190,6 +190,39 @@ def test_notification_not_send_with_preference_disabled(self):
         send_notifications([self.user.id], str(self.course_1.id), app_name, notification_type, context, content_url)
         self.assertEqual(len(Notification.objects.all()), 0)
 
+    @override_waffle_flag(ENABLE_NOTIFICATION_GROUPING, True)
+    @override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
+    def test_send_notification_with_grouping_enabled(self):
+        """
+        Test send_notifications with grouping enabled.
+        """
+        with patch('openedx.core.djangoapps.notifications.tasks.group_user_notifications') as user_notifications_mock:
+            context = {
+                'post_title': 'Post title',
+                'author_name': 'author name',
+                'replier_name': 'replier name',
+                'group_by_id': 'group_by_id',
+            }
+            content_url = 'https://example.com/'
+            send_notifications(
+                [self.user.id],
+                str(self.course_1.id),
+                'discussion',
+                'new_comment',
+                {**context},
+                content_url
+            )
+            send_notifications(
+                [self.user.id],
+                str(self.course_1.id),
+                'discussion',
+                'new_comment',
+                {**context},
+                content_url
+            )
+            self.assertEqual(Notification.objects.filter(user_id=self.user.id).count(), 1)
+            user_notifications_mock.assert_called_once()
+
     @override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
     @ddt.data(
         ('discussion', 'new_comment_on_response'),  # core notification
@@ -220,7 +253,7 @@ def test_send_with_app_disabled_notifications(self, app_name, notification_type)
     def test_notification_not_created_when_context_is_incomplete(self):
         try:
             send_notifications([self.user.id], str(self.course_1.id), "discussion", "new_comment", {}, "")
-        except Exception as exc:    # pylint: disable=broad-except
+        except Exception as exc:  # pylint: disable=broad-except
             assert isinstance(exc, ValidationError)
 
 
@@ -229,6 +262,7 @@ class SendBatchNotificationsTest(ModuleStoreTestCase):
     """
     Test that notification and notification preferences are created in batches
     """
+
     def setUp(self):
         """
         Setups test case
@@ -254,9 +288,9 @@ def _create_users(self, num_of_users):
 
     @override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
     @ddt.data(
-        (settings.NOTIFICATION_CREATION_BATCH_SIZE, 7, 3),
-        (settings.NOTIFICATION_CREATION_BATCH_SIZE + 10, 9, 6),
-        (settings.NOTIFICATION_CREATION_BATCH_SIZE - 10, 7, 3),
+        (settings.NOTIFICATION_CREATION_BATCH_SIZE, 10, 4),
+        (settings.NOTIFICATION_CREATION_BATCH_SIZE + 10, 12, 7),
+        (settings.NOTIFICATION_CREATION_BATCH_SIZE - 10, 10, 4),
     )
     @ddt.unpack
     def test_notification_is_send_in_batch(self, creation_size, prefs_query_count, notifications_query_count):
@@ -306,7 +340,7 @@ def test_preference_not_created_for_default_off_preference(self):
             "username": "Test Author"
         }
         with override_waffle_flag(ENABLE_NOTIFICATIONS, active=True):
-            with self.assertNumQueries(7):
+            with self.assertNumQueries(10):
                 send_notifications(user_ids, str(self.course.id), notification_app, notification_type,
                                    context, "http://test.url")
 
@@ -325,7 +359,7 @@ def test_preference_created_for_default_on_preference(self):
             "replier_name": "Replier Name"
         }
         with override_waffle_flag(ENABLE_NOTIFICATIONS, active=True):
-            with self.assertNumQueries(9):
+            with self.assertNumQueries(12):
                 send_notifications(user_ids, str(self.course.id), notification_app, notification_type,
                                    context, "http://test.url")
 
@@ -374,6 +408,7 @@ class TestDeleteNotificationTask(ModuleStoreTestCase):
     """
     Tests delete_notification_function
     """
+
     def setUp(self):
         """
         Setup
diff --git a/openedx/core/djangoapps/notifications/tests/test_utils.py b/openedx/core/djangoapps/notifications/tests/test_utils.py
new file mode 100644
index 000000000000..e300c63c1d77
--- /dev/null
+++ b/openedx/core/djangoapps/notifications/tests/test_utils.py
@@ -0,0 +1,288 @@
+"""
+Test cases for the notification utility functions.
+"""
+import unittest
+
+from openedx.core.djangoapps.notifications.utils import aggregate_notification_configs
+
+
+class TestAggregateNotificationConfigs(unittest.TestCase):
+    """
+    Test cases for the aggregate_notification_configs function.
+    """
+
+    def test_empty_configs_list_returns_default(self):
+        """
+        If the configs list is empty, the default config should be returned.
+        """
+        default_config = [{
+            "grading": {
+                "enabled": False,
+                "non_editable": {},
+                "notification_types": {
+                    "core": {
+                        "web": False,
+                        "push": False,
+                        "email": False,
+                        "email_cadence": "Daily"
+                    }
+                }
+            }
+        }]
+
+        result = aggregate_notification_configs(default_config)
+        assert result == default_config[0]
+
+    def test_enable_notification_type(self):
+        """
+        If a config enables a notification type, it should be enabled in the result.
+        """
+
+        config_list = [
+            {
+                "grading": {
+                    "enabled": False,
+                    "non_editable": {},
+                    "notification_types": {
+                        "core": {
+                            "web": False,
+                            "push": False,
+                            "email": False,
+                            "email_cadence": "Weekly"
+                        }
+                    }
+                }
+            },
+            {
+                "grading": {
+                    "enabled": True,
+                    "notification_types": {
+                        "core": {
+                            "web": True,
+                            "push": True,
+                            "email": True,
+                            "email_cadence": "Weekly"
+                        }
+                    }
+                }
+            }]
+
+        result = aggregate_notification_configs(config_list)
+        assert result["grading"]["enabled"] is True
+        assert result["grading"]["notification_types"]["core"]["web"] is True
+        assert result["grading"]["notification_types"]["core"]["push"] is True
+        assert result["grading"]["notification_types"]["core"]["email"] is True
+        # Use default email_cadence
+        assert result["grading"]["notification_types"]["core"]["email_cadence"] == "Weekly"
+
+    def test_merge_core_notification_types(self):
+        """
+        Core notification types should be merged across configs.
+        """
+
+        config_list = [
+            {
+                "discussion": {
+                    "enabled": True,
+                    "core_notification_types": ["new_comment"],
+                    "notification_types": {}
+                }
+            },
+            {
+                "discussion": {
+                    "core_notification_types": ["new_response", "new_comment"]
+                }
+
+            }]
+
+        result = aggregate_notification_configs(config_list)
+        assert set(result["discussion"]["core_notification_types"]) == {
+            "new_comment", "new_response"
+        }
+
+    def test_multiple_configs_aggregate(self):
+        """
+        Multiple configs should be aggregated together.
+        """
+
+        config_list = [
+            {
+                "updates": {
+                    "enabled": False,
+                    "notification_types": {
+                        "course_updates": {
+                            "web": False,
+                            "push": False,
+                            "email": False,
+                            "email_cadence": "Weekly"
+                        }
+                    }
+                }
+            },
+            {
+                "updates": {
+                    "enabled": True,
+                    "notification_types": {
+                        "course_updates": {
+                            "web": True,
+                            "email_cadence": "Weekly"
+                        }
+                    }
+                }
+            },
+            {
+                "updates": {
+                    "notification_types": {
+                        "course_updates": {
+                            "push": True,
+                            "email_cadence": "Weekly"
+                        }
+                    }
+                }
+            }
+        ]
+
+        result = aggregate_notification_configs(config_list)
+        assert result["updates"]["enabled"] is True
+        assert result["updates"]["notification_types"]["course_updates"]["web"] is True
+        assert result["updates"]["notification_types"]["course_updates"]["push"] is True
+        assert result["updates"]["notification_types"]["course_updates"]["email"] is False
+        # Use default email_cadence
+        assert result["updates"]["notification_types"]["course_updates"]["email_cadence"] == "Weekly"
+
+    def test_ignore_unknown_notification_types(self):
+        """
+        Unknown notification types should be ignored.
+        """
+        config_list = [
+            {
+                "grading": {
+                    "enabled": False,
+                    "notification_types": {
+                        "core": {
+                            "web": False,
+                            "push": False,
+                            "email": False,
+                            "email_cadence": "Daily"
+                        }
+                    }
+                }
+            },
+            {
+                "grading": {
+                    "notification_types": {
+                        "unknown_type": {
+                            "web": True,
+                            "push": True,
+                            "email": True
+                        }
+                    }
+                }
+            }]
+
+        result = aggregate_notification_configs(config_list)
+        assert "unknown_type" not in result["grading"]["notification_types"]
+        assert result["grading"]["notification_types"]["core"]["web"] is False
+
+    def test_ignore_unknown_categories(self):
+        """
+        Unknown categories should be ignored.
+        """
+
+        config_list = [
+            {
+                "grading": {
+                    "enabled": False,
+                    "notification_types": {}
+                }
+            },
+            {
+                "unknown_category": {
+                    "enabled": True,
+                    "notification_types": {}
+                }
+            }]
+
+        result = aggregate_notification_configs(config_list)
+        assert "unknown_category" not in result
+        assert result["grading"]["enabled"] is False
+
+    def test_preserves_default_structure(self):
+        """
+        The resulting config should have the same structure as the default config.
+        """
+
+        config_list = [
+            {
+                "discussion": {
+                    "enabled": False,
+                    "non_editable": {"core": ["web"]},
+                    "notification_types": {
+                        "core": {
+                            "web": False,
+                            "push": False,
+                            "email": False,
+                            "email_cadence": "Weekly"
+                        }
+                    },
+                    "core_notification_types": []
+                }
+            },
+            {
+                "discussion": {
+                    "enabled": True,
+                    "extra_field": "should_not_appear"
+                }
+            }
+        ]
+
+        result = aggregate_notification_configs(config_list)
+        assert set(result["discussion"].keys()) == {
+            "enabled", "non_editable", "notification_types", "core_notification_types"
+        }
+        assert "extra_field" not in result["discussion"]
+
+    def test_if_email_cadence_has_diff_set_mix_as_value(self):
+        """
+        If email_cadence is different in the configs, set it to "Mixed".
+        """
+        config_list = [
+            {
+                "grading": {
+                    "enabled": False,
+                    "notification_types": {
+                        "core": {
+                            "web": False,
+                            "push": False,
+                            "email": False,
+                            "email_cadence": "Daily"
+                        }
+                    }
+                }
+            },
+            {
+                "grading": {
+                    "enabled": True,
+                    "notification_types": {
+                        "core": {
+                            "web": True,
+                            "push": True,
+                            "email": True,
+                            "email_cadence": "Weekly"
+                        }
+                    }
+                }
+            },
+            {
+                "grading": {
+                    "notification_types": {
+                        "core": {
+                            "email_cadence": "Monthly"
+                        }
+                    }
+                }
+            }
+        ]
+
+        result = aggregate_notification_configs(config_list)
+        assert result["grading"]["notification_types"]["core"]["email_cadence"] == "Mixed"
diff --git a/openedx/core/djangoapps/notifications/tests/test_views.py b/openedx/core/djangoapps/notifications/tests/test_views.py
index e40e52078989..3e73c95be5be 100644
--- a/openedx/core/djangoapps/notifications/tests/test_views.py
+++ b/openedx/core/djangoapps/notifications/tests/test_views.py
@@ -2,11 +2,14 @@
 Tests for the views in the notifications app.
 """
 import json
+from copy import deepcopy
 from datetime import datetime, timedelta
 from unittest import mock
+from unittest.mock import patch
 
 import ddt
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
 from django.urls import reverse
 from edx_toggles.toggles.testutils import override_waffle_flag
@@ -27,20 +30,21 @@
     FORUM_ROLE_MODERATOR
 )
 from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
-from openedx.core.djangoapps.notifications.email_notifications import EmailCadence
+from openedx.core.djangoapps.notifications.email.utils import encrypt_object, encrypt_string
 from openedx.core.djangoapps.notifications.models import (
     CourseNotificationPreference,
     Notification,
     get_course_notification_preference_config_version
 )
 from openedx.core.djangoapps.notifications.serializers import NotificationCourseEnrollmentSerializer
-from openedx.core.djangoapps.notifications.email.utils import encrypt_object, encrypt_string
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
 from ..base_notification import COURSE_NOTIFICATION_APPS, COURSE_NOTIFICATION_TYPES, NotificationAppManager
 from ..utils import get_notification_types_with_visibility_settings
 
+User = get_user_model()
+
 
 @ddt.ddt
 class CourseEnrollmentListViewTest(ModuleStoreTestCase):
@@ -313,7 +317,14 @@ def _expected_api_response(self, course=None):
                             'push': True,
                             'email_cadence': 'Daily',
                             'info': 'Notifications for submission grading.'
-                        }
+                        },
+                        'ora_grade_assigned': {
+                            'web': True,
+                            'email': True,
+                            'push': False,
+                            'email_cadence': 'Daily',
+                            'info': ''
+                        },
                     },
                     'non_editable': {}
                 }
@@ -897,6 +908,7 @@ class UpdatePreferenceFromEncryptedDataView(ModuleStoreTestCase):
     """
     Tests if preference is updated when encrypted url is hit
     """
+
     def setUp(self):
         """
         Setup test case
@@ -929,7 +941,6 @@ def test_if_preference_is_updated(self, request_type):
         for app_name, app_prefs in config.items():
             for type_prefs in app_prefs['notification_types'].values():
                 assert type_prefs['email'] is False
-                assert type_prefs['email_cadence'] == EmailCadence.NEVER
 
     def test_if_config_version_is_updated(self):
         """
@@ -963,3 +974,310 @@ def remove_notifications_with_visibility_settings(expected_response):
                     notification_type
                 )
     return expected_response
+
+
+class UpdateAllNotificationPreferencesViewTests(APITestCase):
+    """
+    Tests for the UpdateAllNotificationPreferencesView.
+    """
+
+    def setUp(self):
+        # Create test user
+        self.user = User.objects.create_user(
+            username='testuser',
+            password='testpass123'
+        )
+        self.client = APIClient()
+        self.client.force_authenticate(user=self.user)
+        self.url = reverse('update-all-notification-preferences')
+
+        # Complex notification config structure
+        self.base_config = {
+            "grading": {
+                "enabled": True,
+                "non_editable": {},
+                "notification_types": {
+                    "core": {
+                        "web": True,
+                        "push": True,
+                        "email": True,
+                        "email_cadence": "Daily"
+                    },
+                    "ora_staff_notification": {
+                        "web": False,
+                        "push": False,
+                        "email": False,
+                        "email_cadence": "Daily"
+                    }
+                },
+                "core_notification_types": []
+            },
+            "updates": {
+                "enabled": True,
+                "non_editable": {},
+                "notification_types": {
+                    "core": {
+                        "web": True,
+                        "push": True,
+                        "email": True,
+                        "email_cadence": "Daily"
+                    },
+                    "course_updates": {
+                        "web": True,
+                        "push": True,
+                        "email": False,
+                        "email_cadence": "Daily"
+                    }
+                },
+                "core_notification_types": []
+            },
+            "discussion": {
+                "enabled": True,
+                "non_editable": {
+                    "core": ["web"]
+                },
+                "notification_types": {
+                    "core": {
+                        "web": True,
+                        "push": True,
+                        "email": True,
+                        "email_cadence": "Daily"
+                    },
+                    "content_reported": {
+                        "web": True,
+                        "push": True,
+                        "email": True,
+                        "email_cadence": "Daily"
+                    },
+                    "new_question_post": {
+                        "web": True,
+                        "push": False,
+                        "email": False,
+                        "email_cadence": "Daily"
+                    },
+                    "new_discussion_post": {
+                        "web": True,
+                        "push": False,
+                        "email": False,
+                        "email_cadence": "Daily"
+                    }
+                },
+                "core_notification_types": [
+                    "new_comment_on_response",
+                    "new_comment",
+                    "new_response",
+                    "response_on_followed_post",
+                    "comment_on_followed_post",
+                    "response_endorsed_on_thread",
+                    "response_endorsed"
+                ]
+            }
+        }
+
+        # Create test notification preferences
+        self.preferences = []
+        for i in range(3):
+            pref = CourseNotificationPreference.objects.create(
+                user=self.user,
+                course_id=f'course-v1:TestX+Test{i}+2024',
+                notification_preference_config=deepcopy(self.base_config),
+                is_active=True
+            )
+            self.preferences.append(pref)
+
+        # Create an inactive preference
+        self.inactive_pref = CourseNotificationPreference.objects.create(
+            user=self.user,
+            course_id='course-v1:TestX+Inactive+2024',
+            notification_preference_config=deepcopy(self.base_config),
+            is_active=False
+        )
+
+    def test_update_discussion_notification(self):
+        """
+        Test updating discussion notification settings
+        """
+        data = {
+            'notification_app': 'discussion',
+            'notification_type': 'content_reported',
+            'notification_channel': 'push',
+            'value': False
+        }
+
+        response = self.client.post(self.url, data, format='json')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['status'], 'success')
+        self.assertEqual(response.data['data']['total_updated'], 3)
+
+        # Verify database updates
+        for pref in CourseNotificationPreference.objects.filter(is_active=True):
+            self.assertFalse(
+                pref.notification_preference_config['discussion']['notification_types']['content_reported']['push']
+            )
+
+    def test_update_non_editable_field(self):
+        """
+        Test attempting to update a non-editable field
+        """
+        data = {
+            'notification_app': 'discussion',
+            'notification_type': 'core',
+            'notification_channel': 'web',
+            'value': False
+        }
+
+        response = self.client.post(self.url, data, format='json')
+
+        # Should fail because 'web' is non-editable for 'core' in discussion
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.data['status'], 'error')
+
+        # Verify database remains unchanged
+        for pref in CourseNotificationPreference.objects.filter(is_active=True):
+            self.assertTrue(
+                pref.notification_preference_config['discussion']['notification_types']['core']['web']
+            )
+
+    def test_update_email_cadence(self):
+        """
+        Test updating email cadence setting
+        """
+        data = {
+            'notification_app': 'discussion',
+            'notification_type': 'content_reported',
+            'email_cadence': 'Weekly'
+        }
+
+        response = self.client.post(self.url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['status'], 'success')
+
+        # Verify database updates
+        for pref in CourseNotificationPreference.objects.filter(is_active=True):
+            notification_type = pref.notification_preference_config['discussion']['notification_types'][
+                'content_reported']
+            self.assertEqual(
+                notification_type['email_cadence'],
+                'Weekly'
+            )
+
+    @patch.dict('openedx.core.djangoapps.notifications.serializers.COURSE_NOTIFICATION_APPS', {
+        **COURSE_NOTIFICATION_APPS,
+        'grading': {
+            'enabled': False,
+            'core_info': 'Notifications for submission grading.',
+            'core_web': True,
+            'core_email': True,
+            'core_push': True,
+            'core_email_cadence': 'Daily',
+            'non_editable': []
+        }
+    })
+    def test_update_disabled_app(self):
+        """
+        Test updating notification for a disabled app
+        """
+        # Disable the grading app in all preferences
+        for pref in self.preferences:
+            config = pref.notification_preference_config
+            config['grading']['enabled'] = False
+            pref.notification_preference_config = config
+            pref.save()
+
+        data = {
+            'notification_app': 'grading',
+            'notification_type': 'core',
+            'notification_channel': 'email',
+            'value': False
+        }
+        response = self.client.post(self.url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.data['status'], 'error')
+
+    def test_invalid_serializer_data(self):
+        """
+        Test handling of invalid input data
+        """
+        test_cases = [
+            {
+                'notification_app': 'invalid_app',
+                'notification_type': 'core',
+                'notification_channel': 'push',
+                'value': False
+            },
+            {
+                'notification_app': 'discussion',
+                'notification_type': 'invalid_type',
+                'notification_channel': 'push',
+                'value': False
+            },
+            {
+                'notification_app': 'discussion',
+                'notification_type': 'core',
+                'notification_channel': 'invalid_channel',
+                'value': False
+            },
+            {
+                'notification_app': 'discussion',
+                'notification_type': 'core',
+                'notification_channel': 'email_cadence',
+                'value': 'Invalid_Cadence'
+            }
+        ]
+
+        for test_case in test_cases:
+            response = self.client.post(self.url, test_case, format='json')
+            self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+
+class GetAggregateNotificationPreferencesTest(APITestCase):
+    """
+    Tests for the GetAggregateNotificationPreferences API view.
+    """
+
+    def setUp(self):
+        # Set up a user and API client
+        self.user = User.objects.create_user(username='testuser', password='testpass')
+        self.client = APIClient()
+        self.client.force_authenticate(user=self.user)
+        self.url = reverse('notification-preferences-aggregated')  # Adjust with the actual name
+
+    def test_no_active_notification_preferences(self):
+        """
+        Test case: No active notification preferences found for the user
+        """
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+        self.assertEqual(response.data['status'], 'error')
+        self.assertEqual(response.data['message'], 'No active notification preferences found')
+
+    @patch('openedx.core.djangoapps.notifications.views.aggregate_notification_configs')
+    def test_with_active_notification_preferences(self, mock_aggregate):
+        """
+        Test case: Active notification preferences found for the user
+        """
+        # Mock aggregate_notification_configs for a controlled output
+        mock_aggregate.return_value = {'mocked': 'data'}
+
+        # Create active notification preferences for the user
+        CourseNotificationPreference.objects.create(
+            user=self.user,
+            is_active=True,
+            notification_preference_config={'example': 'config'}
+        )
+
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['status'], 'success')
+        self.assertEqual(response.data['message'], 'Notification preferences retrieved')
+        self.assertEqual(response.data['data'], {'mocked': 'data'})
+
+    def test_unauthenticated_user(self):
+        """
+        Test case: Request without authentication
+        """
+        # Test case: Request without authentication
+        self.client.logout()  # Remove authentication
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
diff --git a/openedx/core/djangoapps/notifications/urls.py b/openedx/core/djangoapps/notifications/urls.py
index 7f611bc2c4ca..9892fa72de0d 100644
--- a/openedx/core/djangoapps/notifications/urls.py
+++ b/openedx/core/djangoapps/notifications/urls.py
@@ -11,13 +11,13 @@
     NotificationCountView,
     NotificationListAPIView,
     NotificationReadAPIView,
+    UpdateAllNotificationPreferencesView,
     UserNotificationPreferenceView,
-    preference_update_from_encrypted_username_view,
+    preference_update_from_encrypted_username_view, AggregatedNotificationPreferences
 )
 
 router = routers.DefaultRouter()
 
-
 urlpatterns = [
     path('enrollments/', CourseEnrollmentListView.as_view(), name='enrollment-list'),
     re_path(
@@ -25,6 +25,11 @@
         UserNotificationPreferenceView.as_view(),
         name='notification-preferences'
     ),
+    path(
+        'configurations/',
+        AggregatedNotificationPreferences.as_view(),
+        name='notification-preferences-aggregated'
+    ),
     path('', NotificationListAPIView.as_view(), name='notifications-list'),
     path('count/', NotificationCountView.as_view(), name='notifications-count'),
     path(
@@ -35,6 +40,11 @@
     path('read/', NotificationReadAPIView.as_view(), name='notifications-read'),
     path('preferences/update/<str:username>/<str:patch>/', preference_update_from_encrypted_username_view,
          name='preference_update_from_encrypted_username_view'),
+    path(
+        'preferences/update-all/',
+        UpdateAllNotificationPreferencesView.as_view(),
+        name='update-all-notification-preferences'
+    ),
 ]
 
 urlpatterns += router.urls
diff --git a/openedx/core/djangoapps/notifications/utils.py b/openedx/core/djangoapps/notifications/utils.py
index 249eaf874995..34f9d71cb04b 100644
--- a/openedx/core/djangoapps/notifications/utils.py
+++ b/openedx/core/djangoapps/notifications/utils.py
@@ -1,11 +1,12 @@
 """
 Utils function for notifications app
 """
-from typing import Dict, List
+import copy
+from typing import Dict, List, Set
 
 from common.djangoapps.student.models import CourseAccessRole, CourseEnrollment
 from openedx.core.djangoapps.django_comment_common.models import Role
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NEW_NOTIFICATION_VIEW, ENABLE_NOTIFICATIONS
 from openedx.core.lib.cache_utils import request_cached
 
 
@@ -47,6 +48,13 @@ def get_show_notifications_tray(user):
     return show_notifications_tray
 
 
+def get_is_new_notification_view_enabled():
+    """
+    Returns True if the waffle flag for the new notification view is enabled, False otherwise.
+    """
+    return ENABLE_NEW_NOTIFICATION_VIEW.is_enabled()
+
+
 def get_list_in_batches(input_list, batch_size):
     """
     Divides the list of objects into list of list of objects each of length batch_size.
@@ -151,3 +159,113 @@ def clean_arguments(kwargs):
     if kwargs.get('created', {}):
         clean_kwargs.update(kwargs.get('created'))
     return clean_kwargs
+
+
+def update_notification_types(
+    app_config: Dict,
+    user_app_config: Dict,
+) -> None:
+    """
+    Update notification types for a specific category configuration.
+    """
+    if "notification_types" not in user_app_config:
+        return
+
+    for type_key, type_config in user_app_config["notification_types"].items():
+        if type_key not in app_config["notification_types"]:
+            continue
+
+        update_notification_fields(
+            app_config["notification_types"][type_key],
+            type_config,
+        )
+
+
+def update_notification_fields(
+    target_config: Dict,
+    source_config: Dict,
+) -> None:
+    """
+    Update individual notification fields (web, push, email) and email_cadence.
+    """
+    for field in ["web", "push", "email"]:
+        if field in source_config:
+            target_config[field] |= source_config[field]
+    if "email_cadence" in source_config:
+        if not target_config.get("email_cadence") or isinstance(target_config.get("email_cadence"), str):
+            target_config["email_cadence"] = set()
+
+        target_config["email_cadence"].add(source_config["email_cadence"])
+
+
+def update_core_notification_types(app_config: Dict, user_config: Dict) -> None:
+    """
+    Update core notification types by merging existing and new types.
+    """
+    if "core_notification_types" not in user_config:
+        return
+
+    existing_types: Set = set(app_config.get("core_notification_types", []))
+    existing_types.update(user_config["core_notification_types"])
+    app_config["core_notification_types"] = list(existing_types)
+
+
+def process_app_config(
+    app_config: Dict,
+    user_config: Dict,
+    app: str,
+    default_config: Dict,
+) -> None:
+    """
+    Process a single category configuration against another config.
+    """
+    if app not in user_config:
+        return
+
+    user_app_config = user_config[app]
+
+    # Update enabled status
+    app_config["enabled"] |= user_app_config.get("enabled", False)
+
+    # Update core notification types
+    update_core_notification_types(app_config, user_app_config)
+
+    # Update notification types
+    update_notification_types(app_config, user_app_config)
+
+
+def aggregate_notification_configs(existing_user_configs: List[Dict]) -> Dict:
+    """
+    Update default notification config with values from other configs.
+    Rules:
+    1. Start with default config as base
+    2. If any value is True in other configs, make it True
+    3. Set email_cadence to "Mixed" if different cadences found, else use default
+
+    Args:
+        existing_user_configs: List of notification config dictionaries to apply
+
+    Returns:
+        Updated config following the same structure
+    """
+    if not existing_user_configs:
+        return {}
+
+    result_config = copy.deepcopy(existing_user_configs[0])
+    apps = result_config.keys()
+
+    for app in apps:
+        app_config = result_config[app]
+
+        for user_config in existing_user_configs:
+            process_app_config(app_config, user_config, app, existing_user_configs[0])
+
+    # if email_cadence is mixed, set it to "Mixed"
+    for app in result_config:
+        for type_key, type_config in result_config[app]["notification_types"].items():
+            if len(type_config.get("email_cadence", [])) > 1:
+                result_config[app]["notification_types"][type_key]["email_cadence"] = "Mixed"
+            else:
+                result_config[app]["notification_types"][type_key]["email_cadence"] = (
+                    result_config[app]["notification_types"][type_key]["email_cadence"].pop())
+    return result_config
diff --git a/openedx/core/djangoapps/notifications/views.py b/openedx/core/djangoapps/notifications/views.py
index fdc91c12a9e0..8e41b11554c8 100644
--- a/openedx/core/djangoapps/notifications/views.py
+++ b/openedx/core/djangoapps/notifications/views.py
@@ -1,9 +1,11 @@
 """
 Views for the notifications API.
 """
+import copy
 from datetime import datetime, timedelta
 
 from django.conf import settings
+from django.db import transaction
 from django.db.models import Count
 from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext as _
@@ -17,10 +19,7 @@
 
 from common.djangoapps.student.models import CourseEnrollment
 from openedx.core.djangoapps.notifications.email.utils import update_user_preferences_from_patch
-from openedx.core.djangoapps.notifications.models import (
-    CourseNotificationPreference,
-    get_course_notification_preference_config_version
-)
+from openedx.core.djangoapps.notifications.models import get_course_notification_preference_config_version
 from openedx.core.djangoapps.notifications.permissions import allow_any_authenticated_user
 
 from .base_notification import COURSE_NOTIFICATION_APPS
@@ -32,14 +31,15 @@
     notification_tray_opened_event,
     notifications_app_all_read_event
 )
-from .models import Notification
+from .models import CourseNotificationPreference, Notification
 from .serializers import (
     NotificationCourseEnrollmentSerializer,
     NotificationSerializer,
     UserCourseNotificationPreferenceSerializer,
-    UserNotificationPreferenceUpdateSerializer,
+    UserNotificationPreferenceUpdateAllSerializer,
+    UserNotificationPreferenceUpdateSerializer
 )
-from .utils import get_show_notifications_tray
+from .utils import get_is_new_notification_view_enabled, get_show_notifications_tray, aggregate_notification_configs
 
 
 @allow_any_authenticated_user()
@@ -291,7 +291,7 @@ def get_queryset(self):
 
         if app_name:
             params['app_name'] = app_name
-        return Notification.objects.filter(**params).order_by('-id')
+        return Notification.objects.filter(**params).order_by('-created')
 
 
 @allow_any_authenticated_user()
@@ -329,6 +329,7 @@ def get(self, request):
         )
         count_total = 0
         show_notifications_tray = get_show_notifications_tray(self.request.user)
+        is_new_notification_view_enabled = get_is_new_notification_view_enabled()
         count_by_app_name_dict = {
             app_name: 0
             for app_name in COURSE_NOTIFICATION_APPS
@@ -344,7 +345,8 @@ def get(self, request):
             "show_notifications_tray": show_notifications_tray,
             "count": count_total,
             "count_by_app_name": count_by_app_name_dict,
-            "notification_expiry_days": settings.NOTIFICATIONS_EXPIRY
+            "notification_expiry_days": settings.NOTIFICATIONS_EXPIRY,
+            "is_new_notification_view_enabled": is_new_notification_view_enabled
         })
 
 
@@ -442,3 +444,144 @@ def preference_update_from_encrypted_username_view(request, username, patch):
     """
     update_user_preferences_from_patch(username, patch)
     return Response({"result": "success"}, status=status.HTTP_200_OK)
+
+
+@allow_any_authenticated_user()
+class UpdateAllNotificationPreferencesView(APIView):
+    """
+    API view for updating all notification preferences for the current user.
+    """
+
+    def post(self, request):
+        """
+        Update all notification preferences for the current user.
+        """
+        # check if request have required params
+        serializer = UserNotificationPreferenceUpdateAllSerializer(data=request.data)
+        if not serializer.is_valid():
+            return Response({
+                'status': 'error',
+                'message': serializer.errors
+            }, status=status.HTTP_400_BAD_REQUEST)
+        # check if required config is not editable
+        try:
+            with transaction.atomic():
+                # Get all active notification preferences for the current user
+                notification_preferences = (
+                    CourseNotificationPreference.objects
+                    .select_for_update()
+                    .filter(
+                        user=request.user,
+                        is_active=True
+                    )
+                )
+
+                if not notification_preferences.exists():
+                    return Response({
+                        'status': 'error',
+                        'message': 'No active notification preferences found'
+                    }, status=status.HTTP_404_NOT_FOUND)
+
+                data = serializer.validated_data
+                app = data['notification_app']
+                email_cadence = data.get('email_cadence', None)
+                channel = data.get('notification_channel', 'email_cadence' if email_cadence else None)
+                notification_type = data['notification_type']
+                value = data.get('value', email_cadence if email_cadence else None)
+
+                updated_courses = []
+                errors = []
+
+                # Update each preference
+                for preference in notification_preferences:
+                    try:
+                        # Create a deep copy of the current config
+                        updated_config = copy.deepcopy(preference.notification_preference_config)
+
+                        # Check if the path exists and update the value
+                        if (
+                            updated_config.get(app, {})
+                                .get('notification_types', {})
+                                .get(notification_type, {})
+                                .get(channel)
+                        ) is not None:
+
+                            # Update the specific setting in the config
+                            updated_config[app]['notification_types'][notification_type][channel] = value
+
+                            # Update the notification preference
+                            preference.notification_preference_config = updated_config
+                            preference.save()
+
+                            updated_courses.append({
+                                'course_id': str(preference.course_id),
+                                'current_setting': updated_config[app]['notification_types'][notification_type]
+                            })
+                        else:
+                            errors.append({
+                                'course_id': str(preference.course_id),
+                                'error': f'Invalid path: {app}.notification_types.{notification_type}.{channel}'
+                            })
+
+                    except Exception as e:
+                        errors.append({
+                            'course_id': str(preference.course_id),
+                            'error': str(e)
+                        })
+
+                response_data = {
+                    'status': 'success' if updated_courses else 'partial_success' if errors else 'error',
+                    'message': 'Notification preferences update completed',
+                    'data': {
+                        'updated_value': value,
+                        'notification_type': notification_type,
+                        'channel': channel,
+                        'app': app,
+                        'successfully_updated_courses': updated_courses,
+                        'total_updated': len(updated_courses),
+                        'total_courses': notification_preferences.count()
+                    }
+                }
+
+                if errors:
+                    response_data['errors'] = errors
+
+                return Response(
+                    response_data,
+                    status=status.HTTP_200_OK if updated_courses else status.HTTP_400_BAD_REQUEST
+                )
+
+        except Exception as e:
+            return Response({
+                'status': 'error',
+                'message': str(e)
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+@allow_any_authenticated_user()
+class AggregatedNotificationPreferences(APIView):
+    """
+    API view for getting the aggregate notification preferences for the current user.
+    """
+
+    def get(self, request):
+        """
+        API view for getting the aggregate notification preferences for the current user.
+        """
+        notification_preferences = CourseNotificationPreference.objects.filter(user=request.user, is_active=True)
+
+        if not notification_preferences.exists():
+            return Response({
+                'status': 'error',
+                'message': 'No active notification preferences found'
+            }, status=status.HTTP_404_NOT_FOUND)
+        notification_configs = notification_preferences.values_list('notification_preference_config', flat=True)
+        notification_configs = aggregate_notification_configs(
+            notification_configs
+        )
+
+        return Response({
+            'status': 'success',
+            'message': 'Notification preferences retrieved',
+            'data': notification_configs
+        }, status=status.HTTP_200_OK)
diff --git a/openedx/core/djangoapps/olx_rest_api/test_views.py b/openedx/core/djangoapps/olx_rest_api/test_views.py
index c91cb6ff3ce8..bde877a457ae 100644
--- a/openedx/core/djangoapps/olx_rest_api/test_views.py
+++ b/openedx/core/djangoapps/olx_rest_api/test_views.py
@@ -26,7 +26,7 @@ def setUpClass(cls):
         with cls.store.default_store(ModuleStoreEnum.Type.split):
             cls.course = ToyCourseFactory.create(modulestore=cls.store)
         assert str(cls.course.id).startswith("course-v1:"), "This test is for split mongo course exports only"
-        cls.unit_key = cls.course.id.make_usage_key('vertical', 'vertical_test')
+        cls.video_key = cls.course.id.make_usage_key('video', 'sample_video')
 
     def setUp(self):
         """
@@ -56,7 +56,7 @@ def test_no_permission(self):
         A regular user enrolled in the course (but not part of the authoring
         team) should not be able to use the API.
         """
-        response = self.get_olx_response_for_block(self.unit_key)
+        response = self.get_olx_response_for_block(self.video_key)
         assert response.status_code == 403
         assert response.json()['detail'] ==\
                'You must be a member of the course team in Studio to export OLX using this API.'
@@ -67,24 +67,14 @@ def test_export(self):
         the course.
         """
         CourseStaffRole(self.course.id).add_users(self.user)
-
-        response = self.get_olx_response_for_block(self.unit_key)
+        response = self.get_olx_response_for_block(self.video_key)
         assert response.status_code == 200
-        assert response.json()['root_block_id'] == str(self.unit_key)
+        assert response.json()['root_block_id'] == str(self.video_key)
         blocks = response.json()['blocks']
-        # Check the OLX of the root block:
-        self.assertXmlEqual(
-            blocks[str(self.unit_key)]['olx'],
-            '<unit>\n'
-            '  <xblock-include definition="video/sample_video"/>\n'
-            '  <xblock-include definition="video/separate_file_video"/>\n'
-            '  <xblock-include definition="video/video_with_end_time"/>\n'
-            '  <xblock-include definition="poll_question/T1_changemind_poll_foo_2"/>\n'
-            '</unit>\n'
-        )
+
         # Check the OLX of a video
         self.assertXmlEqual(
-            blocks[str(self.course.id.make_usage_key('video', 'sample_video'))]['olx'],
+            blocks[str(self.video_key)]['olx'],
             '<video youtube="0.75:JMD_ifUUfsU,1.00:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY" '
             'display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" '
             'youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY"/>\n'
diff --git a/openedx/core/djangoapps/programs/models.py b/openedx/core/djangoapps/programs/models.py
index 302ad553f245..e708066813b8 100644
--- a/openedx/core/djangoapps/programs/models.py
+++ b/openedx/core/djangoapps/programs/models.py
@@ -72,8 +72,14 @@ def get(cls, program_uuid):
 
 
 class ProgramLiveConfiguration(AbstractProgramLTIConfiguration):
+    """
+    .. no_pii:
+    """
     history = HistoricalRecords()
 
 
 class ProgramDiscussionsConfiguration(AbstractProgramLTIConfiguration):
+    """
+    .. no_pii:
+    """
     history = HistoricalRecords()
diff --git a/openedx/core/djangoapps/programs/tasks.py b/openedx/core/djangoapps/programs/tasks.py
index 42548fd494ce..d3b4b867e4cd 100644
--- a/openedx/core/djangoapps/programs/tasks.py
+++ b/openedx/core/djangoapps/programs/tasks.py
@@ -315,14 +315,16 @@ def award_program_certificates(self, username):  # lint-amnesty, pylint: disable
         if str(programs_without_certificates[0]).lower() == "all":
             return
 
-    LOGGER.info(f"Running task award_program_certificates for user {student}")
+    LOGGER.info(f"Running task award_program_certificates for user {student.id}")
     try:
         completed_programs = {}
         for site in Site.objects.all():
             completed_programs.update(get_completed_programs(site, student))
 
         if not completed_programs:
-            LOGGER.warning(f"Task award_program_certificates was called for user {student} with no completed programs")
+            LOGGER.warning(
+                f"Task award_program_certificates was called for user {student.id} with no completed programs"
+            )
             return
 
         # determine which program certificates have been awarded to the user
@@ -331,7 +333,7 @@ def award_program_certificates(self, username):  # lint-amnesty, pylint: disable
         # program is part of the "programs without certificates" list in our site configuration
         awarded_and_skipped_program_uuids = list(set(existing_program_uuids + list(programs_without_certificates)))
     except Exception as exc:
-        error_msg = f"Failed to determine program certificates to be awarded for user {student}: {exc}"
+        error_msg = f"Failed to determine program certificates to be awarded for user {student.id}: {exc}"
         LOGGER.exception(error_msg)
         raise MaxRetriesExceededError(
             f"Failed to award a program certificate to user {student.id}. Reason: {error_msg}"
@@ -360,18 +362,18 @@ def award_program_certificates(self, username):  # lint-amnesty, pylint: disable
         for program_uuid in new_program_uuids:
             try:
                 award_program_certificate(credentials_client, student, program_uuid)
-                LOGGER.info(f"Awarded program certificate to user {student} in program {program_uuid}")
+                LOGGER.info(f"Awarded program certificate to user {student.id} in program {program_uuid}")
             except HTTPError as exc:
                 if exc.response.status_code == 404:
                     LOGGER.warning(
-                        f"Unable to award a program certificate to user {student} in program {program_uuid}. A "
+                        f"Unable to award a program certificate to user {student.id} in program {program_uuid}. A "
                         f"certificate configuration for program {program_uuid} could not be found, the program might "
                         "not be configured correctly in Credentials"
                     )
                 elif exc.response.status_code == 429:
                     # Let celery handle retry attempts and backoff
                     error_msg = (
-                        f"Rate limited. Attempting to award certificate to user {student} in program {program_uuid}."
+                        f"Rate limited. Attempting to award certificate to user {student.id} in program {program_uuid}."
                     )
                     LOGGER.warning(error_msg)
                     raise MaxRetriesExceededError(
@@ -379,33 +381,33 @@ def award_program_certificates(self, username):  # lint-amnesty, pylint: disable
                     ) from exc
                 else:
                     LOGGER.warning(
-                        f"Unable to award program certificate to user {student} in program {program_uuid}. The program "
-                        "might not be configured correctly in Credentials"
+                        f"Unable to award program certificate to user {student.id} in program {program_uuid}. The "
+                        "program might not be configured correctly in Credentials"
                     )
             except Exception as exc:  # pylint: disable=broad-except
                 # keep trying to award other certs, but let celery retry the whole task to fix any missing entries
                 LOGGER.exception(
-                    f"Failed to award program certificate to user {student} in program {program_uuid}: {exc}"
+                    f"Failed to award program certificate to user {student.id} in program {program_uuid}: {exc}"
                 )
                 failed_program_certificate_award_attempts.append(program_uuid)
 
         if failed_program_certificate_award_attempts:
             # N.B. This logic assumes that this task is idempotent
-            LOGGER.info(f"Retrying failed tasks to award program certificate(s) to user {student}")
+            LOGGER.info(f"Retrying failed tasks to award program certificate(s) to user {student.id}")
             # The error message may change on each reattempt but will never be raised until the max number of retries
             # have been exceeded. It is unlikely that this list will change by the time it reaches its maximimum number
             # of attempts.
             error_msg = (
-                f"Failed to award program certificate(s) for user {student} in programs "
+                f"Failed to award program certificate(s) for user {student.id} in programs "
                 f"{failed_program_certificate_award_attempts}"
             )
             raise MaxRetriesExceededError(
                 f"Failed to award a program certificate to user {student.id}. Reason: {error_msg}"
             )
     else:
-        LOGGER.warning(f"User {student} is not eligible for any new program certificates")
+        LOGGER.warning(f"User {student.id} is not eligible for any new program certificates")
 
-    LOGGER.info(f"Successfully completed the task award_program_certificates for user {student}")
+    LOGGER.info(f"Successfully completed the task award_program_certificates for user {student.id}")
 
 
 # pylint: disable=W0613
@@ -504,7 +506,7 @@ def award_course_certificate(self, username, course_run_key):
         )
         return
 
-    LOGGER.info(f"Running task award_course_certificate for user {user}")
+    LOGGER.info(f"Running task award_course_certificate for user {user.id}")
     try:
         course_key = CourseKey.from_string(course_run_key)
     except InvalidKeyError as exc:
@@ -574,7 +576,7 @@ def award_course_certificate(self, username, course_run_key):
             org=course_key.org,
         )
     except Exception as exc:
-        error_msg = f"Failed to post course certificate to be awarded for user {user}."
+        error_msg = f"Failed to post course certificate to be awarded for user {user.id}."
         raise MaxRetriesExceededError(
             f"Failed to award course certificate for user {user.id} for course {course_run_key}. Reason: {error_msg}"
         ) from exc
@@ -628,14 +630,14 @@ def revoke_program_certificates(self, username, course_key):  # lint-amnesty, py
         )
         return
 
-    LOGGER.info(f"Running task revoke_program_certificates for user {student}")
+    LOGGER.info(f"Running task revoke_program_certificates for user {student.id}")
     try:
         inverted_programs = get_inverted_programs(student)
         course_specific_programs = inverted_programs.get(course_key)
         if not course_specific_programs:
             LOGGER.warning(
-                f"Task revoke_program_certificates was called for user {student} and course run {course_key} with no "
-                "engaged programs"
+                f"Task revoke_program_certificates was called for user {student.id} and course run {course_key} with "
+                "no engaged programs"
             )
             return
 
@@ -644,7 +646,7 @@ def revoke_program_certificates(self, username, course_key):  # lint-amnesty, py
     except Exception as exc:
         error_msg = (
             f"Failed to determine if any program certificates associated with course run {course_key} should be "
-            f"revoked from user {student}"
+            f"revoked from user {student.id}"
         )
         LOGGER.exception(error_msg)
         raise MaxRetriesExceededError(
@@ -668,17 +670,17 @@ def revoke_program_certificates(self, username, course_key):  # lint-amnesty, py
         for program_uuid in program_uuids_to_revoke:
             try:
                 revoke_program_certificate(credentials_client, username, program_uuid)
-                LOGGER.info(f"Revoked program certificate from user {student} in program {program_uuid}")
+                LOGGER.info(f"Revoked program certificate from user {student.id} in program {program_uuid}")
             except HTTPError as exc:
                 if exc.response.status_code == 404:
                     LOGGER.warning(
-                        f"Unable to revoke program certificate from user {student} in program {program_uuid}, a "
+                        f"Unable to revoke program certificate from user {student.id} in program {program_uuid}, a "
                         "program certificate could not be found"
                     )
                 elif exc.response.status_code == 429:
                     # Let celery handle retry attempts and backoff
                     error_msg = (
-                        f"Rate limited. Attempting to revoke a program certificate from user {student} in program "
+                        f"Rate limited. Attempting to revoke a program certificate from user {student.id} in program "
                         f"{program_uuid}."
                     )
                     LOGGER.warning(error_msg)
@@ -687,23 +689,23 @@ def revoke_program_certificates(self, username, course_key):  # lint-amnesty, py
                     ) from exc
                 else:
                     LOGGER.warning(
-                        f"Unable to revoke program certificate from user {student} in program {program_uuid}"
+                        f"Unable to revoke program certificate from user {student.id} in program {program_uuid}"
                     )
             except Exception as exc:  # pylint: disable=broad-except
                 # keep trying to revoke other certs, but let celery retry the whole task to fix any missing entries
                 LOGGER.exception(
-                    f"Failed to revoke program certificate from user {student} in program {program_uuid}: {exc}"
+                    f"Failed to revoke program certificate from user {student.id} in program {program_uuid}: {exc}"
                 )
                 failed_program_certificate_revoke_attempts.append(program_uuid)
 
         if failed_program_certificate_revoke_attempts:
             # N.B. This logic assumes that this task is idempotent
-            LOGGER.info(f"Failed task to revoke program certificate(s) from user {student}")
+            LOGGER.info(f"Failed task to revoke program certificate(s) from user {student .id}")
             # The error message may change on each reattempt but will never be raised until the max number of retries
             # have been exceeded. It is unlikely that this list will change by the time it reaches its maximimum number
             # of attempts.
             error_msg = (
-                f"Failed to revoke program certificate(s) from user {student} for programs "
+                f"Failed to revoke program certificate(s) from user {student.id} for programs "
                 f"{failed_program_certificate_revoke_attempts}"
             )
             raise MaxRetriesExceededError(
@@ -711,9 +713,9 @@ def revoke_program_certificates(self, username, course_key):  # lint-amnesty, py
                 f"Reason: {error_msg}"
             )
     else:
-        LOGGER.info(f"No program certificates to revoke from user {student}")
+        LOGGER.info(f"No program certificates to revoke from user {student.id}")
 
-    LOGGER.info(f"Successfully completed the task revoke_program_certificates for user {student}")
+    LOGGER.info(f"Successfully completed the task revoke_program_certificates for user {student.id}")
 
 
 @shared_task(
diff --git a/openedx/core/djangoapps/programs/tests/test_tasks.py b/openedx/core/djangoapps/programs/tests/test_tasks.py
index d30cc4e8689e..e2b1c554c840 100644
--- a/openedx/core/djangoapps/programs/tests/test_tasks.py
+++ b/openedx/core/djangoapps/programs/tests/test_tasks.py
@@ -365,10 +365,10 @@ def test_continue_awarding_certs_if_error(
             tasks.award_program_certificates.delay(self.student.username).get()
         assert mock_award_program_certificate.call_count == 3
         mock_warning.assert_called_once_with(
-            f"Failed to award program certificate to user {self.student} in program 1: boom"
+            f"Failed to award program certificate to user {self.student.id} in program 1: boom"
         )
-        mock_info.assert_any_call(f"Awarded program certificate to user {self.student} in program 1")
-        mock_info.assert_any_call(f"Awarded program certificate to user {self.student} in program 2")
+        mock_info.assert_any_call(f"Awarded program certificate to user {self.student.id} in program 1")
+        mock_info.assert_any_call(f"Awarded program certificate to user {self.student.id} in program 2")
 
     def test_retry_on_programs_api_errors(self, mock_get_completed_programs, *_mock_helpers):
         """
@@ -835,10 +835,10 @@ def test_continue_revoking_certs_if_error(
 
         assert mock_revoke_program_certificate.call_count == 3
         mock_warning.assert_called_once_with(
-            f"Failed to revoke program certificate from user {self.student} in program 1: boom"
+            f"Failed to revoke program certificate from user {self.student.id} in program 1: boom"
         )
-        mock_info.assert_any_call(f"Revoked program certificate from user {self.student} in program 1")
-        mock_info.assert_any_call(f"Revoked program certificate from user {self.student} in program 2")
+        mock_info.assert_any_call(f"Revoked program certificate from user {self.student.id} in program 1")
+        mock_info.assert_any_call(f"Revoked program certificate from user {self.student.id} in program 2")
 
     def test_retry_on_credentials_api_errors(
         self,
diff --git a/openedx/core/djangoapps/programs/utils.py b/openedx/core/djangoapps/programs/utils.py
index b842b8b363b6..95044a6faeff 100644
--- a/openedx/core/djangoapps/programs/utils.py
+++ b/openedx/core/djangoapps/programs/utils.py
@@ -631,7 +631,9 @@ def _attach_course_run_upgrade_url(self, run_mode):
             ecommerce = EcommerceService()
             sku = getattr(required_mode, "sku", None)
             if ecommerce.is_enabled(self.user) and sku:
-                run_mode["upgrade_url"] = ecommerce.get_checkout_page_url(required_mode.sku)
+                run_mode["upgrade_url"] = ecommerce.get_checkout_page_url(
+                    required_mode.sku, course_run_keys=[self.course_run_key]
+                )
             else:
                 run_mode["upgrade_url"] = None
         else:
diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py
index 5f769e6af299..40d565962b0c 100644
--- a/openedx/core/djangoapps/schedules/resolvers.py
+++ b/openedx/core/djangoapps/schedules/resolvers.py
@@ -14,6 +14,7 @@
 from edx_ace.recipient import Recipient
 from edx_ace.recipient_resolver import RecipientResolver
 from edx_django_utils.monitoring import function_trace, set_custom_attribute
+from openedx_filters.learning.filters import ScheduleQuerySetRequested
 
 from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link, can_show_verified_upgrade
 from lms.djangoapps.discussion.notification_prefs.views import UsernameCipher
@@ -154,6 +155,10 @@ def get_schedules_with_target_date_by_bin_and_orgs(
 
         schedules = self.filter_by_org(schedules)
 
+        # .. filter_implemented_name: ScheduleQuerySetRequested
+        # .. filter_type: org.openedx.learning.schedule.queryset.requested.v1
+        schedules = ScheduleQuerySetRequested.run_filter(schedules)
+
         if "read_replica" in settings.DATABASES:
             schedules = schedules.using("read_replica")
 
@@ -377,6 +382,13 @@ def send(self, msg_type):
                 language,
                 context,
             )
+            LOG.info(
+                'Sending email to user: {} for Instructor-paced course with course-key: {} and language: {}'.format(
+                    user.username,
+                    self.course_id,
+                    language
+                )
+            )
             with function_trace('enqueue_send_task'):
                 self.async_send_task.apply_async((self.site.id, str(msg)), retry=False)  # pylint: disable=no-member
 
@@ -464,6 +476,13 @@ def send(self):  # lint-amnesty, pylint: disable=arguments-differ
                     self.course_id
                 )
             )
+            LOG.info(
+                'Sending email to user: {} for Self-paced course with course-key: {} and language: {}'.format(
+                    user.username,
+                    self.course_id,
+                    language
+                )
+            )
             with function_trace('enqueue_send_task'):
                 self.async_send_task.apply_async((self.site.id, str(msg)), retry=False)
 
diff --git a/openedx/core/djangoapps/schedules/tests/test_filters.py b/openedx/core/djangoapps/schedules/tests/test_filters.py
new file mode 100644
index 000000000000..9f7efa050447
--- /dev/null
+++ b/openedx/core/djangoapps/schedules/tests/test_filters.py
@@ -0,0 +1,71 @@
+"""
+Test cases for the Open edX Filters associated with the schedule app.
+"""
+
+import datetime
+from unittest.mock import Mock
+
+from django.db.models.query import QuerySet
+from django.test import override_settings
+from openedx_filters import PipelineStep
+
+from openedx.core.djangoapps.schedules.resolvers import BinnedSchedulesBaseResolver
+from openedx.core.djangoapps.schedules.tests.test_resolvers import SchedulesResolverTestMixin
+from openedx.core.djangolib.testing.utils import skip_unless_lms
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+
+
+class TestScheduleQuerySetRequestedPipelineStep(PipelineStep):
+    """Pipeline step class to test a configured pipeline step"""
+
+    filtered_schedules = Mock(spec=QuerySet, __len__=Mock(return_value=0))
+
+    def run_filter(self, schedules: QuerySet):  # pylint: disable=arguments-differ
+        """Pipeline step to filter the schedules"""
+        return {
+            "schedules": self.filtered_schedules,
+        }
+
+
+@skip_unless_lms
+class ScheduleQuerySetRequestedFiltersTest(SchedulesResolverTestMixin, ModuleStoreTestCase):
+    """
+    Tests for the Open edX Filters associated with the schedule queryset requested.
+
+    The following filters are tested:
+    - ScheduleQuerySetRequested
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.resolver = BinnedSchedulesBaseResolver(
+            async_send_task=Mock(name="async_send_task"),
+            site=self.site,
+            target_datetime=datetime.datetime.now(),
+            day_offset=3,
+            bin_num=2,
+        )
+        self.resolver.schedule_date_field = "created"
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.schedule.queryset.requested.v1": {
+                "pipeline": [
+                    "openedx.core.djangoapps.schedules.tests.test_filters.TestScheduleQuerySetRequestedPipelineStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_schedule_with_queryset_requested_filter_enabled(self) -> None:
+        """Test to verify the schedule queryset was modified by the pipeline step."""
+        schedules = self.resolver.get_schedules_with_target_date_by_bin_and_orgs()
+
+        self.assertEqual(TestScheduleQuerySetRequestedPipelineStep.filtered_schedules, schedules)
+
+    @override_settings(OPEN_EDX_FILTERS_CONFIG={})
+    def test_schedule_with_queryset_requested_filter_disabled(self) -> None:
+        """Test to verify the schedule queryset was not modified when the pipeline step is not configured."""
+        schedules = self.resolver.get_schedules_with_target_date_by_bin_and_orgs()
+
+        self.assertNotEqual(TestScheduleQuerySetRequestedPipelineStep.filtered_schedules, schedules)
diff --git a/openedx/core/djangoapps/signals/signals.py b/openedx/core/djangoapps/signals/signals.py
index ca693b4d109b..24624464ab91 100644
--- a/openedx/core/djangoapps/signals/signals.py
+++ b/openedx/core/djangoapps/signals/signals.py
@@ -36,9 +36,16 @@
 # ]
 COURSE_GRADE_NOW_FAILED = Signal()
 
-# Signal that indicates that a user has become verified for certificate purposes
+# Signal that indicates that a user has become verified via SSO for certificate purposes
 # providing_args=['user']
-LEARNER_NOW_VERIFIED = Signal()
+LEARNER_SSO_VERIFIED = Signal()
+
+# Signal that indicates a user has been verified via verify_studnet.PhotoVerification for certificate purposes
+# Please note that this signal and the corresponding PhotoVerification model are planned for deprecation.
+# Future implementations of IDV will use the verify_student.VerificationAttempt model and corresponding
+# openedx events.
+# DEPR:  https://github.com/openedx/edx-platform/issues/35128
+PHOTO_VERIFICATION_APPROVED = Signal()
 
 # providing_args=['user']
 USER_ACCOUNT_ACTIVATED = Signal()  # Signal indicating email verification
diff --git a/openedx/core/djangoapps/theming/management/commands/compile_sass.py b/openedx/core/djangoapps/theming/management/commands/compile_sass.py
deleted file mode 100644
index fbfdd2f222a4..000000000000
--- a/openedx/core/djangoapps/theming/management/commands/compile_sass.py
+++ /dev/null
@@ -1,112 +0,0 @@
-"""
-Management command for compiling sass.
-
-DEPRECATED in favor of `npm run compile-sass`.
-"""
-import shlex
-
-from django.core.management import BaseCommand
-from django.conf import settings
-
-from pavelib.assets import run_deprecated_command_wrapper
-
-
-class Command(BaseCommand):
-    """
-    Compile theme sass and collect theme assets.
-    """
-
-    help = "DEPRECATED. Use 'npm run compile-sass' instead."
-
-    # NOTE (CCB): This allows us to compile static assets in Docker containers without database access.
-    requires_system_checks = []
-
-    def add_arguments(self, parser):
-        """
-            Add arguments for compile_sass command.
-
-            Args:
-                parser (django.core.management.base.CommandParser): parsed for parsing command line arguments.
-        """
-        parser.add_argument(
-            'system', type=str, nargs='*', default=["lms", "cms"],
-            help="lms or studio",
-        )
-
-        # Named (optional) arguments
-        parser.add_argument(
-            '--theme-dirs',
-            dest='theme_dirs',
-            type=str,
-            nargs='+',
-            default=None,
-            help="List of dirs where given themes would be looked.",
-        )
-
-        parser.add_argument(
-            '--themes',
-            type=str,
-            nargs='+',
-            default=["all"],
-            help="List of themes whose sass need to compiled. Or 'no'/'all' to compile for no/all themes.",
-        )
-
-        # Named (optional) arguments
-        parser.add_argument(
-            '--force',
-            action='store_true',
-            default=False,
-            help="DEPRECATED. Full recompilation is now always forced.",
-        )
-        parser.add_argument(
-            '--debug',
-            action='store_true',
-            default=False,
-            help="Disable Sass compression",
-        )
-
-    def handle(self, *args, **options):
-        """
-        Handle compile_sass command.
-        """
-        systems = set(
-            {"lms": "lms", "cms": "cms", "studio": "cms"}[sys]
-            for sys in options.get("system", ["lms", "cms"])
-        )
-        theme_dirs = options.get("theme_dirs") or settings.COMPREHENSIVE_THEME_DIRS or []
-        themes_option = options.get("themes") or []  # '[]' means 'all'
-        if not settings.ENABLE_COMPREHENSIVE_THEMING:
-            compile_themes = False
-            themes = []
-        elif "no" in themes_option:
-            compile_themes = False
-            themes = []
-        elif "all" in themes_option:
-            compile_themes = True
-            themes = []
-        else:
-            compile_themes = True
-            themes = themes_option
-        run_deprecated_command_wrapper(
-            old_command="./manage.py [lms|cms] compile_sass",
-            ignored_old_flags=list(set(["force"]) & set(options)),
-            new_command=shlex.join([
-                "npm",
-                "run",
-                ("compile-sass-dev" if options.get("debug") else "compile-sass"),
-                "--",
-                *(["--skip-lms"] if "lms" not in systems else []),
-                *(["--skip-cms"] if "cms" not in systems else []),
-                *(["--skip-themes"] if not compile_themes else []),
-                *(
-                    arg
-                    for theme_dir in theme_dirs
-                    for arg in ["--theme-dir", str(theme_dir)]
-                ),
-                *(
-                    arg
-                    for theme in themes
-                    for arg in ["--theme", theme]
-                ),
-            ]),
-        )
diff --git a/openedx/core/djangoapps/user_api/accounts/api.py b/openedx/core/djangoapps/user_api/accounts/api.py
index 6e7a21118852..6cc466ba0038 100644
--- a/openedx/core/djangoapps/user_api/accounts/api.py
+++ b/openedx/core/djangoapps/user_api/accounts/api.py
@@ -3,7 +3,6 @@
 Programmatic integration point for User API Accounts sub-application
 """
 
-
 import datetime
 import re
 
@@ -152,6 +151,12 @@ def update_account_settings(requesting_user, update, username=None):
 
     _validate_email_change(user, update, field_errors)
     _validate_secondary_email(user, update, field_errors)
+    if update.get('country', '') in settings.DISABLED_COUNTRIES:
+        field_errors['country'] = {
+            'developer_message': 'Country is disabled for registration',
+            'user_message': 'This country cannot be selected for user registration'
+        }
+
     old_name = _validate_name_change(user_profile, update, field_errors)
     old_language_proficiencies = _get_old_language_proficiencies_if_updating(user_profile, update)
 
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 81a3158eb5bb..5123c4cf41c2 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
@@ -3,7 +3,6 @@
 Most of the functionality is covered in test_views.py.
 """
 
-
 import datetime
 import itertools
 import unicodedata
@@ -16,6 +15,7 @@
 from django.http import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.test.utils import override_settings
 from django.urls import reverse
 from pytz import UTC
 from social_django.models import UserSocialAuth
@@ -82,7 +82,8 @@ def create_account(self, username, password, email):
 
 @skip_unless_lms
 @ddt.ddt
-@patch('common.djangoapps.student.views.management.render_to_response', Mock(side_effect=mock_render_to_response, autospec=True))  # lint-amnesty, pylint: disable=line-too-long
+@patch('common.djangoapps.student.views.management.render_to_response',
+       Mock(side_effect=mock_render_to_response, autospec=True))  # lint-amnesty, pylint: disable=line-too-long
 class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAccountMixin, RetirementTestCase):
     """
     These tests specifically cover the parts of the API methods that are not covered by test_views.py.
@@ -205,7 +206,7 @@ def test_add_social_links(self):
 
         account_settings = get_account_settings(self.default_request)[0]
         assert account_settings['social_links'] == \
-            sorted((original_social_links + extra_social_links), key=(lambda s: s['platform']))
+               sorted((original_social_links + extra_social_links), key=(lambda s: s['platform']))
 
     def test_replace_social_links(self):
         original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
@@ -306,7 +307,7 @@ def test_update_validation_error_for_enterprise(
                 with pytest.raises(AccountValidationError) as validation_error:
                     update_account_settings(self.user, update_data)
                     field_errors = validation_error.value.field_errors
-                    assert 'This field is not editable via this API' ==\
+                    assert 'This field is not editable via this API' == \
                            field_errors[field_name_value[0]]['developer_message']
             else:
                 update_account_settings(self.user, update_data)
@@ -424,8 +425,8 @@ def test_name_update_does_not_require_idv(self, has_passable_cert, enrolled_in_v
         """
         Test that the user can change their name if change does not require IDV.
         """
-        with patch('openedx.core.djangoapps.user_api.accounts.api.get_certificates_for_user') as mock_get_certs,\
-             patch('openedx.core.djangoapps.user_api.accounts.api.get_verified_enrollments') as \
+        with patch('openedx.core.djangoapps.user_api.accounts.api.get_certificates_for_user') as mock_get_certs, \
+            patch('openedx.core.djangoapps.user_api.accounts.api.get_verified_enrollments') as \
                 mock_get_verified_enrollments:
             mock_get_certs.return_value = (
                 [{'status': CertificateStatuses.downloadable}] if
@@ -439,7 +440,8 @@ def test_name_update_does_not_require_idv(self, has_passable_cert, enrolled_in_v
         assert account_settings['name'] == 'New Name'
 
     @patch('django.core.mail.EmailMultiAlternatives.send')
-    @patch('common.djangoapps.student.views.management.render_to_string', Mock(side_effect=mock_render_to_string, autospec=True))  # lint-amnesty, pylint: disable=line-too-long
+    @patch('common.djangoapps.student.views.management.render_to_string',
+           Mock(side_effect=mock_render_to_string, autospec=True))
     def test_update_sending_email_fails(self, send_mail):
         """Test what happens if all validation checks pass, but sending the email for email change fails."""
         send_mail.side_effect = [Exception, None]
@@ -514,6 +516,7 @@ def test_language_proficiency_eventing(self):
         """
         Test that eventing of language proficiencies, which happens update_account_settings method, behaves correctly.
         """
+
         def verify_event_emitted(new_value, old_value):
             """
             Confirm that the user setting event was properly emitted
@@ -571,6 +574,20 @@ def test_change_country_removes_state(self):
         assert account_settings['country'] is None
         assert account_settings['state'] is None
 
+    @override_settings(DISABLED_COUNTRIES=['KP'])
+    def test_change_to_disabled_country(self):
+        """
+        Test that changing the country to a disabled country is not allowed
+        """
+        # First set the country and state
+        update_account_settings(self.user, {"country": UserProfile.COUNTRY_WITH_STATES, "state": "MA"})
+        account_settings = get_account_settings(self.default_request)[0]
+        assert account_settings['country'] == UserProfile.COUNTRY_WITH_STATES
+        assert account_settings['state'] == 'MA'
+
+        with self.assertRaises(AccountValidationError):
+            update_account_settings(self.user, {"country": "KP"})
+
     def test_get_name_validation_error_too_long(self):
         """
         Test validation error when the name is too long.
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py
index 874497664d9d..badee6e87554 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py
@@ -9,7 +9,7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.urls import reverse
-from edx_rest_api_client import exceptions
+from requests import exceptions
 
 from edx_toggles.toggles.testutils import override_waffle_flag
 from lms.djangoapps.commerce.models import CommerceConfiguration
@@ -210,7 +210,7 @@ def test_commerce_order_detail(self):
             assert order_detail[i] == expected
 
     def test_commerce_order_detail_exception(self):
-        with mock_get_orders(exception=exceptions.HttpNotFoundError):
+        with mock_get_orders(exception=exceptions.HTTPError):
             order_detail = get_user_orders(self.user)
 
         assert not order_detail
diff --git a/openedx/core/djangoapps/user_api/accounts/utils.py b/openedx/core/djangoapps/user_api/accounts/utils.py
index 3cc03c02ed5d..826dbd42cd13 100644
--- a/openedx/core/djangoapps/user_api/accounts/utils.py
+++ b/openedx/core/djangoapps/user_api/accounts/utils.py
@@ -51,11 +51,11 @@ def format_social_link(platform_name, new_social_link):
     """
     Given a user's social link, returns a safe absolute url for the social link.
 
-    Returns the following based on the provided new_social_link:
-    1) Given an empty string, returns ''
-    1) Given a valid username, return 'https://www.[platform_name_base][username]'
-    2) Given a valid URL, return 'https://www.[platform_name_base][username]'
-    3) Given anything unparseable, returns None
+    Returns:
+    - An empty string if `new_social_link` is empty.
+    - A formatted URL if `new_social_link` is a username.
+    - Returns `new_social_link` if it is a valid URL.
+    - None for unparseable inputs.
     """
     # Blank social links should return '' or None as was passed in.
     if not new_social_link:
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/__init__.py b/openedx/core/djangoapps/user_api/learner_skill_levels/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/api.py b/openedx/core/djangoapps/user_api/learner_skill_levels/api.py
deleted file mode 100644
index ea1714cb6a36..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/api.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""
-APIs for learner skill levels.
-"""
-from .utils import get_skills_score, calculate_user_skill_score, generate_skill_score_mapping
-
-
-def get_learner_skill_levels(user, top_categories):
-    """
-    Evaluates learner's skill levels in the given job category. Only considers skills for the categories
-    and not their sub-categories.
-
-    Params:
-        user: user for each score is being calculated.
-        top_categories (List, string): A list of fields (as strings) of job categories and their skills.
-    Returns:
-        top_categories: Categories with scores appended to skills.
-    """
-
-    # get a skill to score mapping for every course user has passed
-    skill_score_mapping = generate_skill_score_mapping(user)
-    for skill_category in top_categories:
-        category_skills = skill_category['skills']
-        get_skills_score(category_skills, skill_score_mapping)
-        skill_category['user_score'] = calculate_user_skill_score(category_skills)
-        skill_category['edx_average_score'] = None
-        sub_categories = skill_category['skills_subcategories']
-        for sub_category in sub_categories:
-            subcategory_skills = sub_category['skills']
-            get_skills_score(subcategory_skills, skill_score_mapping)
-
-    return top_categories
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/constants.py b/openedx/core/djangoapps/user_api/learner_skill_levels/constants.py
deleted file mode 100644
index 225dc1faba14..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/constants.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-Constants for learner skill levels app.
-"""
-LEVEL_TYPE_SCORE_MAPPING = {
-    'Introductory': 1,
-    'Intermediate': 2,
-    'Advanced': 3
-}
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/__init__.py b/openedx/core/djangoapps/user_api/learner_skill_levels/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/test_utils.py b/openedx/core/djangoapps/user_api/learner_skill_levels/tests/test_utils.py
deleted file mode 100644
index fa90feb3c309..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/test_utils.py
+++ /dev/null
@@ -1,219 +0,0 @@
-""" Unit tests for Learner Skill Levels utilities. """
-
-import ddt
-from collections import defaultdict
-from unittest import mock
-
-from rest_framework.test import APIClient
-
-from common.djangoapps.student.tests.factories import UserFactory
-
-from openedx.core.djangoapps.catalog.tests.mixins import CatalogIntegrationMixin
-from openedx.core.djangoapps.user_api.learner_skill_levels.utils import (
-    calculate_user_skill_score,
-    generate_skill_score_mapping,
-    get_base_url,
-    get_job_holder_usernames,
-    get_skills_score,
-    get_top_skill_categories_for_job,
-    update_category_user_scores_map,
-    update_edx_average_score,
-)
-from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
-
-from .testutils import (
-    DUMMY_CATEGORIES_RESPONSE,
-    DUMMY_CATEGORIES_WITH_SCORES,
-    DUMMY_USERNAMES_RESPONSE,
-    DUMMY_COURSE_DATA_RESPONSE,
-    DUMMY_USER_SCORES_MAP,
-)
-
-
-@ddt.ddt
-class LearnerSkillLevelsUtilsTests(SharedModuleStoreTestCase, CatalogIntegrationMixin):
-    """
-    Test LearnerSkillLevel utilities.
-    """
-    SERVICE_USERNAME = 'catalog_service_username'
-
-    def setUp(self):
-        """
-        Unit tests setup.
-        """
-        super().setUp()
-
-        self.client = APIClient()
-        self.service_user = UserFactory(username=self.SERVICE_USERNAME)
-        self.catalog_integration = self.create_catalog_integration()
-
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_course_run_ids')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_course_run_data')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_course_data')
-    def test_generate_skill_score_mapping(
-        self,
-        mock_get_course_data,
-        mock_get_course_run_data,
-        mock_get_course_run_ids,
-    ):
-        """
-        Test that skill-score mapping is returned in correct format.
-        """
-        user = UserFactory(username='edX')
-        mock_get_course_run_ids.return_value = ['course-v1:AWS+OTP-AWSD12']
-        mock_get_course_run_data.return_value = {'course': 'AWS+OTP'}
-        mock_get_course_data.return_value = DUMMY_COURSE_DATA_RESPONSE
-        result = generate_skill_score_mapping(user)
-        expected_response = {"python": 3, "MongoDB": 3, "Data Science": 3}
-        assert result == expected_response
-
-    @ddt.data(
-        ([], 0.0),
-        (
-            [
-                {"id": 1, "name": "Financial Management", "score": None},
-                {"id": 2, "name": "Fintech", "score": None},
-            ], 0.0
-        ),
-        (
-            [
-                {"id": 1, "name": "Financial Management", "score": None},
-                {"id": 2, "name": "Fintech", "score": None},
-            ], 0.0
-        ),
-        (
-            [
-                {"id": 1, "name": "Financial Management", "score": 3},
-                {"id": 2, "name": "Fintech", "score": 2},
-            ], 0.8
-        ),
-    )
-    @ddt.unpack
-    def test_calculate_user_skill_score(self, skills_with_score, expected):
-        """
-        Test that skill-score mapping is returned in correct format.
-        """
-
-        result = calculate_user_skill_score(skills_with_score)
-        assert result == expected
-
-    @ddt.data(
-        ([], {"Financial Management": 1, "Fintech": 3}, []),
-        (
-            [
-                {"id": 1, "name": "Financial Management"},
-                {"id": 2, "name": "Fintech"},
-            ],
-            {
-                "Financial Management": 1,
-                "Fintech": 3
-            },
-            [
-                {"id": 1, "name": "Financial Management", "score": 1},
-                {"id": 2, "name": "Fintech", "score": 3},
-            ],
-        ),
-        (
-            [
-                {"id": 1, "name": "Financial Management"},
-                {"id": 2, "name": "Fintech"},
-            ],
-            {},
-            [
-                {"id": 1, "name": "Financial Management", "score": None},
-                {"id": 2, "name": "Fintech", "score": None},
-            ],
-        ),
-        (
-            [
-                {"id": 1, "name": "Financial Management"},
-                {"id": 2, "name": "Fintech"},
-            ],
-            {
-                "Python": 1,
-                "AI": 3
-            },
-            [
-                {"id": 1, "name": "Financial Management", "score": None},
-                {"id": 2, "name": "Fintech", "score": None},
-            ],
-        ),
-    )
-    @ddt.unpack
-    def test_get_skills_score(self, skills, learner_skill_score, expected):
-        """
-        Test that skill-score mapping is returned in correct format.
-        """
-        get_skills_score(skills, learner_skill_score)
-        assert skills == expected
-
-    def test_update_category_user_scores_map(self):
-        """
-        Test that skill-score mapping is returned in correct format.
-        """
-        category_user_scores_map = defaultdict(list)
-        update_category_user_scores_map(DUMMY_CATEGORIES_WITH_SCORES["skill_categories"], category_user_scores_map)
-        expected = {"Information Technology": [0.8], "Finance": [0.3]}
-        assert category_user_scores_map == expected
-
-    def test_update_edx_average_score(self):
-        """
-        Test that skill-score mapping is returned in correct format.
-        """
-        update_edx_average_score(DUMMY_CATEGORIES_WITH_SCORES["skill_categories"], DUMMY_USER_SCORES_MAP)
-        assert DUMMY_CATEGORIES_WITH_SCORES["skill_categories"][0]["edx_average_score"] == 0.4
-        assert DUMMY_CATEGORIES_WITH_SCORES["skill_categories"][1]["edx_average_score"] == 0.5
-
-    @ddt.data(
-        ("http://localhost:18000/api/", "http://localhost:18000"),
-        ("http://localhost:18000/", "http://localhost:18000"),
-    )
-    @ddt.unpack
-    def test_get_base_url(self, source_url, expected):
-        """
-        Test that base url is returned correctly.
-        """
-        actual = get_base_url(source_url)
-        assert actual == expected
-
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_catalog_api_client')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_catalog_api_base_url')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_api_data')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.check_catalog_integration_and_get_user')
-    def test_get_top_skill_categories_for_job(
-        self,
-        mock_check_catalog_integration_and_get_user,
-        mock_get_api_data,
-        mock_get_catalog_api_base_url,
-        mock_get_catalog_api_client
-    ):
-        """
-        Test that get_top_skill_categories_for_job returns jobs categories.
-        """
-        mock_check_catalog_integration_and_get_user.return_value = self.service_user, self.catalog_integration
-        mock_get_api_data.return_value = DUMMY_CATEGORIES_RESPONSE
-        mock_get_catalog_api_base_url.return_value = 'localhost:18381/api'
-        mock_get_catalog_api_client.return_value = self.client
-        result = get_top_skill_categories_for_job(1)
-        assert result == DUMMY_CATEGORIES_RESPONSE
-
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_catalog_api_client')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_catalog_api_base_url')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.get_api_data')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.utils.check_catalog_integration_and_get_user')
-    def test_get_job_holder_usernames(
-        self,
-        mock_check_catalog_integration_and_get_user,
-        mock_get_api_data,
-        mock_get_catalog_api_base_url,
-        mock_get_catalog_api_client
-    ):
-        """
-        Test that test_get_job_holder_usernames returns usernames.
-        """
-        mock_check_catalog_integration_and_get_user.return_value = self.service_user, self.catalog_integration
-        mock_get_api_data.return_value = DUMMY_USERNAMES_RESPONSE
-        mock_get_catalog_api_base_url.return_value = 'localhost:18381/api'
-        mock_get_catalog_api_client.return_value = self.client
-        result = get_job_holder_usernames(1)
-        assert result == DUMMY_USERNAMES_RESPONSE
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/test_views.py b/openedx/core/djangoapps/user_api/learner_skill_levels/tests/test_views.py
deleted file mode 100644
index 369f32787f90..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/test_views.py
+++ /dev/null
@@ -1,119 +0,0 @@
-"""
-Test cases for LearnerSkillLevelsView.
-"""
-
-from unittest import mock
-
-from django.urls import reverse
-from rest_framework.test import APIClient, APITestCase
-
-from common.djangoapps.student.tests.factories import TEST_PASSWORD, UserFactory
-
-from .testutils import DUMMY_CATEGORIES_RESPONSE, DUMMY_USERNAMES_RESPONSE
-
-
-class LearnerSkillLevelsViewTests(APITestCase):
-    """
-    The tests for LearnerSkillLevelsView.
-    """
-
-    def setUp(self):
-        super().setUp()
-
-        self.client = APIClient()
-        self.user = UserFactory.create(password=TEST_PASSWORD)
-        self.url = reverse('learner_skill_level', kwargs={'job_id': '1'})
-
-        for username in DUMMY_USERNAMES_RESPONSE['usernames']:
-            UserFactory(username=username)
-
-    def test_unauthorized_get_endpoint(self):
-        """
-        Test that endpoint is only accessible to authorized user.
-        """
-        response = self.client.get(self.url)
-        assert response.status_code == 401
-
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.views.get_top_skill_categories_for_job')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.views.get_job_holder_usernames')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.api.generate_skill_score_mapping')
-    def test_get_endpoint(
-        self,
-        mock_generate_skill_score_mapping,
-        mock_get_job_holder_usernames,
-        mock_get_top_skill_categories_for_job
-    ):
-        """
-        Test that response if returned with correct scores appended.
-        """
-        mock_get_top_skill_categories_for_job.return_value = DUMMY_CATEGORIES_RESPONSE
-        mock_get_job_holder_usernames.return_value = DUMMY_USERNAMES_RESPONSE
-        mock_generate_skill_score_mapping.return_value = {'Technology Roadmap': 2, 'Python': 3}
-
-        self.client.login(username=self.user.username, password=TEST_PASSWORD)
-        response = self.client.get(self.url)
-        assert response.status_code == 200
-        # check if the response is mutated and scores are appended for skills
-        # for when some skills are learned by user in a category, check if user_score and avg score is appended
-        assert response.data['skill_categories'][0]['user_score'] == 0.8
-        assert response.data['skill_categories'][0]['edx_average_score'] == 0.8
-
-        # for when no skill is learned by user in a category, check if user_score and avg score is appended
-        assert response.data['skill_categories'][1]['user_score'] == 0.0
-        assert response.data['skill_categories'][1]['edx_average_score'] == 0.0
-
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.views.get_top_skill_categories_for_job')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.views.get_job_holder_usernames')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.api.generate_skill_score_mapping')
-    def test_get_with_less_than_5_users(
-        self,
-        mock_generate_skill_score_mapping,
-        mock_get_job_holder_usernames,
-        mock_get_top_skill_categories_for_job
-    ):
-        """
-        Test that average value is None when users are less than 5.
-        """
-        mock_get_top_skill_categories_for_job.return_value = DUMMY_CATEGORIES_RESPONSE
-        mock_get_job_holder_usernames.return_value = {"usernames": ['user1', 'user2']}
-        mock_generate_skill_score_mapping.return_value = {'Technology Roadmap': 2, 'Python': 3}
-
-        self.client.login(username=self.user.username, password=TEST_PASSWORD)
-        response = self.client.get(self.url)
-        assert response.status_code == 200
-        # check if the response is mutated and scores are appended for skills
-        # for when some skills are learned by user in a category, check if user_score and avg score is appended
-        assert response.data['skill_categories'][0]['user_score'] == 0.8
-        assert response.data['skill_categories'][0]['edx_average_score'] is None
-
-        # for when no skill is learned by user in a category, check if user_score and avg score is appended
-        assert response.data['skill_categories'][1]['user_score'] == 0.0
-        assert response.data['skill_categories'][1]['edx_average_score'] is None
-
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.views.get_top_skill_categories_for_job')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.views.get_job_holder_usernames')
-    @mock.patch('openedx.core.djangoapps.user_api.learner_skill_levels.api.generate_skill_score_mapping')
-    def test_get_no_skills_learned(
-        self,
-        mock_generate_skill_score_mapping,
-        mock_get_job_holder_usernames,
-        mock_get_top_skill_categories_for_job
-    ):
-        """
-        Test that score is 0.0 when no skills are learned by a user.
-        """
-        mock_get_top_skill_categories_for_job.return_value = DUMMY_CATEGORIES_RESPONSE
-        mock_get_job_holder_usernames.return_value = DUMMY_USERNAMES_RESPONSE
-        mock_generate_skill_score_mapping.return_value = {}
-
-        self.client.login(username=self.user.username, password=TEST_PASSWORD)
-        response = self.client.get(self.url)
-        assert response.status_code == 200
-        # check if the response is mutated and scores are appended for skills
-        # for when some skills are learned by user in a category, check if user_score and avg score is appended
-        assert response.data['skill_categories'][0]['user_score'] == 0.0
-        assert response.data['skill_categories'][0]['edx_average_score'] == 0.0
-
-        # for when no skill is learned by user in a category, check if user_score and avg score is appended
-        assert response.data['skill_categories'][1]['user_score'] == 0.0
-        assert response.data['skill_categories'][1]['edx_average_score'] == 0.0
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/testutils.py b/openedx/core/djangoapps/user_api/learner_skill_levels/tests/testutils.py
deleted file mode 100644
index 9be19ed15a20..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/tests/testutils.py
+++ /dev/null
@@ -1,110 +0,0 @@
-"""
-Utilities for unit tests of learner skill levels.
-"""
-
-DUMMY_CATEGORIES_RESPONSE = {
-    "job": "Digital Product Manager",
-    "skill_categories": [
-        {
-            "name": "Information Technology",
-            "id": 1,
-            "skills": [
-                {"id": 3, "name": "Technology Roadmap"},
-                {"id": 12, "name": "Python"},
-                {"id": 2, "name": "MongoDB"}
-            ],
-            "skills_subcategories": [
-                {
-                    "id": 1,
-                    "name": "Databases",
-                    "skills": [
-                        {"id": 1, "name": "Query Languages"},
-                        {"id": 2, "name": "MongoDB"},
-                    ]
-                },
-                {
-                    "id": 2,
-                    "name": "IT Management",
-                    "skills": [
-                        {"id": 3, "name": "Technology Roadmap"},
-                    ]
-                },
-            ]
-        },
-        {
-            "name": "Finance",
-            "id": 2,
-            "skills": [
-                {"id": 4, "name": "Accounting"},
-                {"id": 5, "name": "TQM"},
-            ],
-            "skills_subcategories": [
-                {
-                    "id": 3,
-                    "name": "Auditing",
-                    "skills": [
-                        {"id": 4, "name": "Accounting"},
-                        {"id": 5, "name": "TQM"},
-                    ]
-                },
-                {
-                    "id": 4,
-                    "name": "Management",
-                    "skills": [
-                        {"id": 6, "name": "Financial Management"},
-                    ]
-                },
-            ]
-        },
-    ]
-}
-
-DUMMY_CATEGORIES_WITH_SCORES = {
-    "job": "Digital Product Manager",
-    "skill_categories": [
-        {
-            "name": "Information Technology",
-            "id": 1,
-            "skills": [
-                {"id": 3, "name": "Technology Roadmap", "score": 1},
-                {"id": 12, "name": "Python", "score": 2},
-                {"id": 2, "name": "MongoDB", "score": 3}
-            ],
-            "user_score": 0.8,
-        },
-        {
-            "name": "Finance",
-            "id": 2,
-            "skills": [
-                {"id": 1, "name": "Query Languages", "score": 1},
-                {"id": 4, "name": "System Design", "score": 2},
-            ],
-            "user_score": 0.3,
-        },
-    ]
-}
-
-DUMMY_USER_SCORES_MAP = {
-    "Information Technology": [0.1, 0.3, 0.5, 0.7],
-    "Finance": [0.2, 0.4, 0.6, 0.8]
-
-}
-
-DUMMY_USERNAMES_RESPONSE = {
-    "usernames": [
-        'test_user_1',
-        'test_user_2',
-        'test_user_3',
-        'test_user_4',
-        'test_user_5',
-        'test_user_6',
-    ]
-}
-
-DUMMY_COURSE_DATA_RESPONSE = {
-    "key": "AWS+OTP",
-    "uuid": "fe1a9ad4-a452-45cd-80e5-9babd3d43f96",
-    "title": "Demonstration Course",
-    "level_type": 'Advanced',
-    "skill_names": ["python", "MongoDB", "Data Science"]
-}
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/utils.py b/openedx/core/djangoapps/user_api/learner_skill_levels/utils.py
deleted file mode 100644
index 22f8745e0828..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/utils.py
+++ /dev/null
@@ -1,182 +0,0 @@
-"""
-Utilities for learner_skill_levels.
-"""
-from logging import getLogger
-from urllib.parse import urlparse
-
-from lms.djangoapps.grades.models import PersistentCourseGrade  # lint-amnesty, pylint: disable=unused-import
-from openedx.core.djangoapps.catalog.utils import (
-    get_catalog_api_client,
-    check_catalog_integration_and_get_user,
-    get_catalog_api_base_url,
-
-)
-from openedx.core.djangoapps.catalog.utils import get_course_data, get_course_run_data
-from openedx.core.lib.edx_api_utils import get_api_data
-
-from .constants import LEVEL_TYPE_SCORE_MAPPING
-
-LOGGER = getLogger(__name__)  # pylint: disable=invalid-name
-
-
-def get_course_run_ids(user):
-    """
-    Returns all the course run ids of the courses that user has passed from PersistentCourseGrade model.
-    """
-    return list(
-        PersistentCourseGrade.objects.filter(
-            user_id=user.id,
-            passed_timestamp__isnull=False
-        ).values_list('course_id', flat=True)
-    )
-
-
-def generate_skill_score_mapping(user):
-    """
-    Generates a skill to score mapping for all the skills user has learner so far in passed courses.
-    """
-    # get course_run_ids of all courses the user has passed
-    course_run_ids = get_course_run_ids(user)
-
-    skill_score_mapping = {}
-    for course_run_id in course_run_ids:
-        # fetch course details from course run id to get course key
-        course_run_data = get_course_run_data(course_run_id, ['course'])
-        if course_run_data:
-            # fetch course details to get level type and skills
-            course_data = get_course_data(course_run_data['course'], ['skill_names', 'level_type'])
-            skill_names = course_data['skill_names']
-            level_type = course_data['level_type']
-
-            # if a level_type is None for a course, we should skip that course.
-            if level_type:
-                score = LEVEL_TYPE_SCORE_MAPPING[level_type.capitalize()]
-                for skill in skill_names:
-                    if skill in skill_score_mapping:
-                        # assign scores b/w 1-3 based on level type
-                        # assign the larger score if skill is repeated in 2 courses
-                        skill_score_mapping[skill] = max(score, skill_score_mapping[skill])
-                    else:
-                        skill_score_mapping.update({skill: score})
-        LOGGER.info(
-            "Could not find course_key for course run id [%s].", course_run_id
-        )
-    return skill_score_mapping
-
-
-def calculate_user_skill_score(skills_with_score):
-    """
-    Calculates user skill score to see where the user falls in a certain job category.
-    """
-    # generate a dict with skill name as key and score as value
-    # take only those skills that user has learned.
-
-    if not skills_with_score:
-        return 0.0
-
-    skills_score_dict = {
-        item['name']: item['score']
-        for item in skills_with_score
-        if item['score'] is not None
-    }
-    sum_of_skills = sum(skills_score_dict.values())
-    skills_count = len(skills_score_dict)
-    if not skills_count:
-        return 0.0
-    # sum of skills score in the category/ 3*no. of skills in category
-    return round(sum_of_skills / (3 * skills_count), 1)
-
-
-def get_skills_score(skills, learner_skill_score):
-    """
-    Takes each skill item in list and appends its score to it.
-    For a skill that doesn't exist in learner's skills set, appends None as score.
-    """
-    for skill in skills:
-        skill['score'] = learner_skill_score.get(skill['name'])
-
-
-def update_category_user_scores_map(categories, category_user_scores_map):
-    """
-    Appends user's scores for each category in the dict.
-    """
-    for category in categories:
-        category_user_scores_map[category['name']].append(category['user_score'])
-
-
-def update_edx_average_score(categories, user_score_mapping):
-    """
-    Calculates average score for each category and appends it.
-    """
-    for category in categories:
-        category_scores = user_score_mapping[category['name']]
-        sum_score = sum(category_scores, 0.0)
-        average_score = round(sum_score / len(category_scores), 1)
-        category['edx_average_score'] = average_score
-
-
-def get_base_url(url):
-    """
-    Returns the base url for any given url.
-    """
-    if url:
-        parsed = urlparse(url)
-        return f'{parsed.scheme}://{parsed.netloc}'
-
-
-def get_top_skill_categories_for_job(job_id):
-    """
-        Retrieve top categories for the job with the given job_id.
-
-        Arguments:
-            job_id (int): id of the job about which we are retrieving information.
-
-        Returns:
-            dict with top 5 categories of specified job.
-    """
-    user, catalog_integration = check_catalog_integration_and_get_user(error_message_field='Skill Categories')
-    if user:
-        api_client = get_catalog_api_client(user)
-        root_url = get_catalog_api_base_url()
-        base_api_url = get_base_url(root_url)
-        resource = '/taxonomy/api/v1/job-top-subcategories'
-        cache_key = f'{catalog_integration.CACHE_KEY}.job-categories.{job_id}'
-        data = get_api_data(
-            catalog_integration,
-            resource=resource,
-            resource_id=job_id,
-            api_client=api_client,
-            base_api_url=base_api_url,
-            cache_key=cache_key if catalog_integration.is_cache_enabled else None,
-        )
-        if data:
-            return data
-
-
-def get_job_holder_usernames(job_id):
-    """
-        Retrieve usernames of users who have the same job as given job_id.
-
-        Arguments:
-            job_id (int): id of the job for which we are retrieving usernames.
-
-        Returns:
-            list with oldest 100 users' usernames that exist in our system.
-    """
-    user, catalog_integration = check_catalog_integration_and_get_user(error_message_field='Job Holder Usernames')
-    if user:
-        api_client = get_catalog_api_client(user)
-        root_url = get_catalog_api_base_url()
-        base_api_url = get_base_url(root_url)
-        resource = '/taxonomy/api/v1/job-holder-usernames'
-        cache_key = f'{catalog_integration.CACHE_KEY}.job-holder-usernames.{job_id}'
-        data = get_api_data(
-            catalog_integration,
-            resource=resource,
-            resource_id=job_id,
-            api_client=api_client,
-            base_api_url=base_api_url,
-            cache_key=cache_key if catalog_integration.is_cache_enabled else None,
-        )
-        if data:
-            return data
diff --git a/openedx/core/djangoapps/user_api/learner_skill_levels/views.py b/openedx/core/djangoapps/user_api/learner_skill_levels/views.py
deleted file mode 100644
index 3fee78588bd4..000000000000
--- a/openedx/core/djangoapps/user_api/learner_skill_levels/views.py
+++ /dev/null
@@ -1,129 +0,0 @@
-"""
-Views for learner_skill_levels.
-"""
-from collections import defaultdict
-from copy import deepcopy
-
-from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
-from rest_framework import permissions, status
-from rest_framework.response import Response
-from rest_framework.views import APIView
-
-from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
-from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
-from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
-
-from .api import get_learner_skill_levels
-from .utils import get_top_skill_categories_for_job, get_job_holder_usernames, update_category_user_scores_map, \
-    update_edx_average_score
-
-
-class LearnerSkillLevelsView(APIView):
-    """
-        **Use Cases**
-
-            Returns top 5 job categories for the given job. Checks which skill the user has learned via courses
-            and assign scores to each skill in category. Also takes first 100 users in our system to calculate
-            average score for each category.
-
-        **Request format**
-
-            GET /api/user/v1/skill_level/{job_id}/
-
-        **Response Values for GET**
-
-            If the specified job_id doesn't exist, an HTTP
-            404 "Not Found" response is returned.
-
-            If a logged in user makes a request with an existing job, an HTTP 200
-            "OK" response is returned that contains a JSON string.
-
-        **Example Request**
-
-            GET /api/user/v1/skill_level/1/
-
-        **Example Response**
-
-            {
-                "job": "Digital Product Manager",
-                "skill_categories": [
-                    {
-                        "name": "Information Technology",
-                        "id": 1,
-                        "skills": [
-                            {"id": 2, "name": "Query Languages", "score": 1},
-                            {"id": 3, "name": "MongoDB", "score": 3},
-                        ]
-                        "user_score": 0.4, // request user's score
-                        "edx_average_score": 0.7,
-                        "skills_subcategories": [
-                            {
-                                "id": 1,
-                                "name": "Databases",
-                                "skills": [
-                                    {"id": 2, "name": "Query Languages", "score": 1},
-                                    {"id": 3, "name": "MongoDB", "score": None},
-                                ]
-                            },
-                            {
-                                "id": 2,
-                                "name": "IT Management",
-                                "skills": [
-                                    {"id": 1, "name": "Technology Roadmap", "score": 2},
-                                ]
-                            },
-                            // here remaining job related skills subcategories
-                        ]
-                    },
-
-                    // Here more 4 skill categories
-                ]
-            }
-    """
-    authentication_classes = (
-        JwtAuthentication,
-        BearerAuthenticationAllowInactiveUser,
-        SessionAuthenticationAllowInactiveUser
-    )
-    permission_classes = (permissions.IsAuthenticated, )
-
-    def get(self, request, job_id):
-        """
-        GET /api/user/v1/skill_level/{job_id}/
-        """
-        # get top categories for the given job
-        job_skill_categories = get_top_skill_categories_for_job(job_id)
-        if not job_skill_categories:
-            return Response(
-                status=status.HTTP_404_NOT_FOUND,
-                data={'message': "The job id doesn't exist, enter a valid job id."}
-            )
-
-        # assign scores for every skill request user has learned
-        top_categories = deepcopy(job_skill_categories['skill_categories'])
-        user_category_scores = get_learner_skill_levels(
-            user=request.user,
-            top_categories=top_categories,
-        )
-
-        # repeat the same logic for 100 job holder users in our system
-        job_holder_usernames = get_job_holder_usernames(job_id)
-        users = User.objects.filter(username__in=job_holder_usernames['usernames'])
-
-        # edx_avg_score should only be calculated if users count is greater than 5, else skip it.
-        if len(users) > 5:
-            # To save all the users' scores against every category to calculate average score
-            category_user_scores_map = defaultdict(list)
-
-            for user in users:
-                categories = deepcopy(job_skill_categories['skill_categories'])
-                categories_with_scores = get_learner_skill_levels(
-                    user=user,
-                    top_categories=categories,
-                )
-                update_category_user_scores_map(categories_with_scores, category_user_scores_map)
-
-            update_edx_average_score(user_category_scores, category_user_scores_map)
-
-        job_skill_categories['skill_categories'] = user_category_scores
-        return Response(job_skill_categories)
diff --git a/openedx/core/djangoapps/user_api/models.py b/openedx/core/djangoapps/user_api/models.py
index 6c1dd832a38d..d776dac8fe2a 100644
--- a/openedx/core/djangoapps/user_api/models.py
+++ b/openedx/core/djangoapps/user_api/models.py
@@ -426,6 +426,8 @@ def __str__(self):
 class BulkUserRetirementConfig(ConfigurationModel):
     """
     Configuration to store a csv file that will be used in retire_user management command.
+
+    .. no_pii:
     """
     # Timeout set to 0 so that the model does not read from cached config in case the config entry is deleted.
     cache_timeout = 0
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
index 981cc52dfd8f..75740cf5d2b6 100644
--- a/openedx/core/djangoapps/user_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -635,7 +635,7 @@ def _assert_time_zone_is_valid(self, time_zone_info):
         assert time_zone_info['description'] == get_display_time_zone(time_zone_name)
 
     # The time zones count may need to change each time we upgrade pytz
-    @ddt.data((ALL_TIME_ZONES_URI, 433),
+    @ddt.data((ALL_TIME_ZONES_URI, 432),
               (COUNTRY_TIME_ZONES_URI, 23))
     @ddt.unpack
     def test_get_basic(self, country_uri, expected_count):
diff --git a/openedx/core/djangoapps/user_api/urls.py b/openedx/core/djangoapps/user_api/urls.py
index e93e7119ecea..b4bf1b3b2bbe 100644
--- a/openedx/core/djangoapps/user_api/urls.py
+++ b/openedx/core/djangoapps/user_api/urls.py
@@ -19,14 +19,12 @@
     NameChangeView,
     UsernameReplacementView, CancelAccountRetirementStatusView
 )
-from .learner_skill_levels.views import LearnerSkillLevelsView
 from . import views as user_api_views
 from .models import UserPreference
 from .preferences.views import PreferencesDetailView, PreferencesView
 from .verification_api.views import (
     IDVerificationStatusView,
     IDVerificationStatusDetailsView,
-    IDVerificationSupportView,
 )
 
 ME = AccountViewSet.as_view({
@@ -147,11 +145,6 @@
         IDVerificationStatusDetailsView.as_view(),
         name='verification_details'
     ),
-    re_path(
-        r'^v1/accounts/verifications/(?P<attempt_id>[0-9]+)/$',
-        IDVerificationSupportView.as_view(),
-        name='verification_for_support'
-    ),
     re_path(
         fr'^v1/accounts/{settings.USERNAME_PATTERN}/retirement_status/$',
         RETIREMENT_RETRIEVE,
@@ -197,11 +190,6 @@
         PreferencesDetailView.as_view(),
         name='preferences_detail_api'
     ),
-    re_path(
-        r'^v1/skill_level/(?P<job_id>[0-9]+)/$',
-        LearnerSkillLevelsView.as_view(),
-        name="learner_skill_level"
-    ),
     # Moved from user_api/legacy_urls.py
     path('v1/', include(USER_API_ROUTER.urls)),
 
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 c585936e21ad..b8f51ef79a59 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
@@ -4,7 +4,6 @@
 import datetime
 import json
 
-import ddt
 import freezegun
 from django.conf import settings
 from django.test import TestCase
@@ -258,51 +257,3 @@ def test_multiple_verification_instances(self):
             },
         ]
         assert json.loads(response.content.decode('utf-8')) == expected
-
-
-@override_settings(VERIFY_STUDENT=VERIFY_STUDENT)
-@ddt.ddt
-class VerificationSupportViewTests(VerificationViewTestsMixinBase, TestCase):
-    """
-    Tests for the verification_for_support view
-    """
-    @property
-    def path(self):
-        return reverse('verification_for_support', kwargs={'attempt_id': self.photo_verification.id})
-
-    def get_expected_response(self, *args, **kwargs):
-        return {
-            'type': 'Software Secure',
-            'status': self.photo_verification.status,
-            'expiration_datetime': '{}Z'.format(kwargs.get('expected_expires').isoformat()),
-            'message': kwargs.get('error_msg'),
-            'updated_at': f'{self.CREATED_AT.isoformat()}Z',
-            'receipt_id': self.photo_verification.receipt_id,
-        }
-
-    @ddt.data(
-        ('accepted', ''),
-        ('denied', '[{"generalReasons": ["Name mismatch"]}]'),
-        ('submitted', ''),
-        ('must_retry', ''),
-    )
-    @ddt.unpack
-    def test_get_details(self, status, error_message):
-        self.photo_verification.status = status
-        self.photo_verification.error_msg = error_message
-        self.photo_verification.save()
-        self.client.login(username=self.staff.username, password=self.PASSWORD)
-        response = self.assert_verification_returned()
-        expected_expires = self.CREATED_AT + datetime.timedelta(settings.VERIFY_STUDENT['DAYS_GOOD_FOR'])
-        expected = self.get_expected_response(expected_expires=expected_expires, error_msg=error_message)
-        assert json.loads(response.content.decode('utf-8')) == expected
-
-    @ddt.data(
-        0,
-        234324,
-        'not_a_number',
-    )
-    def test_not_found(self, attempt_id):
-        not_found_path = self.path.replace(str(self.photo_verification.id), str(attempt_id))
-        response = self.client.get(not_found_path)
-        assert response.status_code == 404
diff --git a/openedx/core/djangoapps/user_api/verification_api/views.py b/openedx/core/djangoapps/user_api/verification_api/views.py
index 584479596c53..1ef159150cda 100644
--- a/openedx/core/djangoapps/user_api/verification_api/views.py
+++ b/openedx/core/djangoapps/user_api/verification_api/views.py
@@ -3,7 +3,6 @@
 from django.contrib.auth import get_user_model
 from django.http import Http404
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
-from edx_rest_framework_extensions.permissions import IsStaff
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.generics import ListAPIView
 from rest_framework.response import Response
@@ -61,21 +60,3 @@ def get_queryset(self):
             return sorted(verifications, key=lambda x: x.updated_at, reverse=True)
         except User.DoesNotExist:
             raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
-
-
-class IDVerificationSupportView(APIView):
-    """ IDVerification endpoint for support-tool"""
-    authentication_classes = (JwtAuthentication, BearerAuthentication, SessionAuthentication,)
-    permission_classes = (IsStaff,)
-
-    def get(self, request, **kwargs):
-        """
-        Get IDV attempt details by attempt_id. Only accessible by global staff.
-        """
-        attempt_id = kwargs.get('attempt_id')
-        verification_detail = IDVerificationService.get_verification_details_by_id(attempt_id)
-        if not verification_detail:
-            raise Http404
-        return Response(
-            IDVerificationDetailsSerializer(verification_detail).data
-        )
diff --git a/openedx/core/djangoapps/user_authn/config/waffle.py b/openedx/core/djangoapps/user_authn/config/waffle.py
index c34c81e1d063..3cbb0cb2e18b 100644
--- a/openedx/core/djangoapps/user_authn/config/waffle.py
+++ b/openedx/core/djangoapps/user_authn/config/waffle.py
@@ -2,7 +2,6 @@
 Waffle flags and switches for user authn.
 """
 
-
 from edx_toggles.toggles import WaffleSwitch
 
 _WAFFLE_NAMESPACE = 'user_authn'
diff --git a/openedx/core/djangoapps/user_authn/views/login.py b/openedx/core/djangoapps/user_authn/views/login.py
index 2ad3c0ff18a0..042ef90c9a40 100644
--- a/openedx/core/djangoapps/user_authn/views/login.py
+++ b/openedx/core/djangoapps/user_authn/views/login.py
@@ -23,11 +23,14 @@
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.http import require_http_methods
 from django_ratelimit.decorators import ratelimit
+from drf_yasg import openapi
+from drf_yasg.utils import swagger_auto_schema
 from edx_django_utils.monitoring import set_custom_attribute
 from eventtracking import tracker
 from openedx_events.learning.data import UserData, UserPersonalData
 from openedx_events.learning.signals import SESSION_LOGIN_COMPLETED
 from openedx_filters.learning.filters import StudentLoginRequested
+from rest_framework import status
 from rest_framework.views import APIView
 
 from common.djangoapps import third_party_auth
@@ -49,7 +52,7 @@
 from openedx.core.djangoapps.user_authn.tasks import check_pwned_password_and_send_track_event
 from openedx.core.djangoapps.user_authn.toggles import (
     is_require_third_party_auth_enabled,
-    should_redirect_to_authn_microfrontend
+    should_redirect_to_authn_microfrontend,
 )
 from openedx.core.djangoapps.user_authn.views.login_form import get_login_session_form
 from openedx.core.djangoapps.user_authn.views.password_reset import send_password_reset_email_for_user
@@ -62,7 +65,7 @@
 log = logging.getLogger("edx.student")
 AUDIT_LOG = logging.getLogger("audit")
 USER_MODEL = get_user_model()
-PASSWORD_RESET_INITIATED = 'edx.user.passwordreset.initiated'
+PASSWORD_RESET_INITIATED = "edx.user.passwordreset.initiated"
 
 
 def _do_third_party_auth(request):
@@ -70,9 +73,9 @@ def _do_third_party_auth(request):
     User is already authenticated via 3rd party, now try to find and return their associated Django user.
     """
     running_pipeline = pipeline.get(request)
-    username = running_pipeline['kwargs'].get('username')
-    backend_name = running_pipeline['backend']
-    third_party_uid = running_pipeline['kwargs']['uid']
+    username = running_pipeline["kwargs"].get("username")
+    backend_name = running_pipeline["backend"]
+    third_party_uid = running_pipeline["kwargs"]["uid"]
     requested_provider = provider.Registry.get_from_pipeline(running_pipeline)
     platform_name = configuration_helpers.get_value("platform_name", settings.PLATFORM_NAME)
 
@@ -81,26 +84,25 @@ def _do_third_party_auth(request):
     except USER_MODEL.DoesNotExist:
         AUDIT_LOG.info(
             "Login failed - user with username {username} has no social auth "
-            "with backend_name {backend_name}".format(
-                username=username, backend_name=backend_name)
+            "with backend_name {backend_name}".format(username=username, backend_name=backend_name)
         )
-        message = Text(_(
-            "You've successfully signed in to your {provider_name} account, "
-            "but this account isn't linked with your {platform_name} account yet. {blank_lines}"
-            "Use your {platform_name} username and password to sign in to {platform_name} below, "
-            "and then link your {platform_name} account with {provider_name} from your dashboard. {blank_lines}"
-            "If you don't have an account on {platform_name} yet, "
-            "click {register_label_strong} at the top of the page."
-        )).format(
-            blank_lines=HTML('<br/><br/>'),
+        message = Text(
+            _(
+                "You've successfully signed in to your {provider_name} account, "
+                "but this account isn't linked with your {platform_name} account yet. {blank_lines}"
+                "Use your {platform_name} username and password to sign in to {platform_name} below, "
+                "and then link your {platform_name} account with {provider_name} from your dashboard. {blank_lines}"
+                "If you don't have an account on {platform_name} yet, "
+                "click {register_label_strong} at the top of the page."
+            )
+        ).format(
+            blank_lines=HTML("<br/><br/>"),
             platform_name=platform_name,
             provider_name=requested_provider.name,
-            register_label_strong=HTML('<strong>{register_text}</strong>').format(
-                register_text=_('Register')
-            )
+            register_label_strong=HTML("<strong>{register_text}</strong>").format(register_text=_("Register")),
         )
 
-        raise AuthFailedError(message, error_code='third-party-auth-with-no-linked-account')  # lint-amnesty, pylint: disable=raise-missing-from
+        raise AuthFailedError(message, error_code="third-party-auth-with-no-linked-account")  # lint-amnesty, pylint: disable=raise-missing-from
 
 
 def _get_user_by_email(email):
@@ -128,14 +130,14 @@ def _get_user_by_email_or_username(request, api_version):
     Finds a user object in the database based on the given request, ignores all fields except for email and username.
     """
     is_api_v2 = api_version != API_V1
-    login_fields = ['email', 'password']
+    login_fields = ["email", "password"]
     if is_api_v2:
-        login_fields = ['email_or_username', 'password']
+        login_fields = ["email_or_username", "password"]
 
     if any(f not in request.POST.keys() for f in login_fields):
-        raise AuthFailedError(_('There was an error receiving your login information. Please email us.'))
+        raise AuthFailedError(_("There was an error receiving your login information. Please email us."))
 
-    email_or_username = request.POST.get('email', None) or request.POST.get('email_or_username', None)
+    email_or_username = request.POST.get("email", None) or request.POST.get("email_or_username", None)
     user = _get_user_by_email(email_or_username)
 
     if not user and is_api_v2:
@@ -143,7 +145,7 @@ def _get_user_by_email_or_username(request, api_version):
         user = _get_user_by_username(email_or_username)
 
     if not user:
-        digest = hashlib.shake_128(email_or_username.encode('utf-8')).hexdigest(16)
+        digest = hashlib.shake_128(email_or_username.encode("utf-8")).hexdigest(16)
         AUDIT_LOG.warning(f"Login failed - Unknown user email or username {digest}")
 
     return user
@@ -165,27 +167,30 @@ def _generate_locked_out_error_message():
     """
 
     locked_out_period_in_sec = settings.MAX_FAILED_LOGIN_ATTEMPTS_LOCKOUT_PERIOD_SECS
-    error_message = Text(_('To protect your account, it’s been temporarily '
-                           'locked. Try again in {locked_out_period} minutes.'
-                           '{li_start}To be on the safe side, you can reset your '
-                           'password {link_start}here{link_end} before you try again.')).format(
-                               link_start=HTML('<a http="#login" class="form-toggle" data-type="password-reset">'),
-                               link_end=HTML('</a>'),
-                               li_start=HTML('<li>'),
-                               li_end=HTML('</li>'),
-                               locked_out_period=int(locked_out_period_in_sec / 60))
+    error_message = Text(
+        _(
+            "To protect your account, it’s been temporarily "
+            "locked. Try again in {locked_out_period} minutes."
+            "{li_start}To be on the safe side, you can reset your "
+            "password {link_start}here{link_end} before you try again."
+        )
+    ).format(
+        link_start=HTML('<a http="#login" class="form-toggle" data-type="password-reset">'),
+        link_end=HTML("</a>"),
+        li_start=HTML("<li>"),
+        li_end=HTML("</li>"),
+        locked_out_period=int(locked_out_period_in_sec / 60),
+    )
     raise AuthFailedError(
         error_message,
-        error_code='account-locked-out',
-        context={
-            'locked_out_period': int(locked_out_period_in_sec / 60)
-        }
+        error_code="account-locked-out",
+        context={"locked_out_period": int(locked_out_period_in_sec / 60)},
     )
 
 
 def _enforce_password_policy_compliance(request, user):  # lint-amnesty, pylint: disable=missing-function-docstring
     try:
-        password_policy_compliance.enforce_compliance_on_login(user, request.POST.get('password'))
+        password_policy_compliance.enforce_compliance_on_login(user, request.POST.get("password"))
     except password_policy_compliance.NonCompliantPasswordWarning as e:
         # Allow login, but warn the user that they will be required to reset their password soon.
         PageLevelMessages.register_warning_message(request, HTML(str(e)))
@@ -201,7 +206,7 @@ def _enforce_password_policy_compliance(request, user):  # lint-amnesty, pylint:
             {
                 "user_id": user.id,
                 "source": "Policy Compliance",
-            }
+            },
         )
         send_password_reset_email_for_user(user, request)
 
@@ -214,19 +219,17 @@ def _log_and_raise_inactive_user_auth_error(unauthenticated_user):
     Depending on Django version we can get here a couple of ways, but this takes care of logging an auth attempt
     by an inactive user, re-sending the activation email, and raising an error with the correct message.
     """
-    AUDIT_LOG.warning(
-        f"Login failed - Account not active for user.id: {unauthenticated_user.id}, resending activation"
-    )
+    AUDIT_LOG.warning(f"Login failed - Account not active for user.id: {unauthenticated_user.id}, resending activation")
 
     profile = UserProfile.objects.get(user=unauthenticated_user)
     compose_and_send_activation_email(unauthenticated_user, profile)
 
     raise AuthFailedError(
-        error_code='inactive-user',
+        error_code="inactive-user",
         context={
-            'platformName': configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
-            'supportLink': configuration_helpers.get_value('SUPPORT_SITE_LINK', settings.SUPPORT_SITE_LINK)
-        }
+            "platformName": configuration_helpers.get_value("PLATFORM_NAME", settings.PLATFORM_NAME),
+            "supportLink": configuration_helpers.get_value("SUPPORT_SITE_LINK", settings.SUPPORT_SITE_LINK),
+        },
     )
 
 
@@ -234,9 +237,11 @@ def _authenticate_first_party(request, unauthenticated_user, third_party_auth_re
     """
     Use Django authentication on the given request, using rate limiting if configured
     """
-    should_be_rate_limited = getattr(request, 'limited', False)
+    should_be_rate_limited = getattr(request, "limited", False)
     if should_be_rate_limited:
-        raise AuthFailedError(_('Too many failed login attempts. Try again later.'))  # lint-amnesty, pylint: disable=raise-missing-from
+        raise AuthFailedError(
+            _("Too many failed login attempts. Try again later.")
+        )  # lint-amnesty, pylint: disable=raise-missing-from
 
     # If the user doesn't exist, we want to set the username to an invalid username so that authentication is guaranteed
     # to fail and we can take advantage of the ratelimited backend
@@ -248,12 +253,8 @@ def _authenticate_first_party(request, unauthenticated_user, third_party_auth_re
     if not third_party_auth_requested:
         _check_user_auth_flow(request.site, unauthenticated_user)
 
-    password = normalize_password(request.POST['password'])
-    return authenticate(
-        username=username,
-        password=password,
-        request=request
-    )
+    password = normalize_password(request.POST["password"])
+    return authenticate(username=username, password=password, request=request)
 
 
 def _handle_failed_authentication(user, authenticated_user):
@@ -279,34 +280,37 @@ def _handle_failed_authentication(user, authenticated_user):
             if not LoginFailures.is_user_locked_out(user):
                 max_failures_allowed = settings.MAX_FAILED_LOGIN_ATTEMPTS_ALLOWED
                 remaining_attempts = max_failures_allowed - failure_count
-                error_message = Text(_('Email or password is incorrect.'
-                                       '{li_start}You have {remaining_attempts} more sign-in '
-                                       'attempts before your account is temporarily locked.{li_end}'
-                                       '{li_start}If you\'ve forgotten your password, click '
-                                       '{link_start}here{link_end} to reset.{li_end}')).format(
-                                           link_start=HTML(
-                                               '<a http="#login" class="form-toggle" data-type="password-reset">'
-                                           ),
-                                           link_end=HTML('</a>'),
-                                           li_start=HTML('<li>'),
-                                           li_end=HTML('</li>'),
-                                           remaining_attempts=remaining_attempts)
+                error_message = Text(
+                    _(
+                        "Email or password is incorrect."
+                        "{li_start}You have {remaining_attempts} more sign-in "
+                        "attempts before your account is temporarily locked.{li_end}"
+                        "{li_start}If you've forgotten your password, click "
+                        "{link_start}here{link_end} to reset.{li_end}"
+                    )
+                ).format(
+                    link_start=HTML('<a http="#login" class="form-toggle" data-type="password-reset">'),
+                    link_end=HTML("</a>"),
+                    li_start=HTML("<li>"),
+                    li_end=HTML("</li>"),
+                    remaining_attempts=remaining_attempts,
+                )
                 raise AuthFailedError(
                     error_message,
-                    error_code='failed-login-attempt',
+                    error_code="failed-login-attempt",
                     context={
-                        'remaining_attempts': remaining_attempts,
-                        'allowed_failure_attempts': max_failures_allowed,
-                        'failure_count': failure_count,
-                    }
+                        "remaining_attempts": remaining_attempts,
+                        "allowed_failure_attempts": max_failures_allowed,
+                        "failure_count": failure_count,
+                    },
                 )
 
             _generate_locked_out_error_message()
 
     raise AuthFailedError(
-        _('Email or password is incorrect.'),
-        error_code='incorrect-email-or-password',
-        context={'failure_count': failure_count},
+        _("Email or password is incorrect."),
+        error_code="incorrect-email-or-password",
+        context={"failure_count": failure_count},
     )
 
 
@@ -350,26 +354,29 @@ def _track_user_login(user, request):
     # .. pii: Username and email are sent to Segment here. Retired directly through Segment API call in Tubular.
     # .. pii_types: email_address, username
     # .. pii_retirement: third_party
+    anonymous_id = ""
+    try:
+        anonymous_id = request.COOKIES.get('ajs_anonymous_id', "")
+    except:  # pylint: disable=bare-except
+        pass
     segment.identify(
         user.id,
-        {
-            'email': user.email,
-            'username': user.username
-        },
+        {"email": user.email, "username": user.username},
         {
             # Disable MailChimp because we don't want to update the user's email
             # and username in MailChimp on every page load. We only need to capture
             # this data on registration/activation.
-            'MailChimp': False
-        }
+            "MailChimp": False
+        },
     )
     segment.track(
         user.id,
         "edx.bi.user.account.authenticated",
         {
-            'category': "conversion",
-            'label': request.POST.get('course_id'),
-            'provider': None
+            "category": "conversion",
+            "label": request.POST.get("course_id"),
+            "provider": None,
+            "anonymous_id": anonymous_id,
         },
     )
 
@@ -380,20 +387,22 @@ def _create_message(site, root_url, allowed_domain):
     to an allowed domain and not whitelisted then ask such users to login
     through allowed domain SSO provider.
     """
-    msg = Text(_(
-        'As {allowed_domain} user, You must login with your {allowed_domain} '
-        '{link_start}{provider} account{link_end}.'
-    )).format(
+    msg = Text(
+        _(
+            "As {allowed_domain} user, You must login with your {allowed_domain} "
+            "{link_start}{provider} account{link_end}."
+        )
+    ).format(
         allowed_domain=allowed_domain,
         link_start=HTML("<a href='{root_url}{tpa_provider_link}'>").format(
-            root_url=root_url if root_url else '',
-            tpa_provider_link='{dashboard_url}?tpa_hint={tpa_hint}'.format(
-                dashboard_url=reverse('dashboard'),
-                tpa_hint=site.configuration.get_value('THIRD_PARTY_AUTH_ONLY_HINT'),
-            )
+            root_url=root_url if root_url else "",
+            tpa_provider_link="{dashboard_url}?tpa_hint={tpa_hint}".format(
+                dashboard_url=reverse("dashboard"),
+                tpa_hint=site.configuration.get_value("THIRD_PARTY_AUTH_ONLY_HINT"),
+            ),
         ),
-        provider=site.configuration.get_value('THIRD_PARTY_AUTH_ONLY_PROVIDER'),
-        link_end=HTML("</a>")
+        provider=site.configuration.get_value("THIRD_PARTY_AUTH_ONLY_PROVIDER"),
+        link_end=HTML("</a>"),
     )
     return msg
 
@@ -404,13 +413,13 @@ def _check_user_auth_flow(site, user):
     then ask user to login through allowed domain SSO provider.
     """
     if user and ENABLE_LOGIN_USING_THIRDPARTY_AUTH_ONLY.is_enabled():
-        allowed_domain = site.configuration.get_value('THIRD_PARTY_AUTH_ONLY_DOMAIN', '').lower()
-        email_parts = user.email.split('@')
+        allowed_domain = site.configuration.get_value("THIRD_PARTY_AUTH_ONLY_DOMAIN", "").lower()
+        email_parts = user.email.split("@")
         if len(email_parts) != 2:
             # User has a nonstandard email so we record their id.
             # we don't record their e-mail in case there is sensitive info accidentally
             # in there.
-            set_custom_attribute('login_tpa_domain_shortcircuit_user_id', user.id)
+            set_custom_attribute("login_tpa_domain_shortcircuit_user_id", user.id)
             log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check.", user.id)
             return
         user_domain = email_parts[1].strip().lower()
@@ -422,19 +431,19 @@ def _check_user_auth_flow(site, user):
                 raise AuthFailedError(msg)
 
             raise AuthFailedError(
-                error_code='allowed-domain-login-error',
+                error_code="allowed-domain-login-error",
                 context={
-                    'allowed_domain': allowed_domain,
-                    'provider': site.configuration.get_value('THIRD_PARTY_AUTH_ONLY_PROVIDER'),
-                    'tpa_hint': site.configuration.get_value('THIRD_PARTY_AUTH_ONLY_HINT'),
-                }
+                    "allowed_domain": allowed_domain,
+                    "provider": site.configuration.get_value("THIRD_PARTY_AUTH_ONLY_PROVIDER"),
+                    "tpa_hint": site.configuration.get_value("THIRD_PARTY_AUTH_ONLY_HINT"),
+                },
             )
 
 
 @login_required
-@require_http_methods(['GET'])
+@require_http_methods(["GET"])
 def finish_auth(request):
-    """ Following logistration (1st or 3rd party), handle any special query string params.
+    """Following logistration (1st or 3rd party), handle any special query string params.
 
     See FinishAuthView.js for details on the query string params.
 
@@ -459,10 +468,13 @@ def finish_auth(request):
         GET /account/finish_auth/?course_id=course-v1:blah&enrollment_action=enroll
 
     """
-    return render_to_response('student_account/finish_auth.html', {
-        'disable_courseware_js': True,
-        'disable_footer': True,
-    })
+    return render_to_response(
+        "student_account/finish_auth.html",
+        {
+            "disable_courseware_js": True,
+            "disable_footer": True,
+        },
+    )
 
 
 def enterprise_selection_page(request, user, next_url):
@@ -478,14 +490,14 @@ def enterprise_selection_page(request, user, next_url):
 
     response = get_enterprise_learner_data_from_api(user)
     if response and len(response) > 1:
-        redirect_url = reverse('enterprise_select_active') + '/?success_url=' + urllib.parse.quote(next_url)
+        redirect_url = reverse("enterprise_select_active") + "/?success_url=" + urllib.parse.quote(next_url)
 
         # Check to see if next url has an enterprise in it. In this case if user is associated with
         # that enterprise, activate that enterprise and bypass the selection page.
         if re.match(ENTERPRISE_ENROLLMENT_URL_REGEX, urllib.parse.unquote(next_url)):
             enterprise_in_url = re.search(UUID4_REGEX, next_url).group(0)
             for enterprise in response:
-                if enterprise_in_url == str(enterprise['enterprise_customer']['uuid']):
+                if enterprise_in_url == str(enterprise["enterprise_customer"]["uuid"]):
                     is_activated_successfully = activate_learner_enterprise(request, user, enterprise_in_url)
                     if is_activated_successfully:
                         redirect_url = next_url
@@ -495,20 +507,20 @@ def enterprise_selection_page(request, user, next_url):
 
 
 @ensure_csrf_cookie
-@require_http_methods(['POST'])
+@require_http_methods(["POST"])
 @ratelimit(
-    key='openedx.core.djangoapps.util.ratelimit.request_post_email_or_username',
+    key="openedx.core.djangoapps.util.ratelimit.request_post_email_or_username",
     rate=settings.LOGISTRATION_PER_EMAIL_RATELIMIT_RATE,
-    method='POST',
+    method="POST",
     block=False,
 )  # lint-amnesty, pylint: disable=too-many-statements
 @ratelimit(
-    key='openedx.core.djangoapps.util.ratelimit.real_ip',
+    key="openedx.core.djangoapps.util.ratelimit.real_ip",
     rate=settings.LOGISTRATION_RATELIMIT_RATE,
-    method='POST',
+    method="POST",
     block=False,
 )  # lint-amnesty, pylint: disable=too-many-statements
-def login_user(request, api_version='v1'):  # pylint: disable=too-many-statements
+def login_user(request, api_version="v1"):  # pylint: disable=too-many-statements
     """
     AJAX request to log in the user.
 
@@ -542,10 +554,10 @@ def login_user(request, api_version='v1'):  # pylint: disable=too-many-statement
     _parse_analytics_param_for_course_id(request)
 
     third_party_auth_requested = third_party_auth.is_enabled() and pipeline.running(request)
-    first_party_auth_requested = any(bool(request.POST.get(p)) for p in ['email', 'email_or_username', 'password'])
+    first_party_auth_requested = any(bool(request.POST.get(p)) for p in ["email", "email_or_username", "password"])
     is_user_third_party_authenticated = False
 
-    set_custom_attribute('login_user_course_id', request.POST.get('course_id'))
+    set_custom_attribute("login_user_course_id", request.POST.get("course_id"))
 
     if is_require_third_party_auth_enabled() and not third_party_auth_requested:
         return HttpResponseForbidden(
@@ -564,12 +576,12 @@ def login_user(request, api_version='v1'):  # pylint: disable=too-many-statement
             try:
                 user = _do_third_party_auth(request)
                 is_user_third_party_authenticated = True
-                set_custom_attribute('login_user_tpa_success', True)
+                set_custom_attribute("login_user_tpa_success", True)
             except AuthFailedError as e:
-                set_custom_attribute('login_user_tpa_success', False)
-                set_custom_attribute('login_user_tpa_failure_msg', e.value)
+                set_custom_attribute("login_user_tpa_success", False)
+                set_custom_attribute("login_user_tpa_failure_msg", e.value)
                 if e.error_code:
-                    set_custom_attribute('login_error_code', e.error_code)
+                    set_custom_attribute("login_error_code", e.error_code)
 
                 # user successfully authenticated with a third party provider, but has no linked Open edX account
                 response_content = e.get_response()
@@ -585,7 +597,10 @@ def login_user(request, api_version='v1'):  # pylint: disable=too-many-statement
             possibly_authenticated_user = StudentLoginRequested.run_filter(user=possibly_authenticated_user)
         except StudentLoginRequested.PreventLogin as exc:
             raise AuthFailedError(
-                str(exc), redirect_url=exc.redirect_to, error_code=exc.error_code, context=exc.context,
+                str(exc),
+                redirect_url=exc.redirect_to,
+                error_code=exc.error_code,
+                context=exc.context,
             ) from exc
 
         if not is_user_third_party_authenticated:
@@ -599,82 +614,82 @@ def login_user(request, api_version='v1'):  # pylint: disable=too-many-statement
         ):
             _handle_failed_authentication(user, possibly_authenticated_user)
 
-        pwned_properties = check_pwned_password_and_send_track_event(
-            user_id=user.id,
-            password=request.POST.get('password'),
-            internal_user=user.is_staff,
-            request_page='login'
-        ) if not is_user_third_party_authenticated else {}
+        pwned_properties = (
+            check_pwned_password_and_send_track_event(
+                user_id=user.id,
+                password=request.POST.get("password"),
+                internal_user=user.is_staff,
+                request_page="login",
+            )
+            if not is_user_third_party_authenticated
+            else {}
+        )
         # Set default for third party login
-        password_frequency = pwned_properties.get('frequency', -1)
+        password_frequency = pwned_properties.get("frequency", -1)
         if (
-            settings.ENABLE_AUTHN_LOGIN_BLOCK_HIBP_POLICY and
-            password_frequency >= settings.HIBP_LOGIN_BLOCK_PASSWORD_FREQUENCY_THRESHOLD
+            settings.ENABLE_AUTHN_LOGIN_BLOCK_HIBP_POLICY
+            and password_frequency >= settings.HIBP_LOGIN_BLOCK_PASSWORD_FREQUENCY_THRESHOLD
         ):
-            raise VulnerablePasswordError(
-                accounts.AUTHN_LOGIN_BLOCK_HIBP_POLICY_MSG,
-                'require-password-change'
-            )
+            raise VulnerablePasswordError(accounts.AUTHN_LOGIN_BLOCK_HIBP_POLICY_MSG, "require-password-change")
 
         _handle_successful_authentication_and_login(possibly_authenticated_user, request)
 
         # The AJAX method calling should know the default destination upon success
-        redirect_url, finish_auth_url = None, ''
+        redirect_url, finish_auth_url = None, ""
 
         if third_party_auth_requested:
             running_pipeline = pipeline.get(request)
-            finish_auth_url = pipeline.get_complete_url(backend_name=running_pipeline['backend'])
+            finish_auth_url = pipeline.get_complete_url(backend_name=running_pipeline["backend"])
 
         if is_user_third_party_authenticated:
             redirect_url = finish_auth_url
         elif should_redirect_to_authn_microfrontend():
             next_url, root_url = get_next_url_for_login_page(request, include_host=True)
             redirect_url = get_redirect_url_with_host(
-                root_url,
-                enterprise_selection_page(request, possibly_authenticated_user, finish_auth_url or next_url)
+                root_url, enterprise_selection_page(request, possibly_authenticated_user, finish_auth_url or next_url)
             )
 
         if (
-            settings.ENABLE_AUTHN_LOGIN_NUDGE_HIBP_POLICY and
-            0 <= password_frequency <= settings.HIBP_LOGIN_NUDGE_PASSWORD_FREQUENCY_THRESHOLD
+            settings.ENABLE_AUTHN_LOGIN_NUDGE_HIBP_POLICY
+            and 0 <= password_frequency <= settings.HIBP_LOGIN_NUDGE_PASSWORD_FREQUENCY_THRESHOLD
         ):
             raise VulnerablePasswordError(
-                accounts.AUTHN_LOGIN_NUDGE_HIBP_POLICY_MSG,
-                'nudge-password-change',
-                redirect_url
+                accounts.AUTHN_LOGIN_NUDGE_HIBP_POLICY_MSG, "nudge-password-change", redirect_url
             )
 
-        response = JsonResponse({
-            'success': True,
-            'redirect_url': redirect_url,
-        })
+        response = JsonResponse(
+            {
+                "success": True,
+                "redirect_url": redirect_url,
+            }
+        )
 
         # Ensure that the external marketing site can
         # detect that the user is logged in.
         response = set_logged_in_cookies(request, response, possibly_authenticated_user)
-        set_custom_attribute('login_user_auth_failed_error', False)
-        set_custom_attribute('login_user_response_status', response.status_code)
-        set_custom_attribute('login_user_redirect_url', redirect_url)
+        set_custom_attribute("login_user_auth_failed_error", False)
+        set_custom_attribute("login_user_response_status", response.status_code)
+        set_custom_attribute("login_user_redirect_url", redirect_url)
         mark_user_change_as_expected(user.id)
         return response
     except AuthFailedError as error:
         response_content = error.get_response()
         log.exception(response_content)
 
-        error_code = response_content.get('error_code')
+        error_code = response_content.get("error_code")
         if error_code:
-            set_custom_attribute('login_error_code', error_code)
-        email_or_username_key = 'email' if api_version == API_V1 else 'email_or_username'
+            set_custom_attribute("login_error_code", error_code)
+        email_or_username_key = "email" if api_version == API_V1 else "email_or_username"
         email_or_username = request.POST.get(email_or_username_key, None)
         email_or_username = possibly_authenticated_user.email if possibly_authenticated_user else email_or_username
-        response_content['email'] = email_or_username
+        response_content["email"] = email_or_username
     except VulnerablePasswordError as error:
         response_content = error.get_response()
         log.exception(response_content)
 
     response = JsonResponse(response_content, status=400)
-    set_custom_attribute('login_user_auth_failed_error', True)
-    set_custom_attribute('login_user_response_status', response.status_code)
+    set_custom_attribute("login_user_auth_failed_error", True)
+    set_custom_attribute("login_user_response_status", response.status_code)
     return response
 
 
@@ -683,10 +698,10 @@ def login_user(request, api_version='v1'):  # pylint: disable=too-many-statement
 # to get a CSRF token before we need to refresh adds too much
 # complexity.
 @csrf_exempt
-@require_http_methods(['POST'])
+@require_http_methods(["POST"])
 def login_refresh(request):  # lint-amnesty, pylint: disable=missing-function-docstring
     if not request.user.is_authenticated or request.user.is_anonymous:
-        return JsonResponse('Unauthorized', status=401)
+        return JsonResponse("Unauthorized", status=401)
 
     try:
         return get_response_with_refreshed_jwt_cookies(request, request.user)
@@ -700,33 +715,57 @@ def redirect_to_lms_login(request):
     This view redirect the admin/login url to the site's login page if
     waffle switch is on otherwise returns the admin site's login view.
     """
-    return redirect('/login?next=/admin')
+    return redirect("/login?next=/admin")
+
+
+login_user_schema = openapi.Schema(
+    type=openapi.TYPE_OBJECT,
+    properties={
+        "email": openapi.Schema(type=openapi.TYPE_STRING),
+        "password": openapi.Schema(type=openapi.TYPE_STRING),
+    },
+)
+
+login_user_return_schema = openapi.Schema(
+    type=openapi.TYPE_OBJECT,
+    properties={
+        "success": openapi.Schema(type=openapi.TYPE_BOOLEAN),
+        "value": openapi.Schema(type=openapi.TYPE_STRING),
+        "error_code": openapi.Schema(type=openapi.TYPE_STRING),
+    },
+)
 
 
 class LoginSessionView(APIView):
-    """HTTP end-points for logging in users. """
+    """HTTP end-points for logging in users."""
 
     # This end-point is available to anonymous users,
     # so do not require authentication.
     authentication_classes = []
 
+    login_user_responses = {
+        status.HTTP_200_OK: login_user_return_schema,
+        status.HTTP_400_BAD_REQUEST: login_user_return_schema,
+        status.HTTP_403_FORBIDDEN: login_user_return_schema,
+    }
+
     @method_decorator(ensure_csrf_cookie)
     def get(self, request, *args, **kwargs):
         return HttpResponse(get_login_session_form(request).to_json(), content_type="application/json")  # lint-amnesty, pylint: disable=http-response-with-content-type-json
 
+    @swagger_auto_schema(
+        request_body=login_user_schema,
+        responses=login_user_responses,
+        security=[
+            {"csrf": []},
+        ],
+    )
     @method_decorator(csrf_protect)
     def post(self, request, api_version):
-        """Log in a user.
-
-        See `login_user` for details.
-
-        Example Usage:
-
-            POST /api/user/v1/login_session
-            with POST params `email`, `password`.
-
-            200 {'success': true}
+        """
+        POST /user/{api_version}/account/login_session/
 
+        Returns 200 on success, and a detailed error message otherwise.
         """
         return login_user(request, api_version)
 
@@ -736,19 +775,19 @@ def dispatch(self, request, *args, **kwargs):
 
 
 def _parse_analytics_param_for_course_id(request):
-    """ If analytics request param is found, parse and add course id as a new request param. """
+    """If analytics request param is found, parse and add course id as a new request param."""
     # Make a copy of the current POST request to modify.
     modified_request = request.POST.copy()
     if isinstance(request, HttpRequest):
         # Works for an HttpRequest but not a rest_framework.request.Request.
         # Note: This case seems to be used for tests only.
         request.POST = modified_request
-        set_custom_attribute('login_user_request_type', 'django')
+        set_custom_attribute("login_user_request_type", "django")
     else:
         # The request must be a rest_framework.request.Request.
         # Note: Only DRF seems to be used in Production.
         request._data = modified_request  # pylint: disable=protected-access
-        set_custom_attribute('login_user_request_type', 'drf')
+        set_custom_attribute("login_user_request_type", "drf")
 
     # Include the course ID if it's specified in the analytics info
     # so it can be included in analytics events.
@@ -758,9 +797,5 @@ def _parse_analytics_param_for_course_id(request):
             if "enroll_course_id" in analytics:
                 modified_request["course_id"] = analytics.get("enroll_course_id")
         except (ValueError, TypeError):
-            set_custom_attribute('shim_analytics_course_id', 'parse-error')
-            log.error(
-                "Could not parse analytics object sent to user API: {analytics}".format(
-                    analytics=analytics
-                )
-            )
+            set_custom_attribute("shim_analytics_course_id", "parse-error")
+            log.error("Could not parse analytics object sent to user API: {analytics}".format(analytics=analytics))
diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index ab57687d2cd4..defeeb76f2e5 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -231,7 +231,7 @@ def create_account_with_params(request, params):  # pylint: disable=too-many-sta
         log.exception('Error while setting is_marketable attribute.')
         is_marketable = None
 
-    _track_user_registration(user, profile, params, third_party_provider, registration, is_marketable)
+    _track_user_registration(user, profile, params, third_party_provider, registration, is_marketable, request=request)
 
     # Sites using multiple languages need to record the language used during registration.
     # If not, compose_and_send_activation_email will be sent in site's default language only.
@@ -356,9 +356,14 @@ def _link_user_to_third_party_provider(
     return third_party_provider, running_pipeline
 
 
-def _track_user_registration(user, profile, params, third_party_provider, registration, is_marketable):
+def _track_user_registration(user, profile, params, third_party_provider, registration, is_marketable, request=None):
     """ Track the user's registration. """
     if hasattr(settings, 'LMS_SEGMENT_KEY') and settings.LMS_SEGMENT_KEY:
+        anonymous_id = ""
+        try:
+            anonymous_id = request.COOKIES.get('ajs_anonymous_id', "")
+        except:       # pylint: disable=bare-except
+            pass
         traits = {
             'email': user.email,
             'username': user.username,
@@ -370,7 +375,8 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
             'address': profile.mailing_address,
             'gender': profile.gender_display,
             'country': str(profile.country),
-            'is_marketable': is_marketable
+            'is_marketable': is_marketable,
+            'anonymous_id': anonymous_id
         }
         if settings.MARKETING_EMAILS_OPT_IN and params.get('marketing_emails_opt_in'):
             email_subscribe = 'subscribed' if is_marketable else 'unsubscribed'
@@ -397,6 +403,7 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
             'host': params.get('host', ''),
             'app_name': params.get('app_name', ''),
             'utm_campaign': params.get('utm_campaign', ''),
+            'anonymous_id': anonymous_id
         }
         # VAN-738 - added below properties to experiment marketing emails opt in/out events on Braze.
         if params.get('marketing_emails_opt_in') and settings.MARKETING_EMAILS_OPT_IN:
diff --git a/openedx/core/djangoapps/user_authn/views/registration_form.py b/openedx/core/djangoapps/user_authn/views/registration_form.py
index 1d1089ce0214..978d303c9a1f 100644
--- a/openedx/core/djangoapps/user_authn/views/registration_form.py
+++ b/openedx/core/djangoapps/user_authn/views/registration_form.py
@@ -23,6 +23,7 @@
 from openedx.core.djangoapps.user_api import accounts
 from openedx.core.djangoapps.user_api.helpers import FormDescription
 from openedx.core.djangoapps.user_authn.utils import check_pwned_password, is_registration_api_v1 as is_api_v1
+from openedx.core.djangoapps.user_authn.views.utils import remove_disabled_country_from_list
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.features.enterprise_support.api import enterprise_customer_for_request
 from common.djangoapps.student.models import (
@@ -147,6 +148,7 @@ class AccountCreationForm(forms.Form):
 
     _EMAIL_INVALID_MSG = _("A properly formatted e-mail is required")
     _NAME_TOO_SHORT_MSG = _("Your legal name must be a minimum of one character long")
+    _NAME_TOO_LONG_MSG = _("Your legal name is too long. It must not exceed %(max_length)s characters")
 
     # TODO: Resolve repetition
 
@@ -166,9 +168,11 @@ class AccountCreationForm(forms.Form):
 
     name = forms.CharField(
         min_length=accounts.NAME_MIN_LENGTH,
+        max_length=accounts.NAME_MAX_LENGTH,
         error_messages={
             "required": _NAME_TOO_SHORT_MSG,
             "min_length": _NAME_TOO_SHORT_MSG,
+            "max_length": _NAME_TOO_LONG_MSG % {"max_length": accounts.NAME_MAX_LENGTH},
         },
         validators=[validate_name]
     )
@@ -297,6 +301,15 @@ def cleaned_extended_profile(self):
             if key in self.extended_profile_fields and value is not None
         }
 
+    def clean_country(self):
+        """
+        Check if the user's country is in the embargoed countries list.
+        """
+        country = self.cleaned_data.get("country")
+        if country in settings.DISABLED_COUNTRIES:
+            raise ValidationError(_("Registration from this country is not allowed due to restrictions."))
+        return self.cleaned_data.get("country")
+
 
 def get_registration_extension_form(*args, **kwargs):
     """
@@ -686,7 +699,7 @@ def _add_marketing_emails_opt_in_field(self, form_desc, required=False):
         """
         opt_in_label = _(
             'I agree that {platform_name} may send me marketing messages.').format(
-                platform_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
+            platform_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
         )
 
         form_desc.add_field(
@@ -974,7 +987,7 @@ def _add_country_field(self, form_desc, required=True):
             label=country_label,
             instructions=country_instructions,
             field_type="select",
-            options=list(countries),
+            options=list(remove_disabled_country_from_list(dict(countries)).items()),
             include_default_option=True,
             required=required,
             error_messages={
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_login.py b/openedx/core/djangoapps/user_authn/views/tests/test_login.py
index 1e8a4c3ed510..aa34a076d403 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_login.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_login.py
@@ -1145,7 +1145,7 @@ def test_login(self, include_analytics, mock_segment):
         mock_segment.track.assert_called_once_with(
             expected_user_id,
             'edx.bi.user.account.authenticated',
-            {'category': 'conversion', 'provider': None, 'label': track_label}
+            {'category': 'conversion', 'provider': None, 'label': track_label, 'anonymous_id': ''}
         )
 
     def test_login_with_username(self):
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 02d5a72074f5..77b5d074fba2 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_register.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_register.py
@@ -65,6 +65,7 @@
     password_validators_instruction_texts,
     password_validators_restrictions
 )
+
 ENABLE_AUTO_GENERATED_USERNAME = settings.FEATURES.copy()
 ENABLE_AUTO_GENERATED_USERNAME['ENABLE_AUTO_GENERATED_USERNAME'] = True
 
@@ -315,6 +316,30 @@ def test_register_fullname_url_validation_error(self):
             }
         )
 
+    def test_register_fullname_max_lenghth_validation_error(self):
+        """
+        Full name error detection test if the length exceeds 255 characters.
+        """
+        expected_error_message = f"Your legal name is too long. It must not exceed {NAME_MAX_LENGTH} characters"
+
+        response = self.client.post(self.url, {
+            "email": self.EMAIL,
+            "name": "x" * 256,
+            "username": self.USERNAME,
+            "password": self.PASSWORD,
+            "honor_code": "true",
+        })
+        assert response.status_code == 400
+
+        response_json = json.loads(response.content.decode('utf-8'))
+        self.assertDictEqual(
+            response_json,
+            {
+                "name": [{"user_message": expected_error_message}],
+                "error_code": "validation-error"
+            }
+        )
+
     def test_register_fullname_html_validation_error(self):
         """
         Test for catching invalid full name errors
@@ -1556,7 +1581,7 @@ def test_activation_email(self):
         assert len(mail.outbox) == 1
         sent_email = mail.outbox[0]
         assert sent_email.to == [self.EMAIL]
-        assert sent_email.subject ==\
+        assert sent_email.subject == \
                f'Action Required: Activate your {settings.PLATFORM_NAME} account'
         assert f'high-quality {settings.PLATFORM_NAME} courses' in sent_email.body
 
@@ -2468,6 +2493,31 @@ def test_register_error_with_pwned_password(self, emit):
             })
         assert response.status_code == 400
 
+    @override_settings(DISABLED_COUNTRIES=['KP'])
+    def test_register_with_disabled_country(self):
+        """
+        Test case to check user registration is forbidden when registration is disabled for a country
+        """
+        response = self.client.post(self.url, {
+            "email": self.EMAIL,
+            "name": self.NAME,
+            "username": self.USERNAME,
+            "password": self.PASSWORD,
+            "honor_code": "true",
+            "country": "KP",
+        })
+        assert response.status_code == 400
+        response_json = json.loads(response.content.decode('utf-8'))
+        self.assertDictEqual(
+            response_json,
+            {'country':
+                [
+                    {
+                        'user_message': 'Registration from this country is not allowed due to restrictions.'
+                    }
+                ], 'error_code': 'validation-error'}
+        )
+
 
 @httpretty.activate
 @ddt.ddt
@@ -2575,6 +2625,24 @@ def test_success(self):
 
         self._verify_user_existence(user_exists=True, social_link_exists=True, user_is_active=False)
 
+    @override_settings(DISABLED_COUNTRIES=['US'])
+    def test_with_disabled_country(self):
+        """
+        Test case to check user registration is forbidden when registration is disabled for a country
+        """
+        self._verify_user_existence(user_exists=False, social_link_exists=False)
+        self._setup_provider_response(success=True)
+        response = self.client.post(self.url, self.data())
+        assert response.status_code == 400
+        assert response.json() == {
+            'country': [
+                {
+                    'user_message': 'Registration from this country is not allowed due to restrictions.'
+                }
+            ], 'error_code': 'validation-error'
+        }
+        self._verify_user_existence(user_exists=False, social_link_exists=False, user_is_active=False)
+
     def test_unlinked_active_user(self):
         user = UserFactory()
         response = self.client.post(self.url, self.data(user))
diff --git a/openedx/core/djangoapps/user_authn/views/utils.py b/openedx/core/djangoapps/user_authn/views/utils.py
index 9b4054bd4037..b9fb096621f2 100644
--- a/openedx/core/djangoapps/user_authn/views/utils.py
+++ b/openedx/core/djangoapps/user_authn/views/utils.py
@@ -3,6 +3,8 @@
 """
 import logging
 import re
+from typing import Dict
+
 from django.conf import settings
 from django.contrib import messages
 from django.utils.translation import gettext as _
@@ -177,3 +179,18 @@ def get_auto_generated_username(data):
     # We generate the username regardless of whether the name is empty or invalid. We do this
     # because the name validations occur later, ensuring that users cannot create an account without a valid name.
     return f"{username_prefix}_{username_suffix}" if username_prefix else username_suffix
+
+
+def remove_disabled_country_from_list(countries: Dict) -> Dict:
+    """
+    Remove disabled countries from the list of countries.
+
+    Args:
+    - countries (dict): List of countries.
+
+    Returns:
+    - dict: Dict of countries with disabled countries removed.
+    """
+    for country_code in settings.DISABLED_COUNTRIES:
+        del countries[country_code]
+    return countries
diff --git a/openedx/core/djangoapps/util/management/commands/print_setting.py b/openedx/core/djangoapps/util/management/commands/print_setting.py
index d90a17b9eb42..c53f49d23a19 100644
--- a/openedx/core/djangoapps/util/management/commands/print_setting.py
+++ b/openedx/core/djangoapps/util/management/commands/print_setting.py
@@ -3,7 +3,11 @@
 =============
 
 Django command to output a single Django setting.
-Useful when paver or a shell script needs such a value.
+Originally used by "paver" scripts before we removed them.
+Still useful when a shell script needs such a value.
+Keep in mind that the LMS/CMS startup time is slow, so if you invoke this
+Django management multiple times in a command that gets run often, you are
+going to be sad.
 
 This handles the one specific use case of the "print_settings" command from
 django-extensions that we were actually using.
diff --git a/openedx/core/djangoapps/video_config/models.py b/openedx/core/djangoapps/video_config/models.py
index 9ea7f8f44d2d..9a54585475f2 100644
--- a/openedx/core/djangoapps/video_config/models.py
+++ b/openedx/core/djangoapps/video_config/models.py
@@ -98,7 +98,8 @@ class CourseYoutubeBlockedFlag(ConfigurationModel):
     Disables the playback of youtube videos for a given course.
     If the flag is present for the course, and set to "enabled",
     then youtube is disabled for that course.
-    .. no_pii
+
+    .. no_pii:
     """
     KEY_FIELDS = ('course_id',)
 
diff --git a/openedx/core/djangoapps/waffle_utils/__init__.py b/openedx/core/djangoapps/waffle_utils/__init__.py
index c21d052cfcac..95fa360d5e84 100644
--- a/openedx/core/djangoapps/waffle_utils/__init__.py
+++ b/openedx/core/djangoapps/waffle_utils/__init__.py
@@ -5,7 +5,7 @@
 import logging
 
 from edx_toggles.toggles import WaffleFlag
-from opaque_keys.edx.keys import CourseKey
+from opaque_keys.edx.keys import CourseKey, LearningContextKey
 
 log = logging.getLogger(__name__)
 
@@ -99,7 +99,11 @@ def _get_course_override_value(self, course_key):
 
     def is_enabled(self, course_key=None):  # pylint: disable=arguments-differ
         """
-        Returns whether or not the flag is enabled within the context of a given course.
+        Returns whether or not the flag is enabled within the context of a given
+        course.
+
+        Can also be given the key of any other learning context (like a content
+        library), but it will act like a regular waffle flag in that case.
 
         Arguments:
             course_key (Optional[CourseKey]): The course to check for override before
@@ -107,12 +111,12 @@ def is_enabled(self, course_key=None):  # pylint: disable=arguments-differ
                 outside the context of any course.
         """
         if course_key:
-            assert isinstance(
-                course_key, CourseKey
-            ), "Provided course_key '{}' is not instance of CourseKey.".format(
-                course_key
-            )
-        is_enabled_for_course = self._get_course_override_value(course_key)
-        if is_enabled_for_course is not None:
-            return is_enabled_for_course
+            if isinstance(course_key, CourseKey):
+                is_enabled_for_course = self._get_course_override_value(course_key)
+                if is_enabled_for_course is not None:
+                    return is_enabled_for_course
+            else:
+                # In case this gets called with a content library key, that's fine - just ignore it and
+                # act like a normal waffle flag. We currently don't support library-specific overrides.
+                assert isinstance(course_key, LearningContextKey), "expected a course key or other learning context key"
         return super().is_enabled()
diff --git a/openedx/core/djangoapps/xblock/api.py b/openedx/core/djangoapps/xblock/api.py
index 80a4bd57eab8..35c05cd7b407 100644
--- a/openedx/core/djangoapps/xblock/api.py
+++ b/openedx/core/djangoapps/xblock/api.py
@@ -8,30 +8,37 @@
 Studio APIs cover use cases like adding/deleting/editing blocks.
 """
 # pylint: disable=unused-import
-
+from enum import Enum
 from datetime import datetime
 import logging
 import threading
 
+from django.core.exceptions import PermissionDenied
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from openedx_learning.api import authoring as authoring_api
-from openedx_learning.api.authoring_models import Component
+from openedx_learning.api.authoring_models import Component, ComponentVersion
 from opaque_keys.edx.keys import UsageKeyV2
 from opaque_keys.edx.locator import BundleDefinitionLocator, LibraryUsageLocatorV2
 from rest_framework.exceptions import NotFound
 from xblock.core import XBlock
-from xblock.exceptions import NoSuchViewError
+from xblock.exceptions import NoSuchUsage, NoSuchViewError
 from xblock.plugin import PluginMissingError
 
+from openedx.core.types import User as UserType
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
 from openedx.core.djangoapps.xblock.learning_context.manager import get_learning_context_impl
 from openedx.core.djangoapps.xblock.runtime.learning_core_runtime import (
     LearningCoreFieldData,
     LearningCoreXBlockRuntime,
 )
-from openedx.core.djangoapps.xblock.runtime.runtime import XBlockRuntimeSystem as _XBlockRuntimeSystem
-from .utils import get_secure_token_for_xblock_handler, get_xblock_id_for_anonymous_user
+from .data import CheckPerm, LatestVersion
+from .rest_api.url_converters import VersionConverter
+from .utils import (
+    get_secure_token_for_xblock_handler,
+    get_xblock_id_for_anonymous_user,
+    get_auto_latest_version,
+)
 
 from .runtime.learning_core_runtime import LearningCoreXBlockRuntime
 
@@ -43,46 +50,40 @@
 log = logging.getLogger(__name__)
 
 
-def get_runtime_system():
+def get_runtime(user: UserType):
     """
-    Return a new XBlockRuntimeSystem.
-
-    TODO: Refactor to get rid of the XBlockRuntimeSystem entirely and just
-    create the LearningCoreXBlockRuntime and return it. We used to want to keep
-    around a long lived runtime system (a factory that returns runtimes) for
-    caching purposes, and have it dynamically construct a runtime on request.
-    Now we're just re-constructing both the system and the runtime in this call
-    and returning it every time, because:
-
-    1. We no longer have slow, Blockstore-style definitions to cache, so the
-       performance of this is perfectly acceptable.
-    2. Having a singleton increases complexity and the chance of bugs.
-    3. Creating the XBlockRuntimeSystem every time only takes about 10-30 µs.
-
-    Given that, the extra XBlockRuntimeSystem class just adds confusion. But
-    despite that, it's tested, working code, and so I'm putting off refactoring
-    for now.
+    Return a new XBlockRuntime.
+
+    Each XBlockRuntime is bound to one user (and usually one request or one
+    celery task). It is typically used just to load and render a single block,
+    but the API _does_ allow a single runtime instance to load multiple blocks
+    (as long as they're for the same user).
     """
-    params = get_xblock_app_config().get_runtime_system_params()
+    params = get_xblock_app_config().get_runtime_params()
     params.update(
-        runtime_class=LearningCoreXBlockRuntime,
         handler_url=get_handler_url,
         authored_data_store=LearningCoreFieldData(),
     )
-    runtime = _XBlockRuntimeSystem(**params)
+    runtime = LearningCoreXBlockRuntime(user, **params)
 
     return runtime
 
 
-def load_block(usage_key, user):
+def load_block(
+    usage_key: UsageKeyV2,
+    user: UserType,
+    *,
+    check_permission: CheckPerm | None = CheckPerm.CAN_LEARN,
+    version: int | LatestVersion = LatestVersion.AUTO,
+):
     """
     Load the specified XBlock for the given user.
 
     Returns an instantiated XBlock.
 
     Exceptions:
-        NotFound - if the XBlock doesn't exist or if the user doesn't have the
-                   necessary permissions
+        NotFound - if the XBlock doesn't exist
+        PermissionDenied - if the user doesn't have the necessary permissions
 
     Args:
         usage_key(OpaqueKey): block identifier
@@ -94,18 +95,32 @@ def load_block(usage_key, user):
 
     # Now, check if the block exists in this context and if the user has
     # permission to render this XBlock view:
-    if user is not None and not context_impl.can_view_block(user, usage_key):
-        # We do not know if the block was not found or if the user doesn't have
-        # permission, but we want to return the same result in either case:
-        raise NotFound(f"XBlock {usage_key} does not exist, or you don't have permission to view it.")
+    if check_permission and user is not None:
+        if check_permission == CheckPerm.CAN_EDIT:
+            has_perm = context_impl.can_edit_block(user, usage_key)
+        elif check_permission == CheckPerm.CAN_READ_AS_AUTHOR:
+            has_perm = context_impl.can_view_block_for_editing(user, usage_key)
+        elif check_permission == CheckPerm.CAN_LEARN:
+            has_perm = context_impl.can_view_block(user, usage_key)
+        else:
+            has_perm = False
+        if not has_perm:
+            raise PermissionDenied(f"You don't have permission to access the component '{usage_key}'.")
 
     # TODO: load field overrides from the context
     # e.g. a course might specify that all 'problem' XBlocks have 'max_attempts'
     # set to 3.
     # field_overrides = context_impl.get_field_overrides(usage_key)
-    runtime = get_runtime_system().get_runtime(user=user)
+    runtime = get_runtime(user=user)
 
-    return runtime.get_block(usage_key)
+    try:
+        return runtime.get_block(usage_key, version=version)
+    except NoSuchUsage as exc:
+        # Convert NoSuchUsage to NotFound so we do the right thing (404 not 500) by default.
+        raise NotFound(f"The component '{usage_key}' does not exist.") from exc
+    except ComponentVersion.DoesNotExist as exc:
+        # Convert ComponentVersion.DoesNotExist to NotFound so we do the right thing (404 not 500) by default.
+        raise NotFound(f"The requested version of component '{usage_key}' does not exist.") from exc
 
 
 def get_block_metadata(block, includes=()):
@@ -198,13 +213,26 @@ def get_component_from_usage_key(usage_key: UsageKeyV2) -> Component:
     )
 
 
-def get_block_draft_olx(usage_key: UsageKeyV2) -> str:
+def get_block_olx(
+    usage_key: UsageKeyV2,
+    *,
+    version: int | LatestVersion = LatestVersion.AUTO
+) -> str:
     """
-    Get the OLX source of the draft version of the given Learning-Core-backed XBlock.
+    Get the OLX source of the of the given Learning-Core-backed XBlock and a version.
     """
-    # Inefficient but simple approach. Optimize later if needed.
     component = get_component_from_usage_key(usage_key)
-    component_version = component.versioning.draft
+    version = get_auto_latest_version(version)
+
+    if version == LatestVersion.DRAFT:
+        component_version = component.versioning.draft
+    elif version == LatestVersion.PUBLISHED:
+        component_version = component.versioning.published
+    else:
+        assert isinstance(version, int)
+        component_version = component.versioning.version_num(version)
+    if component_version is None:
+        raise NoSuchUsage(usage_key)
 
     # TODO: we should probably make a method on ComponentVersion that returns
     # a content based on the name. Accessing by componentversioncontent__key is
@@ -214,6 +242,11 @@ def get_block_draft_olx(usage_key: UsageKeyV2) -> str:
     return content.text
 
 
+def get_block_draft_olx(usage_key: UsageKeyV2) -> str:
+    """ DEPRECATED. Use get_block_olx(). Can be removed post-Teak. """
+    return get_block_olx(usage_key, version=LatestVersion.DRAFT)
+
+
 def render_block_view(block, view_name, user):  # pylint: disable=unused-argument
     """
     Get the HTML, JS, and CSS needed to render the given XBlock view.
@@ -238,7 +271,13 @@ def render_block_view(block, view_name, user):  # pylint: disable=unused-argumen
     return fragment
 
 
-def get_handler_url(usage_key, handler_name, user):
+def get_handler_url(
+    usage_key: UsageKeyV2,
+    handler_name: str,
+    user: UserType | None,
+    *,
+    version: int | LatestVersion = LatestVersion.AUTO,
+):
     """
     A method for getting the URL to any XBlock handler. The URL must be usable
     without any authentication (no cookie, no OAuth/JWT), and may expire. (So
@@ -255,14 +294,18 @@ def get_handler_url(usage_key, handler_name, user):
         usage_key       - Usage Key (Opaque Key object or string)
         handler_name    - Name of the handler or a dummy name like 'any_handler'
         user            - Django User (registered or anonymous)
+        version         - Run the handler against a specific version of the
+                          block (e.g. when viewing an old version of it in
+                          Studio). Some blocks use handlers to load their data
+                          so it's important the handler matches the student_view
+                          etc.
 
     This view does not check/care if the XBlock actually exists.
     """
-    usage_key_str = str(usage_key)
     site_root_url = get_xblock_app_config().get_site_root_url()
-    if not user:  # lint-amnesty, pylint: disable=no-else-raise
+    if not user:
         raise TypeError("Cannot get handler URLs without specifying a specific user ID.")
-    elif user.is_authenticated:
+    if user.is_authenticated:
         user_id = user.id
     elif user.is_anonymous:
         user_id = get_xblock_id_for_anonymous_user(user)
@@ -270,14 +313,18 @@ def get_handler_url(usage_key, handler_name, user):
         raise ValueError("Invalid user value")
     # Now generate a token-secured URL for this handler, specific to this user
     # and this XBlock:
-    secure_token = get_secure_token_for_xblock_handler(user_id, usage_key_str)
+    secure_token = get_secure_token_for_xblock_handler(user_id, str(usage_key))
     # Now generate the URL to that handler:
-    path = reverse('xblock_api:xblock_handler', kwargs={
-        'usage_key_str': usage_key_str,
+    kwargs = {
+        'usage_key': usage_key,
         'user_id': user_id,
         'secure_token': secure_token,
         'handler_name': handler_name,
-    })
+    }
+    if version != LatestVersion.AUTO:
+        kwargs["version"] = version
+    path = reverse('xblock_api:xblock_handler', kwargs=kwargs)
+
     # We must return an absolute URL. We can't just use
     # rest_framework.reverse.reverse to get the absolute URL because this method
     # can be called by the XBlock from python as well and in that case we don't
diff --git a/openedx/core/djangoapps/xblock/apps.py b/openedx/core/djangoapps/xblock/apps.py
index 5ba2361322ec..e4f07666c35e 100644
--- a/openedx/core/djangoapps/xblock/apps.py
+++ b/openedx/core/djangoapps/xblock/apps.py
@@ -5,7 +5,7 @@
 from django.conf import settings
 
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
-from .data import StudentDataMode
+from .data import StudentDataMode, AuthoredDataMode
 
 
 class XBlockAppConfig(AppConfig):
@@ -16,9 +16,9 @@ class XBlockAppConfig(AppConfig):
     verbose_name = 'New XBlock Runtime'
     label = 'xblock_new'  # The name 'xblock' is already taken by ORA2's 'openassessment.xblock' app :/
 
-    def get_runtime_system_params(self):
+    def get_runtime_params(self):
         """
-        Get the XBlockRuntimeSystem parameters appropriate for viewing and/or
+        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
         editing XBlock content.
         """
         raise NotImplementedError
@@ -43,13 +43,14 @@ class LmsXBlockAppConfig(XBlockAppConfig):
     LMS-specific configuration of the XBlock Runtime django app.
     """
 
-    def get_runtime_system_params(self):
+    def get_runtime_params(self):
         """
-        Get the XBlockRuntimeSystem parameters appropriate for viewing and/or
+        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
         editing XBlock content in the LMS
         """
         return dict(
             student_data_mode=StudentDataMode.Persisted,
+            authored_data_mode=AuthoredDataMode.STRICTLY_PUBLISHED,
         )
 
     def get_site_root_url(self):
@@ -65,13 +66,14 @@ class StudioXBlockAppConfig(XBlockAppConfig):
     Studio-specific configuration of the XBlock Runtime django app.
     """
 
-    def get_runtime_system_params(self):
+    def get_runtime_params(self):
         """
-        Get the XBlockRuntimeSystem parameters appropriate for viewing and/or
+        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
         editing XBlock content in Studio
         """
         return dict(
             student_data_mode=StudentDataMode.Ephemeral,
+            authored_data_mode=AuthoredDataMode.DEFAULT_DRAFT,
         )
 
     def get_site_root_url(self):
diff --git a/openedx/core/djangoapps/xblock/data.py b/openedx/core/djangoapps/xblock/data.py
index 1da850caed19..67cfda8dd4d6 100644
--- a/openedx/core/djangoapps/xblock/data.py
+++ b/openedx/core/djangoapps/xblock/data.py
@@ -11,3 +11,39 @@ class StudentDataMode(Enum):
     """
     Ephemeral = 'ephemeral'
     Persisted = 'persisted'
+
+
+class AuthoredDataMode(Enum):
+    """
+    Runtime configuration which determines whether published or draft versions of content is used by default.
+    """
+    # Published only: used by the LMS. ONLY the published version of an XBlock is ever loaded. Users/APIs cannot request
+    # the draft version nor a specific version.
+    STRICTLY_PUBLISHED = 'published'
+    # Default draft: used by Studio. By default the "lastest draft" version of an XBlock is used, but users/APIs can
+    # also request to see the published version or any specific (old) version.
+    DEFAULT_DRAFT = 'persisted'
+
+
+class CheckPerm(Enum):
+    """
+    Options for the default permission check done by load_block()
+    """
+    # can view the published block and call handlers etc. but not necessarily view its OLX source nor field data
+    CAN_LEARN = 1
+    # read-only studio view: can see the block (draft or published), see its OLX, see its field data, etc.
+    CAN_READ_AS_AUTHOR = 2
+    # can view everything and make changes to the block
+    CAN_EDIT = 3
+
+
+class LatestVersion(Enum):
+    """
+    Options for specifying which version of an XBlock you want to load, if not specifying a specific version.
+    """
+    # Get the latest draft
+    DRAFT = "draft"
+    # Get the latest published version
+    PUBLISHED = "published"
+    # Get the default (based on AuthoredDataMode, i.e. published for LMS APIs, draft for Studio APIs)
+    AUTO = "auto"
diff --git a/openedx/core/djangoapps/xblock/learning_context/learning_context.py b/openedx/core/djangoapps/xblock/learning_context/learning_context.py
index 2dc5155dc4e2..b535e84ca7c1 100644
--- a/openedx/core/djangoapps/xblock/learning_context/learning_context.py
+++ b/openedx/core/djangoapps/xblock/learning_context/learning_context.py
@@ -2,6 +2,8 @@
 A "Learning Context" is a course, a library, a program, or some other collection
 of content where learning happens.
 """
+from openedx.core.types import User as UserType
+from opaque_keys.edx.keys import UsageKeyV2
 
 
 class LearningContext:
@@ -23,11 +25,11 @@ def __init__(self, **kwargs):
         parameters without changing the API.
         """
 
-    def can_edit_block(self, user, usage_key):  # pylint: disable=unused-argument
+    def can_edit_block(self, user: UserType, usage_key: UsageKeyV2) -> bool:  # pylint: disable=unused-argument
         """
-        Does the specified usage key exist in its context, and if so, does the
-        specified user have permission to edit it (make changes to the authored
-        data store)?
+        Assuming a block with the specified ID (usage_key) exists, does the
+        specified user have permission to edit it (make changes to the
+        fields / authored data store)?
 
         user: a Django User object (may be an AnonymousUser)
 
@@ -37,11 +39,20 @@ def can_edit_block(self, user, usage_key):  # pylint: disable=unused-argument
         """
         return False
 
-    def can_view_block(self, user, usage_key):  # pylint: disable=unused-argument
+    def can_view_block_for_editing(self, user: UserType, usage_key: UsageKeyV2) -> bool:
         """
-        Does the specified usage key exist in its context, and if so, does the
+        Assuming a block with the specified ID (usage_key) exists, does the
+        specified user have permission to view its fields and OLX details (but
+        not necessarily to make changes to it)?
+        """
+        return self.can_edit_block(user, usage_key)
+
+    def can_view_block(self, user: UserType, usage_key: UsageKeyV2) -> bool:  # pylint: disable=unused-argument
+        """
+        Assuming a block with the specified ID (usage_key) exists, does the
         specified user have permission to view it and interact with it (call
-        handlers, save user state, etc.)?
+        handlers, save user state, etc.)? This is also sometimes called the
+        "can_learn" permission.
 
         user: a Django User object (may be an AnonymousUser)
 
diff --git a/openedx/core/djangoapps/xblock/rest_api/serializers.py b/openedx/core/djangoapps/xblock/rest_api/serializers.py
new file mode 100644
index 000000000000..bb4dd1da229f
--- /dev/null
+++ b/openedx/core/djangoapps/xblock/rest_api/serializers.py
@@ -0,0 +1,11 @@
+"""
+Serializers for the xblock REST API
+"""
+from rest_framework import serializers
+
+
+class XBlockOlxSerializer(serializers.Serializer):
+    """
+    Serializer for representing an XBlock's OLX
+    """
+    olx = serializers.CharField()
diff --git a/openedx/core/djangoapps/xblock/rest_api/url_converters.py b/openedx/core/djangoapps/xblock/rest_api/url_converters.py
new file mode 100644
index 000000000000..baa4a5d5e2f0
--- /dev/null
+++ b/openedx/core/djangoapps/xblock/rest_api/url_converters.py
@@ -0,0 +1,57 @@
+"""
+URL pattern converters
+https://docs.djangoproject.com/en/5.1/topics/http/urls/#registering-custom-path-converters
+"""
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import UsageKeyV2
+
+from ..api import LatestVersion
+
+
+class UsageKeyV2Converter:
+    """
+    Converter that matches V2 usage keys like:
+        lb:Org:LIB:drag-and-drop-v2:91c2b1d5
+    """
+    regex = r'[\w-]+(:[\w\-.]+)+'
+
+    def to_python(self, value: str) -> UsageKeyV2:
+        try:
+            return UsageKeyV2.from_string(value)
+        except InvalidKeyError as exc:
+            raise ValueError from exc
+
+    def to_url(self, value: UsageKeyV2) -> str:
+        return str(value)
+
+
+class VersionConverter:
+    """
+    Converter that matches a version string like "draft", "published", or a
+    number, and converts it to either an 'int' or a LatestVersion enum value.
+    """
+    regex = r'(draft|published|\d+)'
+
+    def to_python(self, value: str | None) -> LatestVersion | int:
+        """ Convert from string to LatestVersion or integer version spec """
+        if value is None:
+            return LatestVersion.AUTO  # AUTO = published if we're in the LMS, draft if we're in Studio.
+        if value == "draft":
+            return LatestVersion.DRAFT
+        if value == "published":
+            return LatestVersion.PUBLISHED
+        return int(value)  # May raise ValueError, which Django will convert to 404
+
+    def to_url(self, value: LatestVersion | int | None) -> str:
+        """
+        Convert from LatestVersion or integer version spec to URL path string.
+
+        Note that if you provide any value at all, django won't be able to
+        match the paths that don't have a version in the URL, so if you want
+        LatestVersion.AUTO, don't pass any value for 'version' to reverse(...).
+        """
+        if value is None or value == LatestVersion.AUTO:
+            raise ValueError  # This default value does not need to be in the URL
+        if isinstance(value, int):
+            return str(value)
+        return value.value  # LatestVersion.DRAFT or PUBLISHED
diff --git a/openedx/core/djangoapps/xblock/rest_api/urls.py b/openedx/core/djangoapps/xblock/rest_api/urls.py
index 034d490aa3a8..a83d5104e570 100644
--- a/openedx/core/djangoapps/xblock/rest_api/urls.py
+++ b/openedx/core/djangoapps/xblock/rest_api/urls.py
@@ -1,7 +1,8 @@
 """
 URL configuration for the new XBlock API
 """
-from django.urls import include, path, re_path
+from django.urls import include, path, re_path, register_converter
+from . import url_converters
 from . import views
 
 # Note that the exact same API URLs are used in Studio and the LMS, but the API
@@ -10,23 +11,38 @@
 # urls_studio and urls_lms, and/or the views could be likewise duplicated.
 app_name = 'openedx.core.djangoapps.xblock.rest_api'
 
+register_converter(url_converters.UsageKeyV2Converter, "usage_v2")
+register_converter(url_converters.VersionConverter, "block_version")
+
+block_endpoints = [
+    # get metadata about an XBlock:
+    path('', views.block_metadata),
+    # get/post full json fields of an XBlock:
+    path('fields/', views.BlockFieldsView.as_view()),
+    # Get the OLX source code of the specified block
+    path('olx/', views.get_block_olx_view),
+    # render one of this XBlock's views (e.g. student_view)
+    path('view/<str:view_name>/', views.render_block_view),
+    # get the URL needed to call this XBlock's handlers
+    path('handler_url/<str:handler_name>/', views.get_handler_url),
+    # call one of this block's handlers
+    re_path(
+        r'^handler/(?P<user_id>\w+)-(?P<secure_token>\w+)/(?P<handler_name>[\w\-]+)/(?P<suffix>.+)?$',
+        views.xblock_handler,
+        name='xblock_handler',
+    ),
+    # API endpoints related to a specific version of this XBlock:
+]
+
 urlpatterns = [
     path('api/xblock/v2/', include([
-        path('xblocks/<str:usage_key_str>/', include([
-            # get metadata about an XBlock:
-            path('', views.block_metadata),
-            # get/post full json fields of an XBlock:
-            path('fields/', views.BlockFieldsView.as_view()),
-            # render one of this XBlock's views (e.g. student_view)
-            re_path(r'^view/(?P<view_name>[\w\-]+)/$', views.render_block_view),
-            # get the URL needed to call this XBlock's handlers
-            re_path(r'^handler_url/(?P<handler_name>[\w\-]+)/$', views.get_handler_url),
-            # call one of this block's handlers
-            re_path(
-                r'^handler/(?P<user_id>\w+)-(?P<secure_token>\w+)/(?P<handler_name>[\w\-]+)/(?P<suffix>.+)?$',
-                views.xblock_handler,
-                name='xblock_handler',
-            ),
-        ])),
+        path(r'xblocks/<usage_v2:usage_key>/', include(block_endpoints)),
+        path(r'xblocks/<usage_v2:usage_key>@<block_version:version>/', include(block_endpoints)),
+    ])),
+    # Non-API views (these return HTML, not JSON):
+    path('xblocks/v2/<usage_v2:usage_key>/', include([
+        # render one of this XBlock's views (e.g. student_view) for embedding in an iframe
+        # NOTE: this endpoint is **unstable** and subject to changes after Sumac
+        path('embed/<str:view_name>/', views.embed_block_view),
     ])),
 ]
diff --git a/openedx/core/djangoapps/xblock/rest_api/views.py b/openedx/core/djangoapps/xblock/rest_api/views.py
index 9972e7463b23..edcbf22e0d3d 100644
--- a/openedx/core/djangoapps/xblock/rest_api/views.py
+++ b/openedx/core/djangoapps/xblock/rest_api/views.py
@@ -1,16 +1,19 @@
 """
 Views that implement a RESTful API for interacting with XBlocks.
 """
+import json
 
 from common.djangoapps.util.json_request import JsonResponse
 from corsheaders.signals import check_request_enabled
+from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db.transaction import atomic
-from django.http import Http404
+from django.shortcuts import render
 from django.utils.translation import gettext as _
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.decorators.csrf import csrf_exempt
-from rest_framework import permissions
+from opaque_keys.edx.keys import UsageKeyV2
+from rest_framework import permissions, serializers
 from rest_framework.decorators import api_view, permission_classes  # lint-amnesty, pylint: disable=unused-import
 from rest_framework.exceptions import PermissionDenied, AuthenticationFailed, NotFound
 from rest_framework.response import Response
@@ -19,28 +22,30 @@
 from xblock.exceptions import NoSuchUsage
 from xblock.fields import Scope
 
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import UsageKey
+import openedx.core.djangoapps.site_configuration.helpers as configuration_helpers
 from openedx.core.djangoapps.xblock.learning_context.manager import get_learning_context_impl
 from openedx.core.lib.api.view_utils import view_auth_classes
 from ..api import (
+    CheckPerm,
+    LatestVersion,
     get_block_metadata,
     get_block_display_name,
     get_handler_url as _get_handler_url,
     load_block,
     render_block_view as _render_block_view,
+    get_block_olx,
 )
 from ..utils import validate_secure_token_for_xblock_handler
+from .url_converters import VersionConverter
+from .serializers import XBlockOlxSerializer
 
 User = get_user_model()
 
-invalid_not_found_fmt = "XBlock {usage_key} does not exist, or you don't have permission to view it."
-
 
 @api_view(['GET'])
 @view_auth_classes(is_authenticated=False)
 @permission_classes((permissions.AllowAny, ))  # Permissions are handled at a lower level, by the learning context
-def block_metadata(request, usage_key_str):
+def block_metadata(request, usage_key: UsageKeyV2, version: LatestVersion | int = LatestVersion.AUTO):
     """
     Get metadata about the specified block.
 
@@ -49,12 +54,7 @@ def block_metadata(request, usage_key_str):
     * "include": a comma-separated list of keys to include.
       Valid keys are "index_dictionary" and "student_view_data".
     """
-    try:
-        usage_key = UsageKey.from_string(usage_key_str)
-    except InvalidKeyError as e:
-        raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
-
-    block = load_block(usage_key, request.user)
+    block = load_block(usage_key, request.user, version=version)
     includes = request.GET.get("include", "").split(",")
     metadata_dict = get_block_metadata(block, includes=includes)
     if 'children' in metadata_dict:
@@ -67,17 +67,17 @@ def block_metadata(request, usage_key_str):
 @api_view(['GET'])
 @view_auth_classes(is_authenticated=False)
 @permission_classes((permissions.AllowAny, ))  # Permissions are handled at a lower level, by the learning context
-def render_block_view(request, usage_key_str, view_name):
+def render_block_view(
+    request,
+    usage_key: UsageKeyV2,
+    view_name: str,
+    version: LatestVersion | int = LatestVersion.AUTO,
+):
     """
     Get the HTML, JS, and CSS needed to render the given XBlock.
     """
     try:
-        usage_key = UsageKey.from_string(usage_key_str)
-    except InvalidKeyError as e:
-        raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
-
-    try:
-        block = load_block(usage_key, request.user)
+        block = load_block(usage_key, request.user, version=version)
     except NoSuchUsage as exc:
         raise NotFound(f"{usage_key} not found") from exc
 
@@ -89,19 +89,65 @@ def render_block_view(request, usage_key_str, view_name):
 
 @api_view(['GET'])
 @view_auth_classes(is_authenticated=False)
-def get_handler_url(request, usage_key_str, handler_name):
+@permission_classes((permissions.AllowAny, ))  # Permissions are handled at a lower level, by the learning context
+@xframe_options_exempt
+def embed_block_view(request, usage_key: UsageKeyV2, view_name: str):
+    """
+    Render the given XBlock in an <iframe>
+
+    Unstable - may change after Sumac
+    """
+    # Check if a specific version has been requested. TODO: move this to a URL path param like the other views?
+    try:
+        version = VersionConverter().to_python(request.GET.get("version"))
+    except ValueError as exc:
+        raise serializers.ValidationError("Invalid version specifier") from exc
+
+    try:
+        block = load_block(usage_key, request.user, check_permission=CheckPerm.CAN_LEARN, version=version)
+    except NoSuchUsage as exc:
+        raise NotFound(f"{usage_key} not found") from exc
+
+    fragment = _render_block_view(block, view_name, request.user)
+    handler_urls = {
+        str(block.usage_key): _get_handler_url(block.usage_key, 'handler_name', request.user, version=version)
+    }
+    # Currently we don't support child blocks so we don't need this pre-loading of child handler URLs:
+    # handler_urls = {
+    #     str(key): _get_handler_url(key, 'handler_name', request.user)
+    #     for key in itertools.chain([block.scope_ids.usage_id], getattr(block, 'children', []))
+    # }
+    lms_root_url = configuration_helpers.get_value('LMS_ROOT_URL', settings.LMS_ROOT_URL)
+    context = {
+        'fragment': fragment,
+        'handler_urls_json': json.dumps(handler_urls),
+        'lms_root_url': lms_root_url,
+        'is_development': settings.DEBUG,
+    }
+    response = render(request, 'xblock_v2/xblock_iframe.html', context, content_type='text/html')
+
+    # Only allow this iframe be embedded if the parent is in the CORS_ORIGIN_WHITELIST
+    cors_origin_whitelist = configuration_helpers.get_value('CORS_ORIGIN_WHITELIST', settings.CORS_ORIGIN_WHITELIST)
+    response["Content-Security-Policy"] = f"frame-ancestors 'self' {' '.join(cors_origin_whitelist)};"
+
+    return response
+
+
+@api_view(['GET'])
+@view_auth_classes(is_authenticated=False)
+def get_handler_url(
+    request,
+    usage_key: UsageKeyV2,
+    handler_name: str,
+    version: LatestVersion | int = LatestVersion.AUTO,
+):
     """
     Get an absolute URL which can be used (without any authentication) to call
     the given XBlock handler.
 
     The URL will expire but is guaranteed to be valid for a minimum of 2 days.
     """
-    try:
-        usage_key = UsageKey.from_string(usage_key_str)
-    except InvalidKeyError as e:
-        raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
-
-    handler_url = _get_handler_url(usage_key, handler_name, request.user)
+    handler_url = _get_handler_url(usage_key, handler_name, request.user, version=version)
     return Response({"handler_url": handler_url})
 
 
@@ -111,7 +157,15 @@ def get_handler_url(request, usage_key_str, handler_name):
 # and https://github.com/openedx/XBlock/pull/383 for context.
 @csrf_exempt
 @xframe_options_exempt
-def xblock_handler(request, user_id, secure_token, usage_key_str, handler_name, suffix=None):
+def xblock_handler(
+    request,
+    user_id,
+    secure_token: str,
+    usage_key: UsageKeyV2,
+    handler_name: str,
+    suffix: str | None = None,
+    version: LatestVersion | int = LatestVersion.AUTO,
+):
     """
     Run an XBlock's handler and return the result
 
@@ -119,16 +173,11 @@ def xblock_handler(request, user_id, secure_token, usage_key_str, handler_name,
     auth token included in the URL (see below). As a result it can be exempt
     from CSRF, session auth, and JWT/OAuth.
     """
-    try:
-        usage_key = UsageKey.from_string(usage_key_str)
-    except InvalidKeyError as e:
-        raise Http404 from e
-
     # To support sandboxed XBlocks, custom frontends, and other use cases, we
     # authenticate requests using a secure token in the URL. see
     # openedx.core.djangoapps.xblock.utils.get_secure_hash_for_xblock_handler
     # for details and rationale.
-    if not validate_secure_token_for_xblock_handler(user_id, usage_key_str, secure_token):
+    if not validate_secure_token_for_xblock_handler(user_id, str(usage_key), secure_token):
         raise PermissionDenied("Invalid/expired auth token.")
     if request.user.is_authenticated:
         # The user authenticated twice, e.g. with session auth and the token.
@@ -158,13 +207,31 @@ def xblock_handler(request, user_id, secure_token, usage_key_str, handler_name,
         raise AuthenticationFailed("Invalid user ID format.")
 
     request_webob = DjangoWebobRequest(request)  # Convert from django request to the webob format that XBlocks expect
-    block = load_block(usage_key, user)
+
+    block = load_block(usage_key, user, version=version)
     # Run the handler, and save any resulting XBlock field value changes:
     response_webob = block.handle(handler_name, request_webob, suffix)
     response = webob_to_django_response(response_webob)
     return response
 
 
+@api_view(['GET'])
+@view_auth_classes(is_authenticated=False)
+def get_block_olx_view(
+    request,
+    usage_key: UsageKeyV2,
+    version: LatestVersion | int = LatestVersion.AUTO,
+):
+    """
+    Get the OLX (XML serialization) of the specified XBlock
+    """
+    context_impl = get_learning_context_impl(usage_key)
+    if not context_impl.can_view_block_for_editing(request.user, usage_key):
+        raise PermissionDenied(f"You don't have permission to access the OLX of component '{usage_key}'.")
+    olx = get_block_olx(usage_key, version=version)
+    return Response(XBlockOlxSerializer({"olx": olx}).data)
+
+
 def cors_allow_xblock_handler(sender, request, **kwargs):  # lint-amnesty, pylint: disable=unused-argument
     """
     Sandboxed XBlocks need to be able to call XBlock handlers via POST,
@@ -185,46 +252,44 @@ class BlockFieldsView(APIView):
     View to get/edit the field values of an XBlock as JSON (in the v2 runtime)
 
     This class mimics the functionality of xblock_handler in block.py (for v1 xblocks), but for v2 xblocks.
-    However, it only implements the exact subset of functionality needed to support the v2 editors (from
-    the frontend-lib-content-components project). As such, it only supports GET and POST, and only the
+    However, it only implements the exact subset of functionality needed to support the v2 editors (in
+    the Course Authoring MFE). As such, it only supports GET and POST, and only the
     POSTing of data/metadata fields.
     """
 
     @atomic
-    def get(self, request, usage_key_str):
+    def get(self, request, usage_key: UsageKeyV2, version: LatestVersion | int = LatestVersion.AUTO):
         """
         retrieves the xblock, returning display_name, data, and metadata
         """
-        try:
-            usage_key = UsageKey.from_string(usage_key_str)
-        except InvalidKeyError as e:
-            raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
 
-        block = load_block(usage_key, request.user)
+        # The "fields" view requires "read as author" permissions because the fields can contain answers, etc.
+        block = load_block(usage_key, request.user, check_permission=CheckPerm.CAN_READ_AS_AUTHOR, version=version)
+        # It would make more sense if this just had a "fields" dict with all the content+settings fields, but
+        # for backwards compatibility we call the settings metadata and split it up like this, ignoring all content
+        # fields except "data".
         block_dict = {
-            "display_name": get_block_display_name(block),  # potentially duplicated from metadata
-            "data": block.data,
-            "metadata": block.get_explicitly_set_fields_by_scope(Scope.settings),
+            "display_name": get_block_display_name(block),  # note this is also present in metadata
+            "metadata": self.get_explicitly_set_fields_by_scope(block, Scope.settings),
         }
+        if hasattr(block, "data"):
+            block_dict["data"] = block.data
         return Response(block_dict)
 
     @atomic
-    def post(self, request, usage_key_str):
+    def post(self, request, usage_key, version: LatestVersion | int = LatestVersion.AUTO):
         """
         edits the xblock, saving changes to data and metadata only (display_name included in metadata)
         """
-        try:
-            usage_key = UsageKey.from_string(usage_key_str)
-        except InvalidKeyError as e:
-            raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
-
+        if version != LatestVersion.AUTO:
+            raise serializers.ValidationError("Cannot specify a version when saving changes")
         user = request.user
-        block = load_block(usage_key, user)
+        block = load_block(usage_key, user, check_permission=CheckPerm.CAN_EDIT)
         data = request.data.get("data")
         metadata = request.data.get("metadata")
 
-        old_metadata = block.get_explicitly_set_fields_by_scope(Scope.settings)
-        old_content = block.get_explicitly_set_fields_by_scope(Scope.content)
+        old_metadata = self.get_explicitly_set_fields_by_scope(block, Scope.settings)
+        old_content = self.get_explicitly_set_fields_by_scope(block, Scope.content)
 
         # only update data if it was passed
         if data is not None:
@@ -261,8 +326,26 @@ def post(self, request, usage_key_str):
         context_impl = get_learning_context_impl(usage_key)
         context_impl.send_block_updated_event(usage_key)
 
-        return Response({
-            "id": str(block.location),
-            "data": data,
-            "metadata": block.get_explicitly_set_fields_by_scope(Scope.settings),
-        })
+        block_dict = {
+            "id": str(block.usage_key),
+            "display_name": get_block_display_name(block),  # note this is also present in metadata
+            "metadata": self.get_explicitly_set_fields_by_scope(block, Scope.settings),
+        }
+        if hasattr(block, "data"):
+            block_dict["data"] = block.data
+        return Response(block_dict)
+
+    def get_explicitly_set_fields_by_scope(self, block, scope=Scope.content):
+        """
+        Get a dictionary of the fields for the given scope which are set explicitly on the given xblock.
+
+        (Including any set to None.)
+        """
+        result = {}
+        for field in block.fields.values():  # lint-amnesty, pylint: disable=no-member
+            if field.scope == scope and field.is_set_on(block):
+                try:
+                    result[field.name] = field.read_json(block)
+                except TypeError as exc:
+                    raise TypeError(f"Unable to read field {field.name} from block {block.usage_key}") from exc
+        return result
diff --git a/openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py b/openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py
index 26aa7af60f0b..44dedcf42874 100644
--- a/openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py
@@ -6,9 +6,11 @@
 import logging
 from collections import defaultdict
 from datetime import datetime, timezone
+from urllib.parse import unquote
 
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db.transaction import atomic
+from django.urls import reverse
 
 from openedx_learning.api import authoring as authoring_api
 
@@ -19,7 +21,11 @@
 from xblock.fields import Field, Scope, ScopeIds
 from xblock.field_data import FieldData
 
+from openedx.core.djangoapps.xblock.api import get_xblock_app_config
 from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_learning_core
+from openedx.core.lib.xblock_serializer.data import StaticFile
+from ..data import AuthoredDataMode, LatestVersion
+from ..utils import get_auto_latest_version
 from ..learning_context.manager import get_learning_context_impl
 from .runtime import XBlockRuntime
 
@@ -161,7 +167,7 @@ class LearningCoreXBlockRuntime(XBlockRuntime):
     (eventually) asset storage.
     """
 
-    def get_block(self, usage_key, for_parent=None):
+    def get_block(self, usage_key, for_parent=None, *, version: int | LatestVersion = LatestVersion.AUTO):
         """
         Fetch an XBlock from Learning Core data models.
 
@@ -173,10 +179,17 @@ def get_block(self, usage_key, for_parent=None):
         # We can do this more efficiently in a single query later, but for now
         # just get it the easy way.
         component = self._get_component_from_usage_key(usage_key)
-        # TODO: For now, this runtime will only be used in CMS, so it's fine to just return the Draft version.
-        #       However, we will need the runtime to return the Published version for LMS (and Draft for LMS-Preview).
-        #       We should base this Draft vs Published decision on a runtime initialization parameter.
-        component_version = component.versioning.draft
+
+        version = get_auto_latest_version(version)
+        if self.authored_data_mode == AuthoredDataMode.STRICTLY_PUBLISHED and version != LatestVersion.PUBLISHED:
+            raise ValidationError("This runtime only allows accessing the published version of components")
+        if version == LatestVersion.DRAFT:
+            component_version = component.versioning.draft
+        elif version == LatestVersion.PUBLISHED:
+            component_version = component.versioning.published
+        else:
+            assert isinstance(version, int)
+            component_version = component.versioning.version_num(version)
         if component_version is None:
             raise NoSuchUsage(usage_key)
 
@@ -205,25 +218,70 @@ def get_block(self, usage_key, for_parent=None):
         else:
             block = block_class.parse_xml(xml_node, runtime=self, keys=keys)
 
+        # Store the version request on the block so we can retrieve it when needed for generating handler URLs etc.
+        block._runtime_requested_version = version  # pylint: disable=protected-access
+
         # Update field data with parsed values. We can't call .save() because it will call save_block(), below.
         block.force_save_fields(block._get_fields_to_save())  # pylint: disable=protected-access
 
         # We've pre-loaded the fields for this block, so the FieldData shouldn't
         # consider these values "changed" in its sense of "you have to persist
         # these because we've altered the field values from what was stored".
-        self.system.authored_data_store.mark_unchanged(block)
+        self.authored_data_store.mark_unchanged(block)
 
         return block
 
+    def get_block_assets(self, block, fetch_asset_data):
+        """
+        Return a list of StaticFile entries.
+
+        If ``fetch_data`` is True, we will read the actual asset file data from
+        storage and return it as part of the ``StaticFiles``. This is expensive,
+        and not necessary for something like writing a new version of the OLX in
+        response to a "Save" in the editor. But it is necessary for something
+        like serializing to the clipboard, where we make full copies of the
+        assets.
+
+        TODO: When we want to copy a whole Section at a time, doing these
+        lookups one by one is going to get slow. At some point we're going to
+        want something to look up a bunch of blocks at once.
+        """
+        component_version = self._get_component_version_from_block(block)
+
+        # cvc = the ComponentVersionContent through-table
+        cvc_list = (
+            component_version
+            .componentversioncontent_set
+            .filter(content__has_file=True)
+            .select_related('content')
+            .order_by('key')
+        )
+
+        return [
+            StaticFile(
+                name=cvc.key,
+                url=self._absolute_url_for_asset(component_version, cvc.key),
+                data=cvc.content.read_file().read() if fetch_asset_data else None,
+            )
+            for cvc in cvc_list
+        ]
+
     def save_block(self, block):
         """
         Save any pending field data values to Learning Core data models.
 
         This gets called by block.save() - do not call this directly.
         """
-        if not self.system.authored_data_store.has_changes(block):
+        if not self.authored_data_store.has_changes(block):
             return  # No changes, so no action needed.
 
+        if block._runtime_requested_version != LatestVersion.DRAFT:  # pylint: disable=protected-access
+            # Not sure if this is an important restriction but it seems like overwriting the latest version based on
+            # an old version is likely an accident, so for now we're not going to allow it.
+            raise ValidationError(
+                "Do not make changes to a component starting from the published or past versions. Use the latest draft."
+            )
+
         # Verify that the user has permission to write to authored data in this
         # learning context:
         if self.user is not None:
@@ -254,7 +312,7 @@ def save_block(self, block):
                 },
                 created=now,
             )
-        self.system.authored_data_store.mark_unchanged(block)
+        self.authored_data_store.mark_unchanged(block)
 
     def _get_component_from_usage_key(self, usage_key):
         """
@@ -278,19 +336,131 @@ def _get_component_from_usage_key(self, usage_key):
 
         return component
 
-    def _lookup_asset_url(self, block: XBlock, asset_path: str) -> str | None:  # pylint: disable=unused-argument
+    def _get_component_version_from_block(self, block):
+        """
+        Given an XBlock instance, return the Learning Core ComponentVersion.
+
+        This relies on our runtime setting the _runtime_requested_version
+        attribute on blocks that it fetches.
+        """
+        usage_key = block.usage_key
+        component = self._get_component_from_usage_key(usage_key)
+
+        block_version = block._runtime_requested_version  # pylint: disable=protected-access
+        if block_version == LatestVersion.DRAFT:
+            component_version = component.versioning.draft
+        elif block_version == LatestVersion.PUBLISHED:
+            component_version = component.versioning.published
+        else:
+            component_version = component.versioning.version_num(block_version)
+
+        return component_version
+
+    def _absolute_url_for_asset(self, component_version, asset_path):
+        """
+        The full URL for a specific library asset in a ComponentVersion.
+
+        This does not check for whether the path actually exists–it just returns
+        where it would be if it did exist.
+        """
+        # This function should return absolute URLs, so we need the site root.
+        site_root_url = get_xblock_app_config().get_site_root_url()
+
+        return site_root_url + reverse(
+            'content_libraries:library-assets',
+            kwargs={
+                'component_version_uuid': component_version.uuid,
+                'asset_path': f"static/{asset_path}",
+            }
+        )
+
+    def _lookup_asset_url(self, block: XBlock, asset_path: str) -> str | None:
         """
         Return an absolute URL for the specified static asset file that may
         belong to this XBlock.
 
-        e.g. if the XBlock settings have a field value like "/static/foo.png"
-        then this method will be called with asset_path="foo.png" and should
-        return a URL like https://cdn.none/xblock/f843u89789/static/foo.png
+        e.g. if the XBlock settings have a field value like "/static/test.png"
+        then this method will be called with asset_path="test.png" and should
+        return a URL like:
+
+          http://studio.local.openedx.io:8001/library_assets/component_versions/cd31871e-a342-4c3f-ba2f-a661bf630996/static/test.png
 
         If the asset file is not recognized, return None
 
         This is called by the XBlockRuntime superclass in the .runtime module.
 
-        TODO: Implement as part of larger static asset effort.
+        Implementation Details
+        ----------------------
+        The standard XBlock "static/{asset_path}" substitution strips out the
+        leading "static/" part because it assumes that all files will exist in a
+        shared, flat namespace (i.e. a course's Files and Uploads).
+
+        Learning Core treats assets differently. Each Component has its own,
+        isolated namespace for asset storage. Furthermore, that namespace
+        contains content that are not meant to be downloadable, like the
+        block.xml (the OLX of the Component). There may one day be other files
+        that are not meant to be externally downloadable there as well, like
+        Markdown or LaTeX source files or grader code.
+
+        By convention, the static assets that we store in Learning Core and are
+        meant for download sit inside a static/ directory that is local to each
+        Component (and actually separate for each Component Version).
+
+        So the transformation looks like this:
+
+        1. The Learning Core ComponentVersion has an asset stored as
+           ``static/test.png`` in the database.
+        2. The original OLX content we store references ``/static/test.png``,
+           per OLX convention. Note the leading "/".
+        3. The ReplaceURLService XBlock runtime service invokes
+           ``static_replace`` and strips out ``/static/``.
+        4. The method we're in now is invoked with a ``static_path`` of just
+           ``test.png``, because that's the transformation that works for
+           ModuleStore-based courses, where everything is stored in the root of
+           a shared Files and Uploads space.
+        5. This method then builds a URL that re-adds the "static/" prefix, and
+           then points to the ComponentVersion-specific location for that asset.
+
+        Note: This means that the URL for a static asset will change with every
+        new version of the Component that is created, i.e. with every edit
+        that's saved–even if the asset itself doesn't change. This was the
+        tradeoff we made in order to put each version's assets in an isolated
+        space, and to make sure that we don't break things like relative links.
+        On the backend, we only store the asset once.
+
+        Performance Note
+        ----------------
+        This can theoretically get very expensive if there are many, many static
+        asset references in a Component. It's also very cacheable–we could put
+        it in a RequestCache with a key of (usage_key, version_num), and have
+        the value be the component_version.uuid and the full list of assets. I'm
+        not doing this yet in order to keep the code simpler, but I'm leaving
+        this note here in case someone needs to optimize this later.
         """
-        return None
+        component_version = self._get_component_version_from_block(block)
+
+        try:
+            content = (
+                component_version
+                .componentversioncontent_set
+                .filter(content__has_file=True)
+                .get(key=f"static/{asset_path}")
+            )
+        except ObjectDoesNotExist:
+            try:
+                # Retry with unquoted path. We don't always unquote because it would not
+                # be backwards-compatible, but we need to try both.
+                asset_path = unquote(asset_path)
+                content = (
+                    component_version
+                    .componentversioncontent_set
+                    .filter(content__has_file=True)
+                    .get(key=f"static/{asset_path}")
+                )
+            except ObjectDoesNotExist:
+                # This means we see a path that _looks_ like it should be a static
+                # asset for this Component, but that static asset doesn't really
+                # exist.
+                return None
+
+        return self._absolute_url_for_asset(component_version, asset_path)
diff --git a/openedx/core/djangoapps/xblock/runtime/runtime.py b/openedx/core/djangoapps/xblock/runtime/runtime.py
index 5746af491d10..2bf84e995417 100644
--- a/openedx/core/djangoapps/xblock/runtime/runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/runtime.py
@@ -1,9 +1,8 @@
 """
 Common base classes for all new XBlock runtimes.
 """
-from __future__ import annotations
 import logging
-from typing import Callable, Optional
+from typing import Callable, Protocol
 from urllib.parse import urljoin  # pylint: disable=import-error
 
 import crum
@@ -15,7 +14,7 @@
 from django.core.cache import cache
 from django.core.exceptions import PermissionDenied
 from eventtracking import tracker
-from opaque_keys.edx.keys import UsageKey, LearningContextKey
+from opaque_keys.edx.keys import UsageKeyV2, LearningContextKey
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.exceptions import NoSuchServiceError
@@ -38,7 +37,7 @@
 from openedx.core.types import User as UserType
 from openedx.core.djangoapps.enrollments.services import EnrollmentsService
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
-from openedx.core.djangoapps.xblock.data import StudentDataMode
+from openedx.core.djangoapps.xblock.data import AuthoredDataMode, StudentDataMode, LatestVersion
 from openedx.core.djangoapps.xblock.runtime.ephemeral_field_data import EphemeralKeyValueStore
 from openedx.core.djangoapps.xblock.runtime.mixin import LmsBlockMixin
 from openedx.core.djangoapps.xblock.utils import get_xblock_id_for_anonymous_user
@@ -63,6 +62,19 @@ def function(event_type, event):
     return function
 
 
+class GetHandlerFunction(Protocol):
+    """ Type definition for our "get handler" callback """
+    def __call__(
+        self,
+        usage_key: UsageKeyV2,
+        handler_name: str,
+        user: UserType | None,
+        *,
+        version: int | LatestVersion = LatestVersion.AUTO,
+    ) -> str:
+        ...
+
+
 class XBlockRuntime(RuntimeShim, Runtime):
     """
     This class manages one or more instantiated XBlocks for a particular user,
@@ -94,19 +106,35 @@ class XBlockRuntime(RuntimeShim, Runtime):
     # keep track of view name (student_view, studio_view, etc)
     # currently only used to track if we're in the studio_view (see below under service())
     view_name: str | None
+    # backing store for authored field data (mostly content+settings scopes)
+    authored_data_store: FieldData
 
-    def __init__(self, system: XBlockRuntimeSystem, user: UserType | None):
+    def __init__(
+        self,
+        user: UserType | None,
+        *,
+        handler_url: GetHandlerFunction,
+        student_data_mode: StudentDataMode,
+        authored_data_mode: AuthoredDataMode,
+        authored_data_store: FieldData,
+        id_reader: IdReader | None = None,
+    ):
         super().__init__(
-            id_reader=system.id_reader,
+            id_reader=id_reader or OpaqueKeyReader(),
             mixins=(
                 LmsBlockMixin,  # Adds Non-deprecated LMS/Studio functionality
                 XBlockShim,  # Adds deprecated LMS/Studio functionality / backwards compatibility
             ),
             default_class=None,
             select=None,
-            id_generator=system.id_generator,
+            id_generator=MemoryIdManager(),  # We don't really use id_generator until we need to support asides
         )
-        self.system = system
+        assert student_data_mode in (StudentDataMode.Ephemeral, StudentDataMode.Persisted)
+        self.authored_data_mode = authored_data_mode
+        self.authored_data_store = authored_data_store
+        self.children_data_store = None
+        self.student_data_mode = student_data_mode
+        self.handler_url_fn = handler_url
         self.user = user
         # self.user_id must be set as a separate attribute since base class sets it:
         if self.user is None:
@@ -126,7 +154,17 @@ def handler_url(self, block, handler_name: str, suffix='', query='', thirdparty=
         if thirdparty:
             log.warning("thirdparty handlers are not supported by this runtime for XBlock %s.", type(block))
 
-        url = self.system.handler_url(block.scope_ids.usage_id, handler_name, self.user)
+        # Note: it's important that we call handlers based on the same version of the block
+        # (draft block -> draft data available to handler; published block -> published data available to handler)
+        kwargs = {}
+        if hasattr(block, "_runtime_requested_version"):  # pylint: disable=protected-access
+            if self.authored_data_mode == AuthoredDataMode.DEFAULT_DRAFT:
+                default_version = LatestVersion.DRAFT
+            else:
+                default_version = LatestVersion.PUBLISHED
+            if block._runtime_requested_version != default_version:  # pylint: disable=protected-access
+                kwargs["version"] = block._runtime_requested_version  # pylint: disable=protected-access
+        url = self.handler_url_fn(block.usage_key, handler_name, self.user, **kwargs)
         if suffix:
             if not url.endswith('/'):
                 url += '/'
@@ -275,7 +313,7 @@ def service(self, block: XBlock, service_name: str):
             # the preview engine, and 'main' otherwise.
             # For backwards compatibility, we check the student_data_mode (Ephemeral indicates CMS) and the
             # view_name for 'studio_view.' self.view_name is set by render() below.
-            if self.system.student_data_mode == StudentDataMode.Ephemeral and self.view_name != 'studio_view':
+            if self.student_data_mode == StudentDataMode.Ephemeral and self.view_name != 'studio_view':
                 return MakoService(namespace_prefix='lms.')
             return MakoService()
         elif service_name == "i18n":
@@ -301,14 +339,12 @@ def service(self, block: XBlock, service_name: str):
             return EventPublishingService(self.user, context_key, make_track_function())
         elif service_name == 'enrollments':
             return EnrollmentsService()
+        elif service_name == 'error_tracker':
+            return make_error_tracker()
 
-        # Check if the XBlockRuntimeSystem wants to handle this:
-        service = self.system.get_service(block, service_name)
         # Otherwise, fall back to the base implementation which loads services
         # defined in the constructor:
-        if service is None:
-            service = super().service(block, service_name)
-        return service
+        return super().service(block, service_name)
 
     def _init_field_data_for_block(self, block: XBlock) -> FieldData:
         """
@@ -322,7 +358,7 @@ def _init_field_data_for_block(self, block: XBlock) -> FieldData:
             assert isinstance(self.user_id, str) and self.user_id.startswith("anon")
             kvs = EphemeralKeyValueStore()
             student_data_store = KvsFieldData(kvs)
-        elif self.system.student_data_mode == StudentDataMode.Ephemeral:
+        elif self.student_data_mode == StudentDataMode.Ephemeral:
             # We're in an environment like Studio where we want to let the
             # author test blocks out but not permanently save their state.
             kvs = EphemeralKeyValueStore()
@@ -341,10 +377,10 @@ def _init_field_data_for_block(self, block: XBlock) -> FieldData:
             student_data_store = KvsFieldData(kvs=DjangoKeyValueStore(field_data_cache))
 
         return SplitFieldData({
-            Scope.content: self.system.authored_data_store,
-            Scope.settings: self.system.authored_data_store,
-            Scope.parent: self.system.authored_data_store,
-            Scope.children: self.system.children_data_store,
+            Scope.content: self.authored_data_store,
+            Scope.settings: self.authored_data_store,
+            Scope.parent: self.authored_data_store,
+            Scope.children: self.children_data_store,
             Scope.user_state_summary: student_data_store,
             Scope.user_state: student_data_store,
             Scope.user_info: student_data_store,
@@ -407,62 +443,3 @@ def _lookup_asset_url(self, block: XBlock, asset_path: str):  # pylint: disable=
         """
         # Subclasses should override this
         return None
-
-
-class XBlockRuntimeSystem:
-    """
-    This class is essentially a factory for XBlockRuntimes. This is a
-    long-lived object which provides the behavior specific to the application
-    that wants to use XBlocks. Unlike XBlockRuntime, a single instance of this
-    class can be used with many different XBlocks, whereas each XBlock gets its
-    own instance of XBlockRuntime.
-    """
-    def __init__(
-        self,
-        handler_url: Callable[[UsageKey, str, UserType | None], str],
-        student_data_mode: StudentDataMode,
-        runtime_class: type[XBlockRuntime],
-        id_reader: Optional[IdReader] = None,
-        authored_data_store: Optional[FieldData] = None,
-    ):
-        """
-        args:
-            handler_url: A method to get URLs to call XBlock handlers. It must
-                implement this signature:
-                handler_url(
-                    usage_key: UsageKey,
-                    handler_name: str,
-                    user: User | AnonymousUser | None
-                ) -> str
-            student_data_mode: Specifies whether student data should be kept
-                in a temporary in-memory store (e.g. Studio) or persisted
-                forever in the database.
-            runtime_class: What runtime to use, e.g. LearningCoreXBlockRuntime
-        """
-        self.handler_url = handler_url
-        self.id_reader = id_reader or OpaqueKeyReader()
-        self.id_generator = MemoryIdManager()  # We don't really use id_generator until we need to support asides
-        self.runtime_class = runtime_class
-        self.authored_data_store = authored_data_store
-        self.children_data_store = None
-        assert student_data_mode in (StudentDataMode.Ephemeral, StudentDataMode.Persisted)
-        self.student_data_mode = student_data_mode
-
-    def get_runtime(self, user: UserType | None) -> XBlockRuntime:
-        """
-        Get the XBlock runtime for the specified Django user. The user can be
-        a regular user, an AnonymousUser, or None.
-        """
-        return self.runtime_class(self, user)
-
-    def get_service(self, block, service_name: str):
-        """
-        Get a runtime service
-
-        Runtime services may come from this XBlockRuntimeSystem,
-        or if this method returns None, they may come from the
-        XBlockRuntime.
-        """
-        if service_name == 'error_tracker':
-            return make_error_tracker()
-        return None  # None means see if XBlockRuntime offers this service
diff --git a/openedx/core/djangoapps/xblock/utils.py b/openedx/core/djangoapps/xblock/utils.py
index 375bb9d21450..b4ae054cf498 100644
--- a/openedx/core/djangoapps/xblock/utils.py
+++ b/openedx/core/djangoapps/xblock/utils.py
@@ -11,6 +11,10 @@
 import crum
 from django.conf import settings
 
+from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
+
+from .data import AuthoredDataMode, LatestVersion
+
 
 def get_secure_token_for_xblock_handler(user_id, block_key_str, time_idx=0):
     """
@@ -167,3 +171,18 @@ def get_xblock_id_for_anonymous_user(user):
         return current_request.session["xblock_id_for_anonymous_user"]
     else:
         raise RuntimeError("Cannot get a user ID for an anonymous user outside of an HTTP request context.")
+
+
+def get_auto_latest_version(version: int | LatestVersion) -> int | LatestVersion:
+    """
+    Gets the actual LatestVersion if is `LatestVersion.AUTO`;
+    otherwise, returns the same value.
+    """
+    if version == LatestVersion.AUTO:
+        authored_data_mode = get_xblock_app_config().get_runtime_params()["authored_data_mode"]
+        version = (
+            LatestVersion.DRAFT
+            if authored_data_mode == AuthoredDataMode.DEFAULT_DRAFT
+            else LatestVersion.PUBLISHED
+        )
+    return version
diff --git a/openedx/core/lib/cache_utils.py b/openedx/core/lib/cache_utils.py
index c379ab2d961a..a889da6130ee 100644
--- a/openedx/core/lib/cache_utils.py
+++ b/openedx/core/lib/cache_utils.py
@@ -207,7 +207,7 @@ def decorator(*args, **kwargs):  # pylint: disable=unused-argument,missing-docst
 
 def zpickle(data):
     """Given any data structure, returns a zlib compressed pickled serialization."""
-    return zlib.compress(pickle.dumps(data, 4))  # Keep this constant as we upgrade from python 2 to 3.
+    return zlib.compress(pickle.dumps(data, 4))
 
 
 def zunpickle(zdata):
diff --git a/openedx/core/lib/celery/__init__.py b/openedx/core/lib/celery/__init__.py
index 855970c1df3e..a667b467806f 100644
--- a/openedx/core/lib/celery/__init__.py
+++ b/openedx/core/lib/celery/__init__.py
@@ -23,7 +23,6 @@
 # lms.celery. See module docstring!
 APP = Celery('proj')
 
-APP.conf.task_protocol = 1
 # Using a string here means the worker will not have to
 # pickle the object when using Windows.
 APP.config_from_object('django.conf:settings')
diff --git a/openedx/core/lib/grade_utils.py b/openedx/core/lib/grade_utils.py
index 2e7073e962dc..af3d12c9e2fd 100644
--- a/openedx/core/lib/grade_utils.py
+++ b/openedx/core/lib/grade_utils.py
@@ -48,11 +48,9 @@ def is_score_higher_or_equal(earned1, possible1, earned2, possible2, treat_undef
 def round_away_from_zero(number, digits=0):
     """
     Round numbers using the 'away from zero' strategy as opposed to the
-    'Banker's rounding strategy.'  The strategy refers to how we round when
-    a number is half way between two numbers.  eg. 0.5, 1.5, etc. In python 2
-    positive numbers in this category would be rounded up and negative numbers
-    would be rounded down. ie. away from zero.  In python 3 numbers round
-    towards even.  So 0.5 would round to 0 but 1.5 would round to 2.
+    'Banker's rounding strategy.' The strategy refers to how we round when
+    a number is half way between two numbers.  eg. 0.5, 1.5, etc. In python 3
+    numbers round towards even. So 0.5 would round to 0 but 1.5 would round to 2.
 
     See here for more on floating point rounding strategies:
     https://en.wikipedia.org/wiki/IEEE_754#Rounding_rules
diff --git a/openedx/core/lib/xblock_serializer/api.py b/openedx/core/lib/xblock_serializer/api.py
index 8ac1cd5717c3..f9ded3dbc55b 100644
--- a/openedx/core/lib/xblock_serializer/api.py
+++ b/openedx/core/lib/xblock_serializer/api.py
@@ -2,7 +2,7 @@
 Public python API for serializing XBlocks to OLX
 """
 # pylint: disable=unused-import
-from .block_serializer import StaticFile, XBlockSerializer, XBlockSerializerForLearningCore
+from .block_serializer import StaticFile, XBlockSerializer
 
 
 def serialize_xblock_to_olx(block):
@@ -10,6 +10,9 @@ def serialize_xblock_to_olx(block):
     This class will serialize an XBlock, producing:
         (1) an XML string defining the XBlock and all of its children (inline)
         (2) a list of any static files required by the XBlock and their URL
+
+    This calls XBlockSerializer with all default options. To actually tweak the
+    output, instantiate XBlockSerializer directly.
     """
     return XBlockSerializer(block)
 
@@ -29,4 +32,4 @@ def serialize_modulestore_block_for_learning_core(block):
     we have around how we should rewrite this (e.g. are we going to
     remove <xblock-include>?).
     """
-    return XBlockSerializerForLearningCore(block)
+    return XBlockSerializer(block, write_url_name=False)
diff --git a/openedx/core/lib/xblock_serializer/block_serializer.py b/openedx/core/lib/xblock_serializer/block_serializer.py
index 966380f25061..53be26937d4a 100644
--- a/openedx/core/lib/xblock_serializer/block_serializer.py
+++ b/openedx/core/lib/xblock_serializer/block_serializer.py
@@ -22,34 +22,50 @@ class XBlockSerializer:
     static_files: list[StaticFile]
     tags: TagValuesByObjectIdDict
 
-    def __init__(self, block):
+    def __init__(self, block, write_url_name=True, fetch_asset_data=False):
         """
         Serialize an XBlock to an OLX string + supporting files, and store the
         resulting data in this object.
         """
+        self.write_url_name = write_url_name
+
         self.orig_block_key = block.scope_ids.usage_id
         self.static_files = []
         self.tags = {}
         olx_node = self._serialize_block(block)
+
         self.olx_str = etree.tostring(olx_node, encoding="unicode", pretty_print=True)
 
         course_key = self.orig_block_key.course_key
         # Search the OLX for references to files stored in the course's
         # "Files & Uploads" (contentstore):
         self.olx_str = utils.rewrite_absolute_static_urls(self.olx_str, course_key)
-        for asset in utils.collect_assets_from_text(self.olx_str, course_key):
-            path = asset['path']
-            if path not in [sf.name for sf in self.static_files]:
-                self.static_files.append(StaticFile(name=path, url=asset['url'], data=None))
 
-        if block.scope_ids.usage_id.block_type in ['problem', 'vertical']:
-            py_lib_zip_file = utils.get_python_lib_zip_if_using(self.olx_str, course_key)
-            if py_lib_zip_file:
-                self.static_files.append(py_lib_zip_file)
-
-            js_input_files = utils.get_js_input_files_if_using(self.olx_str, course_key)
-            for js_input_file in js_input_files:
-                self.static_files.append(js_input_file)
+        runtime_supports_explicit_assets = hasattr(block.runtime, 'get_block_assets')
+        if runtime_supports_explicit_assets:
+            # If a block supports explicitly tracked assets, things are simple.
+            # Learning Core backed content supports this, which currently means
+            # v2 Content Libraries.
+            self.static_files.extend(
+                block.runtime.get_block_assets(block, fetch_asset_data)
+            )
+        else:
+            # Otherwise, we have to scan the content to extract associated asset
+            # by inference. This is what we have to do for Modulestore-backed
+            # courses, which store files a course-global "Files and Uploads".
+            for asset in utils.collect_assets_from_text(self.olx_str, course_key):
+                path = asset['path']
+                if path not in [sf.name for sf in self.static_files]:
+                    self.static_files.append(StaticFile(name=path, url=asset['url'], data=None))
+
+            if block.scope_ids.usage_id.block_type in ['problem', 'vertical']:
+                py_lib_zip_file = utils.get_python_lib_zip_if_using(self.olx_str, course_key)
+                if py_lib_zip_file:
+                    self.static_files.append(py_lib_zip_file)
+
+                js_input_files = utils.get_js_input_files_if_using(self.olx_str, course_key)
+                for js_input_file in js_input_files:
+                    self.static_files.append(js_input_file)
 
     def _serialize_block(self, block) -> etree.Element:
         """ Serialize an XBlock to OLX/XML. """
@@ -58,6 +74,12 @@ def _serialize_block(self, block) -> etree.Element:
         else:
             olx = self._serialize_normal_block(block)
 
+        # The url_name attribute can come either because it was already in the
+        # block's field data, or because this class adds it in the calls above.
+        # However it gets set though, we can remove it here:
+        if not self.write_url_name:
+            olx.attrib.pop("url_name", None)
+
         # Store the block's tags
         block_key = block.scope_ids.usage_id
         block_id = str(block_key)
@@ -133,79 +155,5 @@ def _serialize_html_block(self, block) -> etree.Element:
 
         # Escape any CDATA special chars
         escaped_block_data = block.data.replace("]]>", "]]&gt;")
-        olx_node.text = etree.CDATA("\n" + escaped_block_data + "\n")
-        return olx_node
-
-
-class XBlockSerializerForLearningCore(XBlockSerializer):
-    """
-    This class will serialize an XBlock, producing:
-        (1) A new definition ID for use in Learning Core
-        (2) an XML string defining the XBlock and referencing the IDs of its
-            children using <xblock-include /> syntax (which doesn't actually
-            contain the OLX of its children, just refers to them, so you have to
-            separately serialize them.)
-        (3) a list of any static files required by the XBlock and their URL
-    """
-
-    def __init__(self, block):
-        """
-        Serialize an XBlock to an OLX string + supporting files, and store the
-        resulting data in this object.
-        """
-        super().__init__(block)
-        self.def_id = utils.learning_core_def_key_from_modulestore_usage_key(self.orig_block_key)
-
-    def _serialize_block(self, block) -> etree.Element:
-        """ Serialize an XBlock to OLX/XML. """
-        olx_node = super()._serialize_block(block)
-        # Apply some transformations to the OLX:
-        self._transform_olx(olx_node, usage_id=block.scope_ids.usage_id)
+        olx_node.text = etree.CDATA(escaped_block_data)
         return olx_node
-
-    def _serialize_children(self, block, parent_olx_node):
-        """
-        Recursively serialize the children of XBlock 'block'.
-        Subclasses may override this.
-        """
-        for child_id in block.children:
-            # In modulestore, the "definition key" is a MongoDB ObjectID
-            # kept in split's definitions table, which theoretically allows
-            # the same block to be used in many places (each with a unique
-            # usage key). However, that functionality is not exposed in
-            # Studio (other than via content libraries). So when we import
-            # into Learning Core, we assume that each usage is unique, don't
-            # generate a usage key, and create a new "definition key" from
-            # the original usage key.
-            # So modulestore usage key
-            #     block-v1:A+B+C+type@html+block@introduction
-            # will become Learning Core definition key
-            #     html+introduction
-            #
-            # If we needed the real definition key, we could get it via
-            #     child = block.runtime.get_block(child_id)
-            #     child_def_id = str(child.scope_ids.def_id)
-            # and then use
-            #     <xblock-include definition={child_def_id} usage={child_id.block_id} />
-            def_id = utils.learning_core_def_key_from_modulestore_usage_key(child_id)
-            parent_olx_node.append(parent_olx_node.makeelement("xblock-include", {"definition": def_id}))
-
-    def _transform_olx(self, olx_node, usage_id):
-        """
-        Apply transformations to the given OLX etree Node.
-        """
-        # Remove 'url_name' - we store the definition key in the folder name
-        # that holds the OLX and the usage key elsewhere, so specifying it
-        # within the OLX file is redundant and can lead to issues if the file is
-        # copied and pasted elsewhere in the bundle with a new definition key.
-        olx_node.attrib.pop('url_name', None)
-        # Convert <vertical> to the new <unit> tag/block
-        if olx_node.tag == 'vertical':
-            olx_node.tag = 'unit'
-            for key in olx_node.attrib.keys():
-                if key not in ('display_name', 'url_name'):
-                    log.warning(
-                        '<vertical> tag attribute "%s" will be ignored after conversion to <unit> (in %s)',
-                        key,
-                        str(usage_id)
-                    )
diff --git a/openedx/core/lib/xblock_serializer/test_api.py b/openedx/core/lib/xblock_serializer/test_api.py
index 8078595b0ea9..d82a51bd73fc 100644
--- a/openedx/core/lib/xblock_serializer/test_api.py
+++ b/openedx/core/lib/xblock_serializer/test_api.py
@@ -144,7 +144,8 @@ def test_html_with_static_asset_learning_core(self):
         serialized_learning_core = api.serialize_modulestore_block_for_learning_core(html_block)
         self.assertXmlEqual(
             serialized_learning_core.olx_str,
-            # For learning core, OLX should never contain "url_name" as that ID is specified by the filename:
+            # For learning core, OLX should never contain "url_name" as that ID
+            # is specified by the Component key:
             """
             <html display_name="Text"><![CDATA[
                 <img src="/static/foo_bar.jpg" />
@@ -154,8 +155,6 @@ def test_html_with_static_asset_learning_core(self):
         self.assertIn("CDATA", serialized.olx_str)
         # Static files should be identical:
         self.assertEqual(serialized.static_files, serialized_learning_core.static_files)
-        # This is the only other difference - an extra field with the learning-core-specific definition ID:
-        self.assertEqual(serialized_learning_core.def_id, "html/just_img")
 
     def test_html_with_fields(self):
         """ Test an HTML Block with non-default fields like editor='raw' """
@@ -193,28 +192,6 @@ def test_export_sequential(self):
 
         self.assertXmlEqual(serialized.olx_str, EXPECTED_SEQUENTIAL_OLX)
 
-    def test_export_sequential_learning_core(self):
-        """
-        Export a sequential from the toy course, formatted for learning core.
-        """
-        sequential_id = self.course.id.make_usage_key('sequential', 'Toy_Videos')  # see sample_courses.py
-        sequential = modulestore().get_item(sequential_id)
-        serialized = api.serialize_modulestore_block_for_learning_core(sequential)
-
-        self.assertXmlEqual(serialized.olx_str, """
-            <sequential display_name="Toy Videos" format="Lecture Sequence">
-                <xblock-include definition="html/secret:toylab"/>
-                <xblock-include definition="html/toyjumpto"/>
-                <xblock-include definition="html/toyhtml"/>
-                <xblock-include definition="html/nonportable"/>
-                <xblock-include definition="html/nonportable_link"/>
-                <xblock-include definition="html/badlink"/>
-                <xblock-include definition="html/with_styling"/>
-                <xblock-include definition="html/just_img"/>
-                <xblock-include definition="video/Video_Resources"/>
-            </sequential>
-        """)
-
     def test_capa_python_lib(self):
         """ Test capa problem blocks with and without python_lib.zip """
         course = CourseFactory.create(display_name='Python Testing course', run="PY")
diff --git a/openedx/core/lib/xblock_utils/__init__.py b/openedx/core/lib/xblock_utils/__init__.py
index 26127dbfb3b8..a8b76541b6e5 100644
--- a/openedx/core/lib/xblock_utils/__init__.py
+++ b/openedx/core/lib/xblock_utils/__init__.py
@@ -452,7 +452,7 @@ def xblock_resource_pkg(block):
        ProblemBlock, and most other built-in blocks currently. Handling for these
        assets does not interact with this function.
     2. The (preferred) standard XBlock runtime resource loading system, used by
-       LibraryContentBlock. Handling for these assets *does* interact with this
+       LegacyLibraryContentBlock. Handling for these assets *does* interact with this
        function.
 
     We hope to migrate to (2) eventually, tracked by:
diff --git a/openedx/core/types/http.py b/openedx/core/types/http.py
new file mode 100644
index 000000000000..2896256a107a
--- /dev/null
+++ b/openedx/core/types/http.py
@@ -0,0 +1,45 @@
+"""
+Typing utilities for the HTTP requests, responses, etc.
+
+Includes utilties to work with both vanilla django as well as djangorestframework.
+"""
+from __future__ import annotations
+
+import django.contrib.auth.models  # pylint: disable=imported-auth-user
+import django.http
+import rest_framework.request
+
+import openedx.core.types.user
+from openedx.core.types.meta import type_annotation_only
+
+
+@type_annotation_only
+class HttpRequest(django.http.HttpRequest):
+    """
+    A request which either has a concrete User (from django.contrib.auth) or is anonymous.
+    """
+    user: openedx.core.types.User
+
+
+@type_annotation_only
+class AuthenticatedHttpRequest(HttpRequest):
+    """
+    A request which is guaranteed to have a concrete User (from django.contrib.auth).
+    """
+    user: django.contrib.auth.models.User
+
+
+@type_annotation_only
+class RestRequest(rest_framework.request.Request):
+    """
+    Same as HttpRequest, but extended for rest_framework views.
+    """
+    user: openedx.core.types.User
+
+
+@type_annotation_only
+class AuthenticatedRestRequest(RestRequest):
+    """
+    Same as AuthenticatedHttpRequest, but extended for rest_framework views.
+    """
+    user: django.contrib.auth.models.User
diff --git a/openedx/core/types/meta.py b/openedx/core/types/meta.py
new file mode 100644
index 000000000000..39162b05b879
--- /dev/null
+++ b/openedx/core/types/meta.py
@@ -0,0 +1,37 @@
+"""
+Typing utilities for use on other typing utilities.
+"""
+from __future__ import annotations
+
+import typing as t
+
+
+def type_annotation_only(cls: type) -> type:
+    """
+    Decorates class which should only be used in type annotations.
+
+    This is useful when you want to enhance an existing 3rd-party concrete class with
+    type annotations for its members, but don't want the enhanced class to ever actually
+    be instantiated. For examples, see openedx.core.types.http.
+    """
+    if t.TYPE_CHECKING:
+        return cls
+    return _forbid_init(cls)
+
+
+def _forbid_init(forbidden: type) -> type:
+    """
+    Return a class which refuses to be instantiated.
+    """
+    class _ForbidInit:
+        """
+        The resulting class.
+        """
+        def __init__(self, *args, **kwargs):
+            raise NotImplementedError(
+                f"Class {forbidden.__module__}:{forbidden.__name__} "
+                "cannot be instantiated. You may use it as a type annotation, but objects "
+                "can only be created from its concrete superclasses."
+            )
+
+    return _ForbidInit
diff --git a/openedx/core/types/user.py b/openedx/core/types/user.py
index 95b1fec607fc..9eb63edba358 100644
--- a/openedx/core/types/user.py
+++ b/openedx/core/types/user.py
@@ -1,8 +1,10 @@
 """
 Typing utilities for the User models.
 """
-from typing import Union
+from __future__ import annotations
+
+import typing as t
 
 import django.contrib.auth.models
 
-User = Union[django.contrib.auth.models.User, django.contrib.auth.models.AnonymousUser]
+User: t.TypeAlias = django.contrib.auth.models.User | django.contrib.auth.models.AnonymousUser
diff --git a/openedx/features/announcements/apps.py b/openedx/features/announcements/apps.py
deleted file mode 100644
index 4bf964cae51b..000000000000
--- a/openedx/features/announcements/apps.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Announcements Application Configuration
-"""
-
-
-from django.apps import AppConfig
-from edx_django_utils.plugins import PluginURLs, PluginSettings
-
-from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
-
-
-class AnnouncementsConfig(AppConfig):
-    """
-    Application Configuration for Announcements
-    """
-    name = 'openedx.features.announcements'
-
-    plugin_app = {
-        PluginURLs.CONFIG: {
-            ProjectType.LMS: {
-                PluginURLs.NAMESPACE: 'announcements',
-                PluginURLs.REGEX: '^announcements/',
-                PluginURLs.RELATIVE_PATH: 'urls',
-            }
-        },
-        PluginSettings.CONFIG: {
-            ProjectType.LMS: {
-                SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: 'settings.common'},
-                SettingsType.TEST: {PluginSettings.RELATIVE_PATH: 'settings.test'},
-            }
-        }
-    }
diff --git a/openedx/features/announcements/forms.py b/openedx/features/announcements/forms.py
deleted file mode 100644
index 879101ca37d0..000000000000
--- a/openedx/features/announcements/forms.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Forms for the Announcement Editor
-"""
-
-
-from django import forms
-
-from .models import Announcement
-
-
-class AnnouncementForm(forms.ModelForm):
-    """
-    Form for editing Announcements
-    """
-    content = forms.CharField(widget=forms.Textarea, label='', required=False)
-    active = forms.BooleanField(initial=True, required=False)
-
-    class Meta:
-        model = Announcement
-        fields = ['content', 'active']
diff --git a/openedx/features/announcements/models.py b/openedx/features/announcements/models.py
deleted file mode 100644
index cb202ce521ba..000000000000
--- a/openedx/features/announcements/models.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-Models for Announcements
-"""
-
-
-from django.db import models
-
-
-class Announcement(models.Model):
-    """Site-wide announcements to be displayed on the dashboard"""
-    class Meta:
-        app_label = 'announcements'
-
-    content = models.CharField(max_length=1000, null=False, default="lorem ipsum")
-    active = models.BooleanField(default=True)
-
-    def __str__(self):
-        return self.content
diff --git a/openedx/features/announcements/settings/__init__.py b/openedx/features/announcements/settings/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/features/announcements/settings/common.py b/openedx/features/announcements/settings/common.py
deleted file mode 100644
index 1a1a5ca497ab..000000000000
--- a/openedx/features/announcements/settings/common.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""Common settings for Announcements"""
-
-
-def plugin_settings(settings):
-    """
-    Common settings for Announcements
-    .. toggle_name: FEATURES['ENABLE_ANNOUNCEMENTS']
-    .. toggle_implementation: SettingDictToggle
-    .. toggle_default: False
-    .. toggle_description: This feature can be enabled to show system wide announcements
-       on the sidebar of the learner dashboard. Announcements can be created by Global Staff
-       users on maintenance dashboard of studio. Maintenance dashboard can accessed at
-       https://{studio.domain}/maintenance
-    .. toggle_warning: TinyMCE is needed to show an editor in the studio.
-    .. toggle_use_cases: open_edx
-    .. toggle_creation_date: 2017-11-08
-    .. toggle_tickets: https://github.com/openedx/edx-platform/pull/16496
-    """
-    settings.FEATURES['ENABLE_ANNOUNCEMENTS'] = False
-    # Configure number of announcements to show per page
-    settings.FEATURES['ANNOUNCEMENTS_PER_PAGE'] = 5
diff --git a/openedx/features/announcements/settings/test.py b/openedx/features/announcements/settings/test.py
deleted file mode 100644
index 47d57ca3dcbf..000000000000
--- a/openedx/features/announcements/settings/test.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Test settings for Announcements"""
-
-
-def plugin_settings(settings):
-    """
-    Test settings for Announcements
-    """
-    settings.FEATURES['ENABLE_ANNOUNCEMENTS'] = True
diff --git a/openedx/features/announcements/static/announcements/jsx/Announcements.jsx b/openedx/features/announcements/static/announcements/jsx/Announcements.jsx
deleted file mode 100644
index 9d370883352c..000000000000
--- a/openedx/features/announcements/static/announcements/jsx/Announcements.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-// eslint-disable-next-line max-classes-per-file
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import {Button} from '@edx/paragon';
-import $ from 'jquery';
-
-class AnnouncementSkipLink extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            count: 0
-        };
-        $.get('/announcements/page/1')
-            .then(data => {
-                this.setState({
-                    count: data.count
-                });
-            });
-    }
-
-    render() {
-        return (<div>{'Skip to list of ' + this.state.count + ' announcements'}</div>);
-    }
-}
-
-// eslint-disable-next-line react/prefer-stateless-function
-class Announcement extends React.Component {
-    render() {
-        return (
-            <div
-                className="announcement"
-                // eslint-disable-next-line react/no-danger
-                dangerouslySetInnerHTML={{__html: this.props.content}}
-            />
-        );
-    }
-}
-
-Announcement.propTypes = {
-    content: PropTypes.string.isRequired,
-};
-
-class AnnouncementList extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            page: 1,
-            announcements: [],
-            // eslint-disable-next-line react/no-unused-state
-            num_pages: 0,
-            has_prev: false,
-            has_next: false,
-            start_index: 0,
-            end_index: 0,
-        };
-    }
-
-    retrievePage(page) {
-        $.get('/announcements/page/' + page)
-            .then(data => {
-                this.setState({
-                    announcements: data.announcements,
-                    has_next: data.next,
-                    has_prev: data.prev,
-                    // eslint-disable-next-line react/no-unused-state
-                    num_pages: data.num_pages,
-                    count: data.count,
-                    start_index: data.start_index,
-                    end_index: data.end_index,
-                    page: page
-                });
-            });
-    }
-
-    renderPrevPage() {
-        this.retrievePage(this.state.page - 1);
-    }
-
-    renderNextPage() {
-        this.retrievePage(this.state.page + 1);
-    }
-
-    // eslint-disable-next-line react/no-deprecated, react/sort-comp
-    componentWillMount() {
-        this.retrievePage(this.state.page);
-    }
-
-    render() {
-        var children = this.state.announcements.map(
-            // eslint-disable-next-line react/no-array-index-key
-            (announcement, index) => <Announcement key={index} content={announcement.content} />
-        );
-        if (this.state.has_prev) {
-            var prev_button = (
-                <div>
-                    <Button
-                        className={['announcement-button', 'prev']}
-                        onClick={() => this.renderPrevPage()}
-                        label="← previous"
-                    />
-                    <span className="sr-only">{this.state.start_index + ' - ' + this.state.end_index + ') of ' + this.state.count}</span>
-                </div>
-            );
-        }
-        if (this.state.has_next) {
-            var next_button = (
-                <div>
-                    <Button
-                        className={['announcement-button', 'next']}
-                        onClick={() => this.renderNextPage()}
-                        label="next →"
-                    />
-                    <span className="sr-only">{this.state.start_index + ' - ' + this.state.end_index + ') of ' + this.state.count}</span>
-                </div>
-            );
-        }
-        return (
-            <div className="announcements-list">
-                {children}
-                {prev_button}
-                {next_button}
-            </div>
-        );
-    }
-}
-
-export default class AnnouncementsView {
-    constructor() {
-        ReactDOM.render(
-            <AnnouncementList />,
-            document.getElementById('announcements'),
-        );
-        ReactDOM.render(
-            <AnnouncementSkipLink />,
-            document.getElementById('announcements-skip'),
-        );
-    }
-}
-
-export {AnnouncementsView, AnnouncementList, AnnouncementSkipLink};
diff --git a/openedx/features/announcements/static/announcements/jsx/Announcements.test.jsx b/openedx/features/announcements/static/announcements/jsx/Announcements.test.jsx
deleted file mode 100644
index 3ec55f392889..000000000000
--- a/openedx/features/announcements/static/announcements/jsx/Announcements.test.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import testAnnouncements from './test-announcements.json';
-
-import {AnnouncementSkipLink, AnnouncementList} from './Announcements';
-
-describe('Announcements component', () => {
-    test('render skip link', () => {
-        const component = renderer.create(
-            <AnnouncementSkipLink />,
-        );
-        component.root.instance.setState({count: 10});
-        const tree = component.toJSON();
-        expect(tree).toMatchSnapshot();
-    });
-
-    test('render test announcements', () => {
-        const component = renderer.create(
-            <AnnouncementList />,
-        );
-        component.root.instance.setState(testAnnouncements);
-        const tree = component.toJSON();
-        expect(tree).toMatchSnapshot();
-    });
-});
diff --git a/openedx/features/announcements/static/announcements/jsx/__snapshots__/Announcements.test.jsx.snap b/openedx/features/announcements/static/announcements/jsx/__snapshots__/Announcements.test.jsx.snap
deleted file mode 100644
index 70eb30a812d7..000000000000
--- a/openedx/features/announcements/static/announcements/jsx/__snapshots__/Announcements.test.jsx.snap
+++ /dev/null
@@ -1,78 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Announcements component render skip link 1`] = `
-<div>
-  Skip to list of 10 announcements
-</div>
-`;
-
-exports[`Announcements component render test announcements 1`] = `
-<div
-  className="announcements-list"
->
-  <div
-    className="announcement"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "Test Announcement 1",
-      }
-    }
-  />
-  <div
-    className="announcement"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "Bold <b>Announcement 2</b>",
-      }
-    }
-  />
-  <div
-    className="announcement"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "Test Announcement 3",
-      }
-    }
-  />
-  <div
-    className="announcement"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "Test Announcement 4",
-      }
-    }
-  />
-  <div
-    className="announcement"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "Test Announcement 5",
-      }
-    }
-  />
-  <div
-    className="announcement"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "Test Announcement 6",
-      }
-    }
-  />
-  <div>
-    <button
-      className="announcement-button next btn"
-      onBlur={[Function]}
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      type="button"
-    >
-      next →
-    </button>
-    <span
-      className="sr-only"
-    >
-      1 - 5) of 6
-    </span>
-  </div>
-</div>
-`;
diff --git a/openedx/features/announcements/static/announcements/jsx/test-announcements.json b/openedx/features/announcements/static/announcements/jsx/test-announcements.json
deleted file mode 100644
index d23d39303020..000000000000
--- a/openedx/features/announcements/static/announcements/jsx/test-announcements.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "announcements": [
-    {"content": "Test Announcement 1"},
-    {"content": "Bold <b>Announcement 2</b>"},
-    {"content": "Test Announcement 3"},
-    {"content": "Test Announcement 4"},
-    {"content": "Test Announcement 5"},
-    {"content": "Test Announcement 6"}
-  ],
-  "has_next": true,
-  "has_prev": false,
-  "num_pages": 2,
-  "count": 6,
-  "start_index": 1,
-  "end_index": 5,
-  "page": 1
-}
diff --git a/openedx/features/announcements/tests/__init__.py b/openedx/features/announcements/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/features/announcements/tests/test_announcements.py b/openedx/features/announcements/tests/test_announcements.py
deleted file mode 100644
index 10c608b4a6cd..000000000000
--- a/openedx/features/announcements/tests/test_announcements.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""
-Unit tests for the announcements feature.
-"""
-
-import json
-from unittest.mock import patch
-
-from django.conf import settings
-from django.test import TestCase
-from django.test.client import Client
-from django.urls import reverse
-
-from common.djangoapps.student.tests.factories import AdminFactory
-from openedx.core.djangolib.testing.utils import skip_unless_lms
-from openedx.features.announcements.models import Announcement
-
-TEST_ANNOUNCEMENTS = [
-    ("Active Announcement", True),
-    ("Inactive Announcement", False),
-    ("Another Test Announcement", True),
-    ("<strong>Formatted Announcement</strong>", True),
-    ("<a>Other Formatted Announcement</a>", True),
-]
-
-
-@skip_unless_lms
-class TestGlobalAnnouncements(TestCase):
-    """
-    Test Announcements in LMS
-    """
-
-    @classmethod
-    def setUpTestData(cls):
-        super().setUpTestData()
-        Announcement.objects.bulk_create([
-            Announcement(content=content, active=active)
-            for content, active in TEST_ANNOUNCEMENTS
-        ])
-
-    def setUp(self):
-        super().setUp()
-        self.client = Client()
-        self.admin = AdminFactory.create(
-            email='staff@edx.org',
-            username='admin',
-            password='pass'
-        )
-        self.client.login(username=self.admin.username, password='pass')
-
-    @patch.dict(settings.FEATURES, {'ENABLE_ANNOUNCEMENTS': False})
-    def test_feature_flag_disabled(self):
-        """Ensures that the default settings effectively disables the feature"""
-        response = self.client.get('/dashboard')
-        self.assertNotContains(response, 'AnnouncementsView')
-        self.assertNotContains(response, '<div id="announcements"')
-
-    def test_feature_flag_enabled(self):
-        """Ensures that enabling the flag, enables the feature"""
-        response = self.client.get('/dashboard')
-        self.assertContains(response, 'AnnouncementsView')
-
-    def test_pagination(self):
-        url = reverse("announcements:page", kwargs={"page": 1})
-        response = self.client.get(url)
-        data = json.loads(response.content.decode('utf-8'))
-        assert data['num_pages'] == 1
-        ## double the number of announcements to verify the number of pages increases
-        self.setUpTestData()
-        response = self.client.get(url)
-        data = json.loads(response.content.decode('utf-8'))
-        assert data['num_pages'] == 2
-
-    def test_active(self):
-        """
-        Ensures that active announcements are visible on the dashboard
-        """
-        url = reverse("announcements:page", kwargs={"page": 1})
-        response = self.client.get(url)
-        self.assertContains(response, "Active Announcement")
-
-    def test_inactive(self):
-        """
-        Ensures that inactive announcements aren't visible on the dashboard
-        """
-        url = reverse("announcements:page", kwargs={"page": 1})
-        response = self.client.get(url)
-        self.assertNotContains(response, "Inactive Announcement")
-
-    def test_formatted(self):
-        """
-        Ensures that formatting in announcements is rendered properly
-        """
-        url = reverse("announcements:page", kwargs={"page": 1})
-        response = self.client.get(url)
-        self.assertContains(response, "<strong>Formatted Announcement</strong>")
diff --git a/openedx/features/announcements/urls.py b/openedx/features/announcements/urls.py
deleted file mode 100644
index 0f0ad3a33960..000000000000
--- a/openedx/features/announcements/urls.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-Defines URLs for announcements in the LMS.
-"""
-from django.contrib.auth.decorators import login_required
-from django.urls import path
-
-from .views import AnnouncementsJSONView
-
-urlpatterns = [
-    path('page/<int:page>', login_required(AnnouncementsJSONView.as_view()),
-         name='page',
-         ),
-]
diff --git a/openedx/features/announcements/views.py b/openedx/features/announcements/views.py
deleted file mode 100644
index b6657c29cc12..000000000000
--- a/openedx/features/announcements/views.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-Views to show announcements.
-"""
-
-
-from django.conf import settings
-from django.http import JsonResponse
-from django.views.generic.list import ListView
-
-from .models import Announcement
-
-
-class AnnouncementsJSONView(ListView):
-    """
-    View returning a page of announcements for the dashboard
-    """
-    model = Announcement
-    object_list = Announcement.objects.filter(active=True)
-    paginate_by = settings.FEATURES.get('ANNOUNCEMENTS_PER_PAGE', 5)
-
-    def get(self, request, *args, **kwargs):
-        """
-        Return active announcements as json
-        """
-        context = self.get_context_data()
-
-        announcements = [{"content": announcement.content} for announcement in context['object_list']]
-        result = {
-            "announcements": announcements,
-            "next": context['page_obj'].has_next(),
-            "prev": context['page_obj'].has_previous(),
-            "start_index": context['page_obj'].start_index(),
-            "end_index": context['page_obj'].end_index(),
-            "count": context['paginator'].count,
-            "num_pages": context['paginator'].num_pages,
-        }
-        return JsonResponse(result)
diff --git a/openedx/features/content_type_gating/partitions.py b/openedx/features/content_type_gating/partitions.py
index 5f48ab609133..61851ec43bbd 100644
--- a/openedx/features/content_type_gating/partitions.py
+++ b/openedx/features/content_type_gating/partitions.py
@@ -91,7 +91,7 @@ def access_denied_fragment(self, block, user, user_group, allowed_groups):
         if expiration_datetime and expiration_datetime < datetime.datetime.now(pytz.UTC):
             ecommerce_checkout_link = None
         else:
-            ecommerce_checkout_link = self._get_checkout_link(user, verified_mode.sku)
+            ecommerce_checkout_link = self._get_checkout_link(user, verified_mode.sku, str(course_key))
 
         request = crum.get_current_request()
 
@@ -118,11 +118,11 @@ def access_denied_message(self, block_key, user, user_group, allowed_groups):
         else:
             return _("Graded assessments are available to Verified Track learners. Upgrade to Unlock.")
 
-    def _get_checkout_link(self, user, sku):
+    def _get_checkout_link(self, user, sku, course_run_key):
         ecomm_service = EcommerceService()
         ecommerce_checkout = ecomm_service.is_enabled(user)
         if ecommerce_checkout and sku:
-            return ecomm_service.get_checkout_page_url(sku) or ''
+            return ecomm_service.get_checkout_page_url(sku, course_run_keys=[course_run_key]) or ''
 
     def _get_course_key_from_course_block(self, block):
         """
diff --git a/openedx/features/course_bookmarks/static/course_bookmarks/js/models/bookmark.js b/openedx/features/course_bookmarks/static/course_bookmarks/js/models/bookmark.js
index 13671bddf56a..9ad45a5422ce 100644
--- a/openedx/features/course_bookmarks/static/course_bookmarks/js/models/bookmark.js
+++ b/openedx/features/course_bookmarks/static/course_bookmarks/js/models/bookmark.js
@@ -1,20 +1,37 @@
 (function(define) {
-    'use strict';
+  'use strict';
 
-    define(['backbone'], function(Backbone) {
-        return Backbone.Model.extend({
-            idAttribute: 'id',
-            defaults: {
-                course_id: '',
-                usage_id: '',
-                display_name: '',
-                path: [],
-                created: ''
-            },
+  define(['backbone'], function(Backbone) {
+    return Backbone.Model.extend({
+      idAttribute: 'id',
+      defaults: {
+        course_id: '',
+        usage_id: '',
+        display_name: '',
+        path: [],
+        created: ''
+      },
 
-            blockUrl: function() {
-                return '/courses/' + this.get('course_id') + '/jump_to/' + this.get('usage_id');
-            }
-        });
+      blockUrl: function() {
+        var path = this.get('path');
+        var url = '/courses/' + this.get('course_id') + '/jump_to/' + this.get('usage_id');
+        var params = new URLSearchParams();
+        var usage_id = this.get('usage_id');
+        // Confirm that current usage_id does not correspond to current unit
+        // path contains an array of parent blocks to the bookmarked block.
+        // Units only have two parents i.e. section and subsections.
+        // Below condition is only satisfied if a block lower than unit is bookmarked.
+        if (path.length > 2 && usage_id !== path[path.length - 1]) {
+          params.append('jumpToId', usage_id);
+        }
+        if (params.size > 0) {
+          // Pass nested block details via query parameters for it to be passed to learning mfe
+          // The learning mfe should pass it back to unit xblock via iframe url params.
+          // This would allow us to scroll to the child xblock.
+          url = url + '?' + params.toString();
+        }
+        return url;
+      }
     });
+  });
 }(define || RequireJS.define));
diff --git a/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js b/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js
index 838f631868dc..3612038842c5 100644
--- a/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js
+++ b/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js
@@ -20,6 +20,12 @@
                     this.bookmarkId = options.bookmarkId;
                     this.bookmarked = options.bookmarked;
                     this.usageId = options.usageId;
+                    if (options.bookmarkedText) {
+                        this.bookmarkedText = options.bookmarkedText;
+                    }
+                    if (options.bookmarkText) {
+                        this.bookmarkText = options.bookmarkText;
+                    }
                     this.setBookmarkState(this.bookmarked);
                 },
 
diff --git a/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmarks_list.js b/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmarks_list.js
index 52f5fbd74c1e..55dd1bd58ae5 100644
--- a/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmarks_list.js
+++ b/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmarks_list.js
@@ -78,9 +78,7 @@
                         component_type: componentType,
                         component_usage_id: componentUsageId
                     }
-                ).always(function() {
-                    window.location.href = event.currentTarget.pathname;
-                });
+                );
             },
 
             /**
diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py
index f8a662709ee7..a45d863e09c5 100644
--- a/openedx/features/course_experience/__init__.py
+++ b/openedx/features/course_experience/__init__.py
@@ -34,6 +34,16 @@
 # .. toggle_warning: This temporary feature toggle does not have a target removal date.
 ENABLE_COURSE_GOALS = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_course_goals', __name__)  # lint-amnesty, pylint: disable=toggle-missing-annotation
 
+# .. toggle_name: course_experience.enable_ses_for_goalreminder
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Used to determine whether or not to use AWS SES to send goal reminder emails for the course.
+# .. toggle_use_cases: opt_in, temporary
+# .. toggle_creation_date: 2024-10-06
+# .. toggle_target_removal_date: None
+# .. toggle_warning: This temporary feature toggle does not have a target removal date.
+ENABLE_SES_FOR_GOALREMINDER = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_ses_for_goalreminder', __name__)  # lint-amnesty, pylint: disable=toggle-missing-annotation
+
 # Waffle flag to enable anonymous access to a course
 SEO_WAFFLE_FLAG_NAMESPACE = 'seo'
 COURSE_ENABLE_UNENROLLED_ACCESS_FLAG = CourseWaffleFlag(  # lint-amnesty, pylint: disable=toggle-missing-annotation
diff --git a/openedx/features/course_experience/url_helpers.py b/openedx/features/course_experience/url_helpers.py
index f62e879f0994..e1fe4110c613 100644
--- a/openedx/features/course_experience/url_helpers.py
+++ b/openedx/features/course_experience/url_helpers.py
@@ -15,6 +15,7 @@
 from six.moves.urllib.parse import urlencode, urlparse
 
 from lms.djangoapps.courseware.toggles import courseware_mfe_is_active
+from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.search import navigation_index, path_to_location  # lint-amnesty, pylint: disable=wrong-import-order
 
@@ -24,6 +25,7 @@
 def get_courseware_url(
         usage_key: UsageKey,
         request: Optional[HttpRequest] = None,
+        is_staff: bool = False,
 ) -> str:
     """
     Return the URL to the canonical learning experience for a given block.
@@ -44,12 +46,13 @@ def get_courseware_url(
         get_url_fn = _get_new_courseware_url
     else:
         get_url_fn = _get_legacy_courseware_url
-    return get_url_fn(usage_key=usage_key, request=request)
+    return get_url_fn(usage_key=usage_key, request=request, is_staff=is_staff)
 
 
 def _get_legacy_courseware_url(
         usage_key: UsageKey,
         request: Optional[HttpRequest] = None,
+        is_staff: bool = None
 ) -> str:
     """
     Return the URL to Legacy (LMS-rendered) courseware content.
@@ -90,6 +93,7 @@ def _get_legacy_courseware_url(
 def _get_new_courseware_url(
         usage_key: UsageKey,
         request: Optional[HttpRequest] = None,
+        is_staff: bool = None,
 ) -> str:
     """
     Return the URL to the "new" (Learning Micro-Frontend) experience for a given block.
@@ -99,7 +103,13 @@ def _get_new_courseware_url(
         * NoPathToItem if we cannot build a path to the `usage_key`.
     """
     course_key = usage_key.course_key.replace(version_guid=None, branch=None)
-    path = path_to_location(modulestore(), usage_key, request, full_path=True)
+    preview = request.GET.get('preview') if request and request.GET else False
+    branch_type = (
+        ModuleStoreEnum.Branch.draft_preferred
+    ) if preview and is_staff else ModuleStoreEnum.Branch.published_only
+
+    path = path_to_location(modulestore(), usage_key, request, full_path=True, branch_type=branch_type)
+
     if len(path) <= 1:
         # Course-run-level block:
         # We have no Sequence or Unit to return.
@@ -120,6 +130,7 @@ def _get_new_courseware_url(
         course_key=course_key,
         sequence_key=sequence_key,
         unit_key=unit_key,
+        preview=preview,
         params=request.GET if request and request.GET else None,
     )
 
@@ -129,6 +140,7 @@ def make_learning_mfe_courseware_url(
         sequence_key: Optional[UsageKey] = None,
         unit_key: Optional[UsageKey] = None,
         params: Optional[QueryDict] = None,
+        preview: bool = None,
 ) -> str:
     """
     Return a str with the URL for the specified courseware content in the Learning MFE.
@@ -160,6 +172,16 @@ def make_learning_mfe_courseware_url(
     `params` is an optional QueryDict object (e.g. request.GET)
     """
     mfe_link = f'{settings.LEARNING_MICROFRONTEND_URL}/course/{course_key}'
+    get_params = params.copy() if params else None
+
+    if preview:
+        if len(get_params.keys()) > 1:
+            get_params.pop('preview')
+        else:
+            get_params = None
+
+        if (unit_key or sequence_key):
+            mfe_link = f'{settings.LEARNING_MICROFRONTEND_URL}/preview/course/{course_key}'
 
     if sequence_key:
         mfe_link += f'/{sequence_key}'
@@ -167,8 +189,8 @@ def make_learning_mfe_courseware_url(
         if unit_key:
             mfe_link += f'/{unit_key}'
 
-    if params:
-        mfe_link += f'?{params.urlencode()}'
+    if get_params:
+        mfe_link += f'?{get_params.urlencode()}'
 
     return mfe_link
 
diff --git a/openedx/features/discounts/models.py b/openedx/features/discounts/models.py
index bca6ef7b37c1..8c7c5ff53ea0 100644
--- a/openedx/features/discounts/models.py
+++ b/openedx/features/discounts/models.py
@@ -15,6 +15,8 @@
 class DiscountRestrictionConfig(StackedConfigurationModel):
     """
     A ConfigurationModel used to manage restrictons for lms-controlled discounts
+
+    .. no_pii:
     """
 
     STACKABLE_FIELDS = ('disabled',)
@@ -43,6 +45,8 @@ def __str__(self):
 class DiscountPercentageConfig(StackedConfigurationModel):
     """
     A ConfigurationModel to configure the discount percentage for the first purchase discount
+
+    .. no_pii:
     """
     STACKABLE_FIELDS = ('percentage',)
     percentage = models.PositiveIntegerField()
diff --git a/openedx/features/discounts/utils.py b/openedx/features/discounts/utils.py
index e97524d4381a..92490f19bcb3 100644
--- a/openedx/features/discounts/utils.py
+++ b/openedx/features/discounts/utils.py
@@ -8,6 +8,7 @@
 from django.conf import settings
 from django.utils.translation import get_language
 from django.utils.translation import gettext as _
+from edx_django_utils.plugins import pluggable_override
 
 from common.djangoapps.course_modes.models import format_course_price, get_course_prices
 from lms.djangoapps.experiments.models import ExperimentData
@@ -73,6 +74,7 @@ def _get_discount_prices(user, course, assume_discount=False):
         return format_course_price(base_price), None, None
 
 
+@pluggable_override("OVERRIDE_GENERATE_OFFER_DATA")
 def generate_offer_data(user, course):
     """
     Create a dictionary of information about the current discount offer.
diff --git a/openedx/features/enterprise_support/tests/test_utils.py b/openedx/features/enterprise_support/tests/test_utils.py
index fbf2cccf9dbc..d693f6be72b6 100644
--- a/openedx/features/enterprise_support/tests/test_utils.py
+++ b/openedx/features/enterprise_support/tests/test_utils.py
@@ -269,10 +269,11 @@ def test_update_account_settings_context_for_enterprise(self, mock_get_fields):
         mock_get_fields.assert_called_once_with(user)
         assert expected_context == context
 
+    @ddt.data(settings.ENTERPRISE_READONLY_ACCOUNT_FIELDS, ['username', 'email', 'country'])
     @mock.patch('openedx.features.enterprise_support.utils.get_current_request')
     @mock.patch('openedx.features.enterprise_support.api.enterprise_customer_for_request')
     def test_get_enterprise_readonly_account_fields_no_sync_learner_profile_data(
-            self, mock_customer_for_request, mock_get_current_request,
+            self, readonly_fields, mock_customer_for_request, mock_get_current_request,
     ):
         mock_get_current_request.return_value = mock.Mock(
             GET={'enterprise_customer': 'some-uuid'},
@@ -284,7 +285,8 @@ def test_get_enterprise_readonly_account_fields_no_sync_learner_profile_data(
         }
         user = mock.Mock()
 
-        actual_fields = get_enterprise_readonly_account_fields(user)
+        with override_settings(ENTERPRISE_READONLY_ACCOUNT_FIELDS=readonly_fields):
+            actual_fields = get_enterprise_readonly_account_fields(user)
         assert set() == actual_fields
         mock_customer_for_request.assert_called_once_with(mock_get_current_request.return_value)
         mock_get_current_request.assert_called_once_with()
diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py
index 4604b5c4fb00..6b007ebed57b 100644
--- a/openedx/features/enterprise_support/utils.py
+++ b/openedx/features/enterprise_support/utils.py
@@ -277,7 +277,7 @@ def get_enterprise_readonly_account_fields(user):
     # if user has no `UserSocialAuth` record then allow to edit `fullname`
     # whether the `sync_learner_profile_data` is enabled or disabled
     user_social_auth_record = _user_has_social_auth_record(user, enterprise_customer)
-    if not user_social_auth_record:
+    if not user_social_auth_record and 'name' in enterprise_readonly_account_fields:
         enterprise_readonly_account_fields.remove('name')
 
     sync_learner_profile_data = _get_sync_learner_profile_data(enterprise_customer)
diff --git a/openedx/tests/completion_integration/test_services.py b/openedx/tests/completion_integration/test_services.py
index f4088678d99b..7a6fad8ece12 100644
--- a/openedx/tests/completion_integration/test_services.py
+++ b/openedx/tests/completion_integration/test_services.py
@@ -10,7 +10,7 @@
 from django.conf import settings
 from django.test import override_settings
 from opaque_keys.edx.keys import CourseKey
-from xmodule.library_tools import LibraryToolsService
+from xmodule.library_tools import LegacyLibraryToolsService
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory, LibraryFactory
 from xmodule.tests import prepare_block_runtime
@@ -122,7 +122,7 @@ def _bind_course_block(self, block):
         Bind a block (part of self.course) so we can access student-specific data.
         """
         prepare_block_runtime(block.runtime, course_id=block.location.course_key)
-        block.runtime._services.update({'library_tools': LibraryToolsService(self.store, self.user.id)})  # lint-amnesty, pylint: disable=protected-access
+        block.runtime._services.update({'library_tools': LegacyLibraryToolsService(self.store, self.user.id)})  # lint-amnesty, pylint: disable=protected-access
 
         def get_block(descriptor):
             """Mocks module_system get_block_for_descriptor function"""
diff --git a/package-lock.json b/package-lock.json
index 87c75af69044..16232c97f71f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,11 +9,11 @@
       "version": "0.1.0",
       "hasInstallScript": true,
       "dependencies": {
-        "@babel/core": "7.25.2",
+        "@babel/core": "7.26.0",
         "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
         "@babel/plugin-transform-object-assign": "^7.18.6",
         "@babel/preset-env": "^7.19.0",
-        "@babel/preset-react": "7.24.7",
+        "@babel/preset-react": "7.26.3",
         "@edx/brand-edx.org": "^2.0.7",
         "@edx/edx-bootstrap": "1.0.4",
         "@edx/edx-proctoring": "^4.18.1",
@@ -28,84 +28,84 @@
         "backbone.paginator": "2.0.8",
         "bootstrap": "4.0.0",
         "camelize": "1.0.1",
-        "classnames": "2.3.1",
+        "classnames": "2.5.1",
         "css-loader": "0.28.8",
         "datatables": "1.10.18",
-        "datatables.net-fixedcolumns": "3.2.6",
+        "datatables.net-fixedcolumns": "5.0.4",
         "edx-proctoring-proctortrack": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#f0fa9edbd16aa5af5a41ac309d2609e529ea8732",
-        "edx-ui-toolkit": "1.5.5",
+        "edx-ui-toolkit": "1.8.6",
         "exports-loader": "0.6.4",
         "file-loader": "^6.2.0",
         "font-awesome": "4.7.0",
         "hls.js": "0.14.17",
-        "imports-loader": "0.7.1",
-        "jest-environment-jsdom": "^26.0.0",
+        "imports-loader": "0.8.0",
+        "jest-environment-jsdom": "^29.0.0",
         "jquery": "2.2.4",
         "jquery-migrate": "1.4.1",
         "jquery.scrollto": "2.1.3",
         "js-cookie": "3.0.5",
         "moment": "2.30.1",
-        "moment-timezone": "0.5.45",
-        "node-gyp": "10.0.1",
+        "moment-timezone": "0.5.46",
+        "node-gyp": "10.3.1",
         "picturefill": "3.0.3",
         "popper.js": "1.16.1",
-        "prop-types": "15.6.0",
+        "prop-types": "15.8.1",
         "raw-loader": "0.5.1",
         "react": "16.14.0",
         "react-dom": "16.14.0",
         "react-focus-lock": "^1.19.1",
-        "react-redux": "5.0.7",
-        "react-router-dom": "5.1.2",
-        "react-slick": "0.29.0",
+        "react-redux": "5.1.2",
+        "react-router-dom": "5.3.4",
+        "react-slick": "0.30.2",
         "redux": "3.7.2",
         "redux-thunk": "2.2.0",
         "requirejs": "2.3.7",
-        "rtlcss": "2.6.2",
+        "rtlcss": "4.3.0",
         "sass": "^1.54.8",
-        "sass-loader": "^14.1.1",
+        "sass-loader": "^16.0.0",
         "scriptjs": "2.5.9",
-        "style-loader": "0.18.2",
+        "style-loader": "4.0.0",
         "svg-inline-loader": "0.8.2",
         "uglify-js": "2.7.0",
-        "underscore": "1.12.1",
+        "underscore": "1.13.7",
         "underscore.string": "3.3.6",
         "webpack": "^5.90.3",
         "webpack-bundle-tracker": "0.4.3",
-        "webpack-merge": "4.1.1",
+        "webpack-merge": "4.2.2",
         "whatwg-fetch": "2.0.4",
         "which-country": "1.0.0"
       },
       "devDependencies": {
-        "@edx/eslint-config": "^3.1.1",
-        "@edx/mockprock": "github:openedx/mockprock#3ad18c6888e6521e9bf7a4df0db6f8579b928235",
+        "@edx/eslint-config": "^4.0.0",
+        "@edx/mockprock": "github:openedx/mockprock#d70b05231bd46b0122616c24e209c890ef2633c0",
         "@edx/stylelint-config-edx": "2.3.3",
-        "babel-jest": "26.6.3",
+        "babel-jest": "29.7.0",
         "enzyme": "3.11.0",
         "enzyme-adapter-react-16": "1.15.8",
-        "eslint-import-resolver-webpack": "0.13.8",
+        "eslint-import-resolver-webpack": "0.13.9",
         "jasmine-core": "2.6.4",
         "jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
-        "jest": "26.6.3",
-        "jest-enzyme": "6.1.2",
+        "jest": "29.7.0",
+        "jest-enzyme": "7.1.2",
         "karma": "0.13.22",
-        "karma-chrome-launcher": "0.2.3",
-        "karma-coverage": "0.5.5",
-        "karma-firefox-launcher": "0.1.7",
+        "karma-chrome-launcher": "3.2.0",
+        "karma-coverage": "2.2.1",
+        "karma-firefox-launcher": "2.1.3",
         "karma-jasmine": "0.3.8",
         "karma-jasmine-html-reporter": "0.2.2",
-        "karma-junit-reporter": "1.2.0",
-        "karma-requirejs": "0.2.6",
+        "karma-junit-reporter": "2.0.1",
+        "karma-requirejs": "1.1.0",
         "karma-selenium-webdriver-launcher": "github:openedx/karma-selenium-webdriver-launcher#0.0.4-openedx.0",
         "karma-sourcemap-loader": "0.4.0",
-        "karma-spec-reporter": "0.0.36",
+        "karma-spec-reporter": "0.0.20",
         "karma-webpack": "^5.0.1",
         "plato": "1.7.0",
         "react-test-renderer": "16.14.0",
-        "selenium-webdriver": "3.6.0",
-        "sinon": "2.4.1",
+        "selenium-webdriver": "4.27.0",
+        "sinon": "19.0.2",
         "squirejs": "0.1.0",
         "string-replace-loader": "^3.1.0",
-        "stylelint-formatter-pretty": "1.1.4",
+        "stylelint-formatter-pretty": "4.0.1",
         "webpack-cli": "^5.1.4"
       }
     },
@@ -132,12 +132,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -145,30 +146,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz",
-      "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+      "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.26.0",
+        "@babel/generator": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.0",
+        "@babel/parser": "^7.26.0",
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -190,54 +191,55 @@
       "license": "MIT"
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.0",
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
-      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
+      "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -246,17 +248,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz",
-      "integrity": "sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.8",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.25.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/traverse": "^7.25.0",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -267,13 +269,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz",
-      "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.1.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -284,9 +286,10 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz",
-      "integrity": "sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -299,41 +302,40 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
-      "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.8",
-        "@babel/types": "^7.24.8"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -343,35 +345,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
-      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz",
-      "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.25.0",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -381,14 +383,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz",
-      "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.24.8",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -398,107 +400,92 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
-      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz",
-      "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.0",
-        "@babel/types": "^7.25.0"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz",
-      "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz",
-      "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.2"
+        "@babel/types": "^7.26.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -508,13 +495,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz",
-      "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/traverse": "^7.25.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -524,12 +511,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
-      "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -539,12 +526,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
-      "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -554,14 +541,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -571,13 +558,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz",
-      "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -620,6 +607,7 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -643,6 +631,7 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -650,49 +639,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
-      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -702,12 +655,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
-      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -720,6 +673,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -731,6 +685,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -739,12 +694,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
-      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -757,6 +712,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -768,6 +724,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -779,6 +736,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -801,6 +759,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -812,6 +771,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -819,10 +779,11 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+    "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -833,12 +794,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -863,12 +826,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
-      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -878,15 +841,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
-      "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+      "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-remap-async-to-generator": "^7.25.0",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -896,14 +858,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-remap-async-to-generator": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -913,12 +875,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
-      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -928,12 +890,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz",
-      "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -943,13 +905,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
-      "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -959,14 +921,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
-      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -976,16 +937,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz",
-      "integrity": "sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-replace-supers": "^7.25.0",
-        "@babel/traverse": "^7.25.0",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -996,13 +957,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
-      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/template": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1012,12 +973,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz",
-      "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1027,13 +988,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
-      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1043,12 +1004,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
-      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1058,13 +1019,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
-      "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.0",
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1074,13 +1035,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
-      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1090,13 +1050,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
-      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
+      "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1106,13 +1066,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
-      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1122,13 +1081,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
-      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1138,14 +1097,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz",
-      "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/traverse": "^7.25.1"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1155,13 +1114,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
-      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1171,12 +1129,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz",
-      "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1186,13 +1144,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
-      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1202,12 +1159,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
-      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1217,13 +1174,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
-      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1233,14 +1190,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz",
-      "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-simple-access": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-simple-access": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1250,15 +1207,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
-      "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.0",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.0"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1268,13 +1225,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
-      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1284,13 +1241,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
-      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1300,12 +1257,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
-      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1315,13 +1272,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
-      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1331,13 +1287,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
-      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1347,12 +1302,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-assign": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.24.7.tgz",
-      "integrity": "sha512-DOzAi77P9jSyPijHS7Z8vH0wLRcZH6wWxuIZgLAiy8FWOkcKMJmnyHjy2JM94k6A0QxlA/hlLh+R9T3GEryjNQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.25.9.tgz",
+      "integrity": "sha512-I/Vl1aQnPsrrn837oLbo+VQtkNcjuuiATqwmuweg4fTauwHHQoxyjmjjOVKyO8OaTxgqYTKW3LuQsykXjDf5Ag==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1362,15 +1317,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
-      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1380,13 +1334,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
-      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1396,13 +1350,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
-      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1412,14 +1365,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz",
-      "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1429,12 +1381,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
-      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1444,13 +1396,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
-      "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1460,15 +1412,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
-      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1478,12 +1429,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
-      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1493,12 +1444,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz",
-      "integrity": "sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
+      "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1508,16 +1459,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz",
-      "integrity": "sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+      "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/plugin-syntax-jsx": "^7.24.7",
-        "@babel/types": "^7.25.2"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1527,12 +1478,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz",
-      "integrity": "sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
+      "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.24.7"
+        "@babel/plugin-transform-react-jsx": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1542,13 +1493,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz",
-      "integrity": "sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
+      "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1558,12 +1509,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
-      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -1573,13 +1524,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+      "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
-      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1589,12 +1556,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
-      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1604,13 +1571,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
-      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1620,12 +1587,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
-      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1635,12 +1602,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
-      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1650,12 +1617,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
-      "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1665,12 +1632,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
-      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1680,13 +1647,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
-      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1696,13 +1663,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
-      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1712,13 +1679,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
-      "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1738,93 +1705,79 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
-      "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-validator-option": "^7.24.8",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
-        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
+      "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.7",
-        "@babel/plugin-syntax-import-attributes": "^7.24.7",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-import-assertions": "^7.26.0",
+        "@babel/plugin-syntax-import-attributes": "^7.26.0",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.7",
-        "@babel/plugin-transform-async-generator-functions": "^7.25.0",
-        "@babel/plugin-transform-async-to-generator": "^7.24.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
-        "@babel/plugin-transform-block-scoping": "^7.25.0",
-        "@babel/plugin-transform-class-properties": "^7.24.7",
-        "@babel/plugin-transform-class-static-block": "^7.24.7",
-        "@babel/plugin-transform-classes": "^7.25.0",
-        "@babel/plugin-transform-computed-properties": "^7.24.7",
-        "@babel/plugin-transform-destructuring": "^7.24.8",
-        "@babel/plugin-transform-dotall-regex": "^7.24.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
-        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
-        "@babel/plugin-transform-dynamic-import": "^7.24.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
-        "@babel/plugin-transform-for-of": "^7.24.7",
-        "@babel/plugin-transform-function-name": "^7.25.1",
-        "@babel/plugin-transform-json-strings": "^7.24.7",
-        "@babel/plugin-transform-literals": "^7.25.2",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
-        "@babel/plugin-transform-modules-amd": "^7.24.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.25.0",
-        "@babel/plugin-transform-modules-umd": "^7.24.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
-        "@babel/plugin-transform-new-target": "^7.24.7",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
-        "@babel/plugin-transform-numeric-separator": "^7.24.7",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
-        "@babel/plugin-transform-object-super": "^7.24.7",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.8",
-        "@babel/plugin-transform-parameters": "^7.24.7",
-        "@babel/plugin-transform-private-methods": "^7.24.7",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
-        "@babel/plugin-transform-property-literals": "^7.24.7",
-        "@babel/plugin-transform-regenerator": "^7.24.7",
-        "@babel/plugin-transform-reserved-words": "^7.24.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
-        "@babel/plugin-transform-spread": "^7.24.7",
-        "@babel/plugin-transform-sticky-regex": "^7.24.7",
-        "@babel/plugin-transform-template-literals": "^7.24.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+        "@babel/plugin-transform-arrow-functions": "^7.25.9",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.9",
+        "@babel/plugin-transform-async-to-generator": "^7.25.9",
+        "@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+        "@babel/plugin-transform-block-scoping": "^7.25.9",
+        "@babel/plugin-transform-class-properties": "^7.25.9",
+        "@babel/plugin-transform-class-static-block": "^7.26.0",
+        "@babel/plugin-transform-classes": "^7.25.9",
+        "@babel/plugin-transform-computed-properties": "^7.25.9",
+        "@babel/plugin-transform-destructuring": "^7.25.9",
+        "@babel/plugin-transform-dotall-regex": "^7.25.9",
+        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-dynamic-import": "^7.25.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+        "@babel/plugin-transform-for-of": "^7.25.9",
+        "@babel/plugin-transform-function-name": "^7.25.9",
+        "@babel/plugin-transform-json-strings": "^7.25.9",
+        "@babel/plugin-transform-literals": "^7.25.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+        "@babel/plugin-transform-modules-amd": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+        "@babel/plugin-transform-modules-umd": "^7.25.9",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-new-target": "^7.25.9",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+        "@babel/plugin-transform-numeric-separator": "^7.25.9",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+        "@babel/plugin-transform-object-super": "^7.25.9",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9",
+        "@babel/plugin-transform-private-methods": "^7.25.9",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+        "@babel/plugin-transform-property-literals": "^7.25.9",
+        "@babel/plugin-transform-regenerator": "^7.25.9",
+        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+        "@babel/plugin-transform-reserved-words": "^7.25.9",
+        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+        "@babel/plugin-transform-spread": "^7.25.9",
+        "@babel/plugin-transform-sticky-regex": "^7.25.9",
+        "@babel/plugin-transform-template-literals": "^7.25.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.25.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
         "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.37.1",
+        "core-js-compat": "^3.38.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1848,17 +1801,17 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz",
-      "integrity": "sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-option": "^7.24.7",
-        "@babel/plugin-transform-react-display-name": "^7.24.7",
-        "@babel/plugin-transform-react-jsx": "^7.24.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.24.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-transform-react-display-name": "^7.25.9",
+        "@babel/plugin-transform-react-jsx": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-development": "^7.25.9",
+        "@babel/plugin-transform-react-pure-annotations": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1867,11 +1820,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-    },
     "node_modules/@babel/runtime": {
       "version": "7.24.1",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz",
@@ -1889,30 +1837,30 @@
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz",
-      "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/parser": "^7.25.3",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.25.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1921,36 +1869,31 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
-      "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bazel/runfiles": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-6.3.1.tgz",
+      "integrity": "sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "node_modules/@choojs/findup": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@choojs/findup/-/findup-0.2.1.tgz",
-      "integrity": "sha512-YstAqNb0MCN8PjdLCDfRsBcGVRN41f3vgLvaI0IrIcBp4AqILRSS0DeWNGkicC+f/zRIPJLc+9RURVSepwvfBw==",
-      "license": "MIT",
-      "dependencies": {
-        "commander": "^2.15.1"
-      },
-      "bin": {
-        "findup": "bin/findup.js"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@cnakazawa/watch": {
       "version": "1.0.4",
@@ -2044,6 +1987,18 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@dual-bundle/import-meta-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+      "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/@edx/brand-edx.org": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@edx/brand-edx.org/-/brand-edx.org-2.1.3.tgz",
@@ -2085,21 +2040,24 @@
       "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
     },
     "node_modules/@edx/edx-proctoring": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/@edx/edx-proctoring/-/edx-proctoring-4.18.1.tgz",
-      "integrity": "sha512-W8g8NFulXzGFjd2+ARGd8qbfYm7sPOQsCThPQBwivIYTRyPbcevjhUIe1yr7C1rgcBoYn9SsXPfZosNHLX61WQ==",
-      "hasShrinkwrap": true,
+      "version": "4.18.3",
+      "resolved": "https://registry.npmjs.org/@edx/edx-proctoring/-/edx-proctoring-4.18.3.tgz",
+      "integrity": "sha512-JeDT12uJYRumD7zIkjfemO40ZFkIhFqS5R6fGDO5MICRuoVJ/ndzcwTOhobcyGU/f8eMxlM1ukzWbSKBS+bUWg==",
       "license": "GNU Affero GPLv3"
     },
     "node_modules/@edx/eslint-config": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@edx/eslint-config/-/eslint-config-3.2.0.tgz",
-      "integrity": "sha512-X2o34xr3KqmQSV/vJVv6k4FxUKYwbBATHTtTHLTYQvM9PVoM3WbKQP9tl6Z057pRErKzshJcks+4ENzDyhr11Q==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@edx/eslint-config/-/eslint-config-4.3.0.tgz",
+      "integrity": "sha512-4W9wFG4ALr3xocakCsncgJbK67RHfSmDwHDXKHReFtjxl/FRkxhS6qayz189oChqfANieeV3zRCLaq44bLf+/A==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
-        "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
+        "eslint": "^7.32.0 || ^8.2.0",
         "eslint-config-airbnb": "^18.0.1 || ^19.0.0",
-        "eslint-plugin-import": "^2.20.0",
+        "eslint-config-airbnb-typescript": "^17.0.0",
+        "eslint-plugin-import": "^2.25.3",
         "eslint-plugin-jsx-a11y": "^6.2.3",
         "eslint-plugin-react": "^7.18.0",
         "eslint-plugin-react-hooks": "^1.7.0 || ^4.0.0"
@@ -2194,16 +2152,6 @@
         "email-validator": "^2.0.4"
       }
     },
-    "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -2221,7 +2169,7 @@
     },
     "node_modules/@edx/mockprock": {
       "version": "1.0.2",
-      "resolved": "git+ssh://git@github.com/openedx/mockprock.git#3ad18c6888e6521e9bf7a4df0db6f8579b928235",
+      "resolved": "git+ssh://git@github.com/openedx/mockprock.git#d70b05231bd46b0122616c24e209c890ef2633c0",
       "integrity": "sha512-47o2Wkyr6JDdoRNqUz+KocYY0Yvijmfp7EdaUbOBcT5hK8lqIe5yaH0LfbmSGx5gIrVVOkramUWu2RecxzZZ4Q==",
       "dev": true,
       "license": "Apache-2.0",
@@ -2303,16 +2251,6 @@
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
       "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
     },
-    "node_modules/@edx/studio-frontend/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/@edx/studio-frontend/node_modules/react-responsive": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-5.0.0.tgz",
@@ -2955,6 +2893,22 @@
         "stylelint": "^15.5.0"
       }
     },
+    "node_modules/@edx/stylelint-config-edx/node_modules/stylelint-scss": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
+      "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.5.1 || ^15.0.0"
+      }
+    },
     "node_modules/@edx/stylelint-config-edx/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -3183,16 +3137,6 @@
         "react": ">=16.x"
       }
     },
-    "node_modules/@fortawesome/react-fontawesome/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -3339,20 +3283,21 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
-      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.6.2",
-        "jest-util": "^26.6.2",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/console/node_modules/ansi-styles": {
@@ -3360,6 +3305,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3375,6 +3321,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3391,6 +3338,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3402,13 +3350,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jest/console/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3418,6 +3368,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3426,42 +3377,51 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
-      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/reporters": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.6.2",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-resolve-dependencies": "^26.6.3",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "jest-watcher": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "p-each-series": "^2.1.0",
-        "rimraf": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
     "node_modules/@jest/core/node_modules/ansi-styles": {
@@ -3469,6 +3429,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3484,6 +3445,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3495,11 +3457,28 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@jest/core/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/core/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3511,13 +3490,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jest/core/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3527,6 +3508,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3535,85 +3517,122 @@
       }
     },
     "node_modules/@jest/environment": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
-      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^26.6.2"
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
-      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "@sinonjs/fake-timers": "^6.0.1",
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
-      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "expect": "^26.6.2"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
-      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "slash": "^3.0.0",
-        "source-map": "^0.6.0",
         "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^7.0.0"
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "optionalDependencies": {
-        "node-notifier": "^8.0.0"
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
     "node_modules/@jest/reporters/node_modules/ansi-styles": {
@@ -3621,6 +3640,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3636,6 +3656,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3652,6 +3673,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3663,30 +3685,47 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jest/reporters/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/@jest/reporters/node_modules/supports-color": {
@@ -3694,6 +3733,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3701,75 +3741,90 @@
         "node": ">=8"
       }
     },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/@jest/source-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
-      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
-      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
-      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.2",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3"
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
-      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^26.6.2",
-        "babel-plugin-istanbul": "^6.0.0",
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pirates": "^4.0.1",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
         "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
+        "write-file-atomic": "^4.0.2"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/transform/node_modules/ansi-styles": {
@@ -3777,6 +3832,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3792,6 +3848,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3808,6 +3865,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3819,13 +3877,22 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/transform/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jest/transform/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3835,6 +3902,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3843,24 +3911,27 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "license": "MIT",
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^15.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/types/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3875,6 +3946,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3890,6 +3962,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3900,12 +3973,14 @@
     "node_modules/@jest/types/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/@jest/types/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3914,6 +3989,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4107,6 +4183,302 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -4144,28 +4516,86 @@
         "react": ">=16.8.0"
       }
     },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "license": "MIT"
+    },
     "node_modules/@sinonjs/commons": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
-      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/@sinonjs/samsam": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
+      "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.1.0"
+      }
+    },
+    "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons/node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@sinonjs/samsam/node_modules/type-detect": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
       }
     },
+    "node_modules/@sinonjs/text-encoding": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+      "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
+      "dev": true,
+      "license": "(Unlicense OR Apache-2.0)"
+    },
     "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10"
       }
     },
     "node_modules/@types/babel__core": {
@@ -4223,16 +4653,38 @@
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
       "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4263,6 +4715,17 @@
         "@types/istanbul-lib-report": "*"
       }
     },
+    "node_modules/@types/jsdom": {
+      "version": "20.0.1",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
+      "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "parse5": "^7.0.0"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -4295,19 +4758,6 @@
       "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
       "dev": true
     },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
-      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
-      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
-      "dev": true
-    },
     "node_modules/@types/prop-types": {
       "version": "15.7.12",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
@@ -4330,10 +4780,25 @@
         "@types/react": "*"
       }
     },
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+      "license": "MIT"
     },
     "node_modules/@types/warning": {
       "version": "3.0.3",
@@ -4341,9 +4806,10 @@
       "integrity": "sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q=="
     },
     "node_modules/@types/yargs": {
-      "version": "15.0.19",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
-      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -4353,6 +4819,278 @@
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -4361,133 +5099,148 @@
       "peer": true
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -4538,12 +5291,14 @@
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "license": "Apache-2.0"
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -4552,10 +5307,13 @@
       "deprecated": "Use your platform's native atob() and btoa() methods instead"
     },
     "node_modules/abbrev": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/accepts": {
       "version": "1.3.3",
@@ -4580,9 +5338,10 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4591,32 +5350,13 @@
       }
     },
     "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
       }
     },
     "node_modules/acorn-jsx": {
@@ -4630,9 +5370,13 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
       "engines": {
         "node": ">=0.4.0"
       }
@@ -4688,16 +5432,6 @@
         "react": "^0.14 || ^15.0.0 || ^16.0.0-alpha"
       }
     },
-    "node_modules/airbnb-prop-types/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4794,16 +5528,6 @@
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
       "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ=="
     },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.2"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -4887,6 +5611,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4973,19 +5699,11 @@
       "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.2.tgz",
       "integrity": "sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array-includes": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
@@ -5151,6 +5869,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.reduce": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz",
+      "integrity": "sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.toreversed": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz",
@@ -5214,16 +5954,12 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
@@ -5238,6 +5974,7 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -5267,10 +6004,9 @@
       }
     },
     "node_modules/async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
-      "dev": true
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ=="
     },
     "node_modules/async-each": {
       "version": "1.0.6",
@@ -5288,7 +6024,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -5363,15 +6100,17 @@
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
       "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/axe-core": {
       "version": "4.7.0",
@@ -5515,26 +6254,25 @@
       "integrity": "sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="
     },
     "node_modules/babel-jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
-      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/babel__core": "^7.1.7",
-        "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.6.2",
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.8.0"
       }
     },
     "node_modules/babel-jest/node_modules/ansi-styles": {
@@ -5614,9 +6352,10 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
-      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+      "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
+      "license": "MIT",
       "dependencies": {
         "find-cache-dir": "^4.0.0",
         "schema-utils": "^4.0.0"
@@ -5654,18 +6393,19 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
-      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
+        "@types/babel__core": "^7.1.14",
         "@types/babel__traverse": "^7.0.6"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/babel-plugin-minify-builtins": {
@@ -5765,12 +6505,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
-      "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.1",
-        "core-js-compat": "^3.36.1"
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "core-js-compat": "^3.38.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -5903,16 +6644,17 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
-      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
@@ -6144,6 +6886,7 @@
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
@@ -6182,6 +6925,7 @@
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "file-uri-to-path": "1.0.0"
@@ -6280,12 +7024,13 @@
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "funding": [
         {
           "type": "opencollective",
@@ -6302,10 +7047,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
         "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -6527,24 +7272,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/camelize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
@@ -6584,9 +7311,9 @@
       "integrity": "sha512-BS+RAD1DggiDlE2KaBUWKsMDuVmmh3hCM5LI0OW25mGlPttGLeOjDUa1DmZvJVFCXvtshY4BTyFgv31eFTLg8g=="
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001651",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
-      "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
+      "version": "1.0.30001680",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+      "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
       "funding": [
         {
           "type": "opencollective",
@@ -6619,7 +7346,8 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/cast-array": {
       "version": "1.0.1",
@@ -6659,6 +7387,7 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -6757,25 +7486,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/chokidar/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
     "node_modules/chokidar/node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
@@ -6873,7 +7583,8 @@
     "node_modules/ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
     },
     "node_modules/circular-json": {
       "version": "0.3.3",
@@ -6889,10 +7600,11 @@
       "dev": true
     },
     "node_modules/cjs-module-lexer": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
-      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
-      "dev": true
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/clap": {
       "version": "1.2.3",
@@ -7005,9 +7717,10 @@
       }
     },
     "node_modules/classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+      "license": "MIT"
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
@@ -7049,14 +7762,18 @@
       "dev": true
     },
     "node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/clone": {
@@ -7106,6 +7823,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -7144,7 +7862,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
       "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/collection-visit": {
       "version": "1.0.0",
@@ -7411,12 +8130,12 @@
       "hasInstallScript": true
     },
     "node_modules/core-js-compat": {
-      "version": "3.38.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.0.tgz",
-      "integrity": "sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.3"
+        "browserslist": "^4.24.2"
       },
       "funding": {
         "type": "opencollective",
@@ -7430,98 +8149,230 @@
       "dev": true
     },
     "node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "node": ">=14"
       },
-      "engines": {
-        "node": ">= 8"
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
-      "engines": {
-        "node": "*"
-      }
+    "node_modules/cosmiconfig/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0",
+      "peer": true
     },
-    "node_modules/css-functions-list": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz",
-      "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==",
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "engines": {
-        "node": ">=12 || >=16"
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/css-loader": {
-      "version": "0.28.8",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.8.tgz",
-      "integrity": "sha512-4jGj7Ag6WUZ5lQyE4te9sJLn0lgkz6HI3WDE4aw98AkW1IAKXPP4blTpPeorlLDpNsYvojo0SYgRJOdz2KbuAw==",
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "babel-code-frame": "^6.26.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssnano": "^3.10.0",
-        "icss-utils": "^2.1.0",
-        "loader-utils": "^1.0.2",
-        "lodash.camelcase": "^4.3.0",
-        "object-assign": "^4.1.1",
-        "postcss": "^5.0.6",
-        "postcss-modules-extract-imports": "^1.1.0",
-        "postcss-modules-local-by-default": "^1.2.0",
-        "postcss-modules-scope": "^1.1.0",
-        "postcss-modules-values": "^1.3.0",
-        "postcss-value-parser": "^3.3.0",
-        "source-list-map": "^2.0.0"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
       },
       "engines": {
-        "node": ">=0.12.0 || >= 4.3.0 < 5.0.0 || >=5.10"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/css-mediaquery": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/css-mediaquery/-/css-mediaquery-0.1.2.tgz",
-      "integrity": "sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q=="
-    },
-    "node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+    "node_modules/create-jest/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/css-selector-tokenizer": {
+    "node_modules/create-jest/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/create-jest/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/create-jest/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/create-jest/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/create-jest/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz",
+      "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12 || >=16"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "0.28.8",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.8.tgz",
+      "integrity": "sha512-4jGj7Ag6WUZ5lQyE4te9sJLn0lgkz6HI3WDE4aw98AkW1IAKXPP4blTpPeorlLDpNsYvojo0SYgRJOdz2KbuAw==",
+      "dependencies": {
+        "babel-code-frame": "^6.26.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "cssnano": "^3.10.0",
+        "icss-utils": "^2.1.0",
+        "loader-utils": "^1.0.2",
+        "lodash.camelcase": "^4.3.0",
+        "object-assign": "^4.1.1",
+        "postcss": "^5.0.6",
+        "postcss-modules-extract-imports": "^1.1.0",
+        "postcss-modules-local-by-default": "^1.2.0",
+        "postcss-modules-scope": "^1.1.0",
+        "postcss-modules-values": "^1.3.0",
+        "postcss-value-parser": "^3.3.0",
+        "source-list-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.12.0 || >= 4.3.0 < 5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/css-mediaquery": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/css-mediaquery/-/css-mediaquery-0.1.2.tgz",
+      "integrity": "sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q=="
+    },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-selector-tokenizer": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
       "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
@@ -7630,9 +8481,10 @@
       }
     },
     "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "license": "MIT"
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
@@ -7655,18 +8507,6 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
-      "dev": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -7703,6 +8543,7 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       },
@@ -7711,16 +8552,26 @@
       }
     },
     "node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "license": "MIT",
       "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-urls/node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/data-view-buffer": {
@@ -7780,19 +8631,21 @@
       }
     },
     "node_modules/datatables.net": {
-      "version": "1.13.11",
-      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.13.11.tgz",
-      "integrity": "sha512-AE6RkMXziRaqzPcu/pl3SJXeRa6fmXQG/fVjuRESujvkzqDCYEeKTTpPMuVJSGYJpPi32WGSphVNNY1G4nSN/g==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.1.8.tgz",
+      "integrity": "sha512-47ULt+U4bcjbuGTpTlT6SnCuSFVRBxxdWa6X3NfvTObBJ2BZU0o+JUIl05wQ6cABNIavjbAV51gpgvFsMHL9zA==",
+      "license": "MIT",
       "dependencies": {
-        "jquery": "1.8 - 4"
+        "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-fixedcolumns": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/datatables.net-fixedcolumns/-/datatables.net-fixedcolumns-3.2.6.tgz",
-      "integrity": "sha512-PtEs2tllcHRVZj7fwmAQBWGJ5URRQZpDG2pJsh5jusvnRje3w1+KueMZm60iCtfOkIlUn+/j2+MghxLx/8yfKQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/datatables.net-fixedcolumns/-/datatables.net-fixedcolumns-5.0.4.tgz",
+      "integrity": "sha512-mYZ18oahD2oopcpBDmbSEZ2w+bna4TuTmmoaNd01JLEkJWsAH2yZ99fYslLrBX5Rku4GnCG5J8Sr3cJrrLw+3g==",
+      "license": "MIT",
       "dependencies": {
-        "datatables.net": "^1.10.15",
+        "datatables.net": "^2",
         "jquery": ">=1.7"
       }
     },
@@ -7803,11 +8656,12 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -7865,6 +8719,21 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/deep-equal-ident": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz",
@@ -7903,6 +8772,7 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8004,11 +8874,25 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8025,21 +8909,23 @@
       "dev": true
     },
     "node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/dir-glob": {
@@ -8119,23 +9005,16 @@
       ]
     },
     "node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "deprecated": "Use your platform's native DOMException instead",
+      "license": "MIT",
       "dependencies": {
-        "webidl-conversions": "^5.0.0"
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-      "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/domhandler": {
@@ -8177,6 +9056,7 @@
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -8186,7 +9066,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/edx-proctoring-proctortrack": {
       "version": "1.1.1",
@@ -8198,9 +9079,9 @@
       }
     },
     "node_modules/edx-ui-toolkit": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/edx-ui-toolkit/-/edx-ui-toolkit-1.5.5.tgz",
-      "integrity": "sha512-kqqOgLonNZyGr1eXtkPKuOjZ5SCAuLbljoLdUV04OR+nk00t3Z4lbdcDu8WhTBVPqy8zK8v6HhhKbnpcH0Mxtg==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/edx-ui-toolkit/-/edx-ui-toolkit-1.8.6.tgz",
+      "integrity": "sha512-EkxjGLAUoXOs2cRZ6czSaywLofrZB8RXii943lGjfZsZAY0n0sNTZgAaGlKIxcPgiZYJppc79PKXGbYhRz9CNg==",
       "license": "Apache-2.0",
       "dependencies": {
         "backbone": "1.6.0",
@@ -8209,7 +9090,7 @@
         "jquery": "~3.7.0",
         "mini-css-extract-plugin": "^2.7.2",
         "moment": "2.30.1",
-        "moment-timezone": "0.5.45",
+        "moment-timezone": "0.5.46",
         "requirejs": "2.1.22",
         "requirejs-text": "2.0.16",
         "sass": "^1.58.3",
@@ -8236,7 +9117,8 @@
     "node_modules/edx-ui-toolkit/node_modules/lolex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
-      "integrity": "sha512-YYp8cqz7/8eruZ15L1mzcPkvLYxipfdsWIDESvNdNmQP9o7TsDitRhNuV2xb7aFu2ofZngao1jiVrVZ842x4BQ=="
+      "integrity": "sha512-YYp8cqz7/8eruZ15L1mzcPkvLYxipfdsWIDESvNdNmQP9o7TsDitRhNuV2xb7aFu2ofZngao1jiVrVZ842x4BQ==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/edx-ui-toolkit/node_modules/requirejs": {
       "version": "2.1.22",
@@ -8260,6 +9142,7 @@
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
       "integrity": "sha512-M9rtyQxKfcTTdB64rpPSRaTzOvunb+HHPv/3PxvNPrEDnFSny95Pi6/3VoD471ody0ay0IHyzT3BErfcLXj6NA==",
       "deprecated": "16.1.1",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "formatio": "1.1.1",
         "lolex": "1.3.2",
@@ -8283,9 +9166,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz",
-      "integrity": "sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw==",
+      "version": "1.5.63",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz",
+      "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==",
       "license": "ISC"
     },
     "node_modules/email-prop-type": {
@@ -8305,12 +9188,13 @@
       }
     },
     "node_modules/emittery": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
-      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/emittery?sponsor=1"
@@ -8342,6 +9226,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -8350,6 +9235,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -8493,7 +9379,6 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true,
       "engines": {
         "node": ">=0.12"
       },
@@ -8521,6 +9406,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/enzyme": {
       "version": "3.11.0",
       "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
@@ -8580,18 +9478,6 @@
         "react-dom": "^16.0.0-0"
       }
     },
-    "node_modules/enzyme-adapter-react-16/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/enzyme-adapter-react-16/node_modules/semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
@@ -8623,28 +9509,18 @@
         "react": "0.13.x || 0.14.x || ^15.0.0-0 || ^16.0.0-0"
       }
     },
-    "node_modules/enzyme-adapter-utils/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/enzyme-matchers": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-6.1.2.tgz",
-      "integrity": "sha512-cP9p+HMOZ1ZXQ+k2H4dCkxmTZzIvpEy5zv0ZjgoBl6D0U43v+bJGH5IeWHdIovCzgJ0dVcMCKJ6lNu83lYUCAA==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-7.1.2.tgz",
+      "integrity": "sha512-03WqAg2XDl7id9rARIO97HQ1JIw9F2heJ3R4meGu/13hx0ULTDEgl0E67MGl2Uq1jq1DyRnJfto1/VSzskdV5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "circular-json-es6": "^2.0.1",
         "deep-equal-ident": "^1.1.1"
       },
       "peerDependencies": {
-        "enzyme": "3.x"
+        "enzyme": ">=3.4.0"
       }
     },
     "node_modules/enzyme-shallow-equal": {
@@ -8938,9 +9814,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -9139,6 +10015,23 @@
         "eslint-plugin-import": "^2.25.2"
       }
     },
+    "node_modules/eslint-config-airbnb-typescript": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz",
+      "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.13.0 || ^6.0.0",
+        "@typescript-eslint/parser": "^5.0.0 || ^6.0.0",
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3"
+      }
+    },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
@@ -9162,13 +10055,12 @@
       }
     },
     "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.13.8",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.8.tgz",
-      "integrity": "sha512-Y7WIaXWV+Q21Rz/PJgUxiW/FTBOWmU8NTLdz+nz9mMoiz5vAev/fOaQxwD7qRzTfE3HSm1qsxZ5uRd7eX+VEtA==",
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.9.tgz",
+      "integrity": "sha512-yGngeefNiHXau2yzKKs2BNON4HLpxBabY40BGL/vUSKZtqzjlVsTTZm57jhHULhm+mJEwKsEIIN3NXup5AiiBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array.prototype.find": "^2.2.2",
         "debug": "^3.2.7",
         "enhanced-resolve": "^0.9.1",
         "find-root": "^1.1.0",
@@ -9399,22 +10291,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -9777,19 +10657,20 @@
       "dev": true
     },
     "node_modules/execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
         "is-stream": "^2.0.0",
         "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
         "strip-final-newline": "^2.0.0"
       },
       "engines": {
@@ -9857,55 +10738,22 @@
       }
     },
     "node_modules/expect": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
-      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "ansi-styles": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-regex-util": "^26.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/expect/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/expect/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/expect/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/exponential-backoff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -10013,7 +10861,8 @@
       "dev": true,
       "engines": [
         "node >=0.6.0"
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/fancy-log": {
       "version": "1.3.3",
@@ -10106,26 +10955,6 @@
         "bser": "2.1.1"
       }
     },
-    "node_modules/fbjs": {
-      "version": "0.8.18",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz",
-      "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==",
-      "dependencies": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.30"
-      }
-    },
-    "node_modules/fbjs/node_modules/core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js."
-    },
     "node_modules/figures": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
@@ -10206,6 +11035,7 @@
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/filename-regex": {
@@ -10474,18 +11304,24 @@
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/formatio": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz",
-      "integrity": "sha512-YAF05v8+XCxAyHOdiiAmHdgCVPrWO8X744fYIPtBciIorh5LndWfi1gjeJ16sTbJhzek9kd+j3YByhohtz5Wmg==",
-      "deprecated": "This package is unmaintained. Use @sinonjs/formatio instead",
+    "node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "samsam": "1.x"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
       }
     },
     "node_modules/fragment-cache": {
@@ -10500,18 +11336,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha512-05cXDIwNbFaoFWaz5gNHlUTbH5whiss/hr/ibzPd4MH3cR4w0ZKeIPiVdbyJurg3O5r/Bjpvn9KOb1/rPMf3nA==",
-      "dev": true,
-      "dependencies": {
-        "null-check": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fs-extra": {
       "version": "0.30.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
@@ -10553,6 +11377,26 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
+    "node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -10617,10 +11461,24 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -10656,25 +11514,14 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -10710,6 +11557,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       }
@@ -10908,7 +11756,8 @@
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "peer": true
     },
     "node_modules/gulp-shell": {
       "version": "0.8.0",
@@ -11000,45 +11849,12 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "license": "0BSD"
     },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "node_modules/handlebars/node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=4"
       }
@@ -11049,6 +11865,7 @@
       "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "deprecated": "this library is no longer supported",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
@@ -11309,21 +12126,47 @@
       }
     },
     "node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "license": "MIT",
       "dependencies": {
-        "whatwg-encoding": "^1.0.5"
+        "whatwg-encoding": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-encoding-sniffer/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer/node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/html-tags": {
       "version": "3.3.1",
@@ -11401,11 +12244,12 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "license": "MIT",
       "dependencies": {
-        "@tootallnate/once": "1",
+        "@tootallnate/once": "2",
         "agent-base": "6",
         "debug": "4"
       },
@@ -11418,6 +12262,7 @@
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -11441,12 +12286,13 @@
       }
     },
     "node_modules/human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8.12.0"
+        "node": ">=10.17.0"
       }
     },
     "node_modules/hyphenate-style-name": {
@@ -11458,6 +12304,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -11508,9 +12355,10 @@
       "license": "MIT"
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
-      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw=="
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz",
+      "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==",
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -11578,20 +12426,16 @@
       }
     },
     "node_modules/imports-loader": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz",
-      "integrity": "sha512-tQ1upp3IcLH8YRk9b9PlJi7BsAGQhGRlgyLil6uZ/6kFb7C0H9YH9XwDVIjxl/TxFgQ0Wkrx8VRt1Ff2Vf6Mag==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.8.0.tgz",
+      "integrity": "sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==",
+      "license": "MIT",
       "dependencies": {
         "loader-utils": "^1.0.2",
-        "source-map": "^0.5.6"
-      }
-    },
-    "node_modules/imports-loader/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 4"
       }
     },
     "node_modules/imurmurhash": {
@@ -11828,13 +12672,13 @@
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
     },
     "node_modules/irregular-plurals": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-      "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+      "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/is-absolute-url": {
@@ -11952,6 +12796,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
       "dependencies": {
         "ci-info": "^2.0.0"
       },
@@ -12028,7 +12873,6 @@
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
-      "optional": true,
       "bin": {
         "is-docker": "cli.js"
       },
@@ -12073,6 +12917,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12090,18 +12935,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -12115,6 +12948,7 @@
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -12139,6 +12973,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "devOptional": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -12326,6 +13161,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -12398,11 +13234,18 @@
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
-      "dev": true
+    "node_modules/is-unicode-supported": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
+      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/is-weakmap": {
       "version": "2.0.2",
@@ -12450,7 +13293,6 @@
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -12498,46 +13340,12 @@
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "node_modules/isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
-      "dependencies": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      }
-    },
     "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
-    },
-    "node_modules/istanbul": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg==",
-      "deprecated": "This module is no longer maintained, try this instead:\n  npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "istanbul": "lib/cli.js"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
@@ -12569,6 +13377,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -12583,6 +13392,7 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12592,6 +13402,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12604,6 +13415,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -12618,6 +13430,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -12626,175 +13439,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/istanbul/node_modules/escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==",
+    "node_modules/iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
       "dev": true,
-      "dependencies": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.2.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/estraverse": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-      "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
-      "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/istanbul/node_modules/has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-      "dev": true
-    },
-    "node_modules/istanbul/node_modules/source-map": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-      "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/istanbul/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
-      "dev": true,
-      "peer": true,
+      "peer": true,
       "dependencies": {
         "define-properties": "^1.2.1",
         "get-intrinsic": "^1.2.1",
@@ -12834,69 +13484,101 @@
       "license": "MIT"
     },
     "node_modules/jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
-      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^26.6.3",
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.6.3"
+        "jest-cli": "^29.7.0"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
-      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "execa": "^4.0.0",
-        "throat": "^5.0.0"
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-cli": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+    "node_modules/jest-changed-files/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/core": "^26.6.3",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
+        "yocto-queue": "^0.1.0"
       },
-      "bin": {
-        "jest": "bin/jest.js"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
+    "node_modules/jest-circus/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12907,11 +13589,12 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/chalk": {
+    "node_modules/jest-circus/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12923,11 +13606,12 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/color-convert": {
+    "node_modules/jest-circus/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12935,26 +13619,45 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-cli/node_modules/color-name": {
+    "node_modules/jest-circus/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/jest-cli/node_modules/has-flag": {
+    "node_modules/jest-circus/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-cli/node_modules/supports-color": {
+    "node_modules/jest-circus/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12962,44 +13665,41 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-config": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
-        "ts-node": ">=9.0.0"
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
       },
       "peerDependenciesMeta": {
-        "ts-node": {
+        "node-notifier": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
+    "node_modules/jest-cli/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -13014,7 +13714,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
+    "node_modules/jest-cli/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -13030,7 +13730,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-config/node_modules/color-convert": {
+    "node_modules/jest-cli/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -13042,13 +13742,13 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/color-name": {
+    "node_modules/jest-cli/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-config/node_modules/has-flag": {
+    "node_modules/jest-cli/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
@@ -13057,7 +13757,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-config/node_modules/supports-color": {
+    "node_modules/jest-cli/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -13069,26 +13769,58 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
+    "node_modules/jest-config/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13099,11 +13831,12 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-diff/node_modules/chalk": {
+    "node_modules/jest-config/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13115,11 +13848,120 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-diff/node_modules/color-convert": {
+    "node_modules/jest-config/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-config/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-config/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-config/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13131,13 +13973,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-diff/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13147,6 +13991,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13155,31 +14000,33 @@
       }
     },
     "node_modules/jest-docblock": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-each": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
-      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2"
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-each/node_modules/ansi-styles": {
@@ -13187,6 +14034,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13202,6 +14050,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13218,6 +14067,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13229,13 +14079,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-each/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13245,6 +14097,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13253,12 +14106,13 @@
       }
     },
     "node_modules/jest-environment-enzyme": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-enzyme/-/jest-environment-enzyme-6.1.2.tgz",
-      "integrity": "sha512-WHeBKgBYOdryuOTEoK55lJwjg7Raery1OgXHLwukI3mSYgOkm2UrCDDT+vneqVgy7F8KuRHyStfD+TC/m2b7Kg==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-enzyme/-/jest-environment-enzyme-7.1.2.tgz",
+      "integrity": "sha512-3tfaYAzO7qZSRrv+srQnfK16Vu5XwH/pHi8FpoqSHjKKngbHzXf7aBCBuWh8y3w0OtknHRfDMFrC60Khj+g1hA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "jest-environment-jsdom": "^22.4.1"
+        "jest-environment-jsdom": "^24.0.0"
       },
       "peerDependencies": {
         "enzyme": "3.x",
@@ -13266,11 +14120,159 @@
         "react": "^0.13.0 || ^0.14.0 || ^15.0.0 || >=16.x"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/console": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
+      "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/source-map": "^24.9.0",
+        "chalk": "^2.0.1",
+        "slash": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/environment": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
+      "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/transform": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "jest-mock": "^24.9.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/fake-timers": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
+      "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-mock": "^24.9.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/source-map": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
+      "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.1.15",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/test-result": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
+      "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "@types/istanbul-lib-coverage": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/transform": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
+      "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^24.9.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "chalk": "^2.0.1",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.1.15",
+        "jest-haste-map": "^24.9.0",
+        "jest-regex-util": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "micromatch": "^3.1.10",
+        "pirates": "^4.0.1",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "2.4.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@jest/types": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
+      "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^13.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@types/istanbul-reports": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@types/stack-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-environment-enzyme/node_modules/@types/yargs": {
+      "version": "13.0.12",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz",
+      "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
     "node_modules/jest-environment-enzyme/node_modules/acorn": {
       "version": "5.7.4",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
       "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -13283,6 +14285,7 @@
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
       "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
@@ -13293,6 +14296,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -13305,82 +14309,151 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
       "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+    "node_modules/jest-environment-enzyme/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      },
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
+    "node_modules/jest-environment-enzyme/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/ci-info": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-      "dev": true
-    },
-    "node_modules/jest-environment-enzyme/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/jest-environment-enzyme/node_modules/cssstyle": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+    "node_modules/jest-environment-enzyme/node_modules/babel-plugin-istanbul": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
+      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "cssom": "0.3.x"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "find-up": "^3.0.0",
+        "istanbul-lib-instrument": "^3.3.0",
+        "test-exclude": "^5.2.3"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+    "node_modules/jest-environment-enzyme/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
-      }
-    },
-    "node_modules/jest-environment-enzyme/node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "7.1.0",
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-environment-enzyme/node_modules/cssstyle": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssom": "0.3.x"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/data-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.2.0",
+        "whatwg-url": "^7.0.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
       "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
         "webidl-conversions": "^4.0.2"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
     "node_modules/jest-environment-enzyme/node_modules/domexception": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
       "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
       "deprecated": "Use your platform's native DOMException instead",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^4.0.2"
       }
@@ -13390,6 +14463,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13399,6 +14473,7 @@
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
       "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -13421,107 +14496,366 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
+    "node_modules/jest-environment-enzyme/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^2.1.0"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/jest-environment-enzyme/node_modules/html-encoding-sniffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
       "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^1.0.1"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/is-ci": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+    "node_modules/jest-environment-enzyme/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ci-info": "^1.5.0"
+        "kind-of": "^3.0.2"
       },
-      "bin": {
-        "is-ci": "bin.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+    "node_modules/jest-environment-enzyme/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+    "node_modules/jest-environment-enzyme/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/istanbul-lib-coverage": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/istanbul-lib-instrument": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
+      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "is-extglob": "^1.0.0"
+        "@babel/generator": "^7.4.0",
+        "@babel/parser": "^7.4.3",
+        "@babel/template": "^7.4.0",
+        "@babel/traverse": "^7.4.3",
+        "@babel/types": "^7.4.0",
+        "istanbul-lib-coverage": "^2.0.5",
+        "semver": "^6.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
     "node_modules/jest-environment-enzyme/node_modules/jest-environment-jsdom": {
-      "version": "22.4.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz",
-      "integrity": "sha512-FviwfR+VyT3Datf13+ULjIMO5CSeajlayhhYQwpzgunswoaLIPutdbrnfUHEMyJCwvqQFaVtTmn9+Y8WCt6n1w==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
+      "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "jest-mock": "^22.4.3",
-        "jest-util": "^22.4.3",
+        "@jest/environment": "^24.9.0",
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "jest-mock": "^24.9.0",
+        "jest-util": "^24.9.0",
         "jsdom": "^11.5.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/jest-haste-map": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
+      "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^24.9.0",
+        "anymatch": "^2.0.0",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.1.15",
+        "invariant": "^2.2.4",
+        "jest-serializer": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-worker": "^24.9.0",
+        "micromatch": "^3.1.10",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
       }
     },
     "node_modules/jest-environment-enzyme/node_modules/jest-message-util": {
-      "version": "22.4.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-22.4.3.tgz",
-      "integrity": "sha512-iAMeKxhB3Se5xkSjU0NndLLCHtP4n+GtCqV0bISKA5dmOXQfEbdEmYiu2qpnWBDCQdEafNDDU6Q+l6oBMd/+BA==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
+      "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.0.0-beta.35",
+        "@babel/code-frame": "^7.0.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "@types/stack-utils": "^1.0.1",
         "chalk": "^2.0.1",
-        "micromatch": "^2.3.11",
-        "slash": "^1.0.0",
+        "micromatch": "^3.1.10",
+        "slash": "^2.0.0",
         "stack-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/jest-environment-enzyme/node_modules/jest-mock": {
-      "version": "22.4.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-22.4.3.tgz",
-      "integrity": "sha512-+4R6mH5M1G4NK16CKg9N1DtCaFmuxhcIqF4lQK/Q1CIotqMs/XBemfpDPeVZBFow6iyUNu6EBT9ugdNOTT5o5Q==",
-      "dev": true
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
+      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^24.9.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/jest-regex-util": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
+      "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/jest-serializer": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
+      "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
     },
     "node_modules/jest-environment-enzyme/node_modules/jest-util": {
-      "version": "22.4.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz",
-      "integrity": "sha512-rfDfG8wyC5pDPNdcnAlZgwKnzHvZDu8Td2NJI/jAGKEGxJPYiE4F0ss/gSAkG4778Y23Hvbz+0GMrDJTeo7RjQ==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
+      "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "callsites": "^2.0.0",
+        "@jest/console": "^24.9.0",
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/source-map": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "callsites": "^3.0.0",
         "chalk": "^2.0.1",
-        "graceful-fs": "^4.1.11",
-        "is-ci": "^1.0.10",
-        "jest-message-util": "^22.4.3",
+        "graceful-fs": "^4.1.15",
+        "is-ci": "^2.0.0",
         "mkdirp": "^0.5.1",
+        "slash": "^2.0.0",
         "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/jest-worker": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "merge-stream": "^2.0.0",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/jest-environment-enzyme/node_modules/jsdom": {
@@ -13529,6 +14863,7 @@
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
       "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.0",
         "acorn": "^5.5.3",
@@ -13558,23 +14893,12 @@
         "xml-name-validator": "^3.0.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/jest-environment-enzyme/node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -13583,35 +14907,74 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/jest-environment-enzyme/node_modules/micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jest-environment-enzyme/node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
       },
@@ -13624,6 +14987,7 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -13636,11 +15000,72 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/jest-environment-enzyme/node_modules/parse5": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
       "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-environment-enzyme/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
     },
     "node_modules/jest-environment-enzyme/node_modules/prelude-ls": {
       "version": "1.1.2",
@@ -13651,34 +15076,119 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+    "node_modules/jest-environment-enzyme/node_modules/read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/read-pkg-up": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^3.0.0",
+        "read-pkg": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/stack-utils": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+      "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jest-environment-enzyme/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
+    "node_modules/jest-environment-enzyme/node_modules/test-exclude": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
+      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
       "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "read-pkg-up": "^4.0.0",
+        "require-main-filename": "^2.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-environment-enzyme/node_modules/stack-utils": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
-      "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
+    "node_modules/jest-environment-enzyme/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "escape-string-regexp": "^2.0.0"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/jest-environment-enzyme/node_modules/tough-cookie": {
@@ -13686,6 +15196,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -13699,6 +15210,7 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
       "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -13708,6 +15220,7 @@
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2"
       },
@@ -13719,239 +15232,183 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/jest-environment-enzyme/node_modules/whatwg-url": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
       "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
         "webidl-conversions": "^4.0.2"
       }
     },
+    "node_modules/jest-environment-enzyme/node_modules/write-file-atomic": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
+      "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "node_modules/jest-environment-enzyme/node_modules/ws": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
-      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz",
+      "integrity": "sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "async-limiter": "~1.0.0"
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
-      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
         "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jsdom": "^16.4.0"
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
-      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-enzyme": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-6.1.2.tgz",
-      "integrity": "sha512-+ds7r2ru3QkNJxelQ2tnC6d33pjUSsZHPD3v4TlnHlNMuGX3UKdxm5C46yZBvJICYBvIF+RFKBhLMM4evNM95Q==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/jest-enzyme/-/jest-enzyme-7.1.2.tgz",
+      "integrity": "sha512-j+jkph3t5hGBS12eOldpfsnERYRCHi4c/0KWPMnqRPoJJXvCpLIc5th1MHl0xDznQDXVU0AHUXg3rqMrf8vGpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "enzyme-matchers": "^6.1.2",
+        "enzyme-matchers": "^7.1.2",
         "enzyme-to-json": "^3.3.0",
-        "jest-environment-enzyme": "^6.1.2"
+        "jest-environment-enzyme": "^7.1.2"
       },
       "peerDependencies": {
-        "enzyme": "3.x",
+        "enzyme": ">=3.4.0",
         "jest": ">=22.0.0"
       }
     },
     "node_modules/jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
-      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "@types/graceful-fs": "^4.1.2",
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "^2.1.2"
-      }
-    },
-    "node_modules/jest-jasmine2": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
-      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^26.6.2",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2",
-        "throat": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-haste-map/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
-      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
@@ -13959,6 +15416,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13974,6 +15432,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13990,6 +15449,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14001,13 +15461,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-matcher-utils/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14017,6 +15479,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14025,28 +15488,30 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.6.2",
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.2"
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-message-util/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14061,6 +15526,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14076,6 +15542,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14086,12 +15553,14 @@
     "node_modules/jest-message-util/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/jest-message-util/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14100,6 +15569,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14108,15 +15578,17 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
-      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "@types/node": "*"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-pnp-resolver": {
@@ -14124,6 +15596,7 @@
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -14137,45 +15610,48 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
-      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.6.2",
-        "read-pkg-up": "^7.0.1",
-        "resolve": "^1.18.1",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
-      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.6.2"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-resolve/node_modules/ansi-styles": {
@@ -14183,6 +15659,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14198,6 +15675,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14214,6 +15692,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14225,13 +15704,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-resolve/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14241,6 +15722,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14249,34 +15731,36 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
-      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.7.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-leak-detector": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
-        "source-map-support": "^0.5.6",
-        "throat": "^5.0.0"
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runner/node_modules/ansi-styles": {
@@ -14284,6 +15768,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14299,6 +15784,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14315,6 +15801,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14326,22 +15813,52 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-runner/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/jest-runner/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "node_modules/jest-runner/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14350,44 +15867,37 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
-      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/globals": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/yargs": "^15.0.0",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.6.0",
+        "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
         "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest-runtime": "bin/jest-runtime.js"
+        "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runtime/node_modules/ansi-styles": {
@@ -14395,6 +15905,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14410,6 +15921,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14426,6 +15938,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14437,13 +15950,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-runtime/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14453,6 +15968,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14460,44 +15976,36 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-serializer": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
-      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.4"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
     "node_modules/jest-snapshot": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
-      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.0.0",
-        "@jest/types": "^26.6.2",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.0.0",
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.6.2",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.2",
-        "semver": "^7.3.2"
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-snapshot/node_modules/ansi-styles": {
@@ -14505,6 +16013,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14520,6 +16029,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14536,6 +16046,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14547,37 +16058,25 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "license": "MIT"
+    },
+    "node_modules/jest-snapshot/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -14590,6 +16089,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14597,32 +16097,28 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-snapshot/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/jest-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
-      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "micromatch": "^4.0.2"
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-util/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14637,6 +16133,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14648,10 +16145,26 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/jest-util/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-util/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14662,12 +16175,14 @@
     "node_modules/jest-util/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/jest-util/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14676,6 +16191,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14684,20 +16200,21 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "camelcase": "^6.0.0",
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
+        "jest-get-type": "^29.6.3",
         "leven": "^3.1.0",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/ansi-styles": {
@@ -14705,6 +16222,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14720,6 +16238,7 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -14732,6 +16251,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14748,6 +16268,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14759,13 +16280,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-validate/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14775,6 +16298,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14783,21 +16307,23 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
-      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.6.2",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
         "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-watcher/node_modules/ansi-styles": {
@@ -14805,6 +16331,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14820,6 +16347,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -14836,6 +16364,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14847,13 +16376,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-watcher/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14863,6 +16394,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -14871,17 +16403,19 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
+        "jest-util": "^29.7.0",
         "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-worker/node_modules/has-flag": {
@@ -14889,20 +16423,25 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
     "node_modules/jquery": {
@@ -14961,40 +16500,40 @@
       "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
     },
     "node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
         "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
         "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
       },
       "peerDependencies": {
         "canvas": "^2.5.0"
@@ -15006,9 +16545,10 @@
       }
     },
     "node_modules/jsdom/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -15018,20 +16558,58 @@
         "node": ">= 6"
       }
     },
-    "node_modules/jsdom/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    "node_modules/jsdom/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jsdom/node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jsdom/node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/jshint": {
@@ -15185,6 +16763,13 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -15194,7 +16779,8 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
+      "dev": true,
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -15234,7 +16820,8 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/json2mq": {
       "version": "0.2.0",
@@ -15293,6 +16880,7 @@
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -15372,275 +16960,118 @@
         "safe-buffer": "~5.1.0"
       }
     },
-    "node_modules/karma": {
-      "version": "0.13.22",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-0.13.22.tgz",
-      "integrity": "sha512-A9/7e/IzHUkTcfjnTy5Wzo2P5wPuf7+QZh1JzNdTpYA0AN/vSrxfFjPKtKC3jRYJFZMJ7S1I9L2LItaJS1XMSg==",
-      "dev": true,
-      "dependencies": {
-        "batch": "^0.5.3",
-        "bluebird": "^2.9.27",
-        "body-parser": "^1.12.4",
-        "chokidar": "^1.4.1",
-        "colors": "^1.1.0",
-        "connect": "^3.3.5",
-        "core-js": "^2.1.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
-        "glob": "^7.0.0",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^3.8.0",
-        "log4js": "^0.6.31",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.0",
-        "optimist": "^0.6.1",
-        "rimraf": "^2.3.3",
-        "socket.io": "^1.4.5",
-        "source-map": "^0.5.3",
-        "useragent": "^2.1.6"
-      },
-      "bin": {
-        "karma": "bin/karma"
-      },
-      "engines": {
-        "node": "0.10 || 0.12 || 4 || 5"
-      }
-    },
-    "node_modules/karma-chrome-launcher": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz",
-      "integrity": "sha512-AiMVR7eY9MKLF3EVwgB08TyiHCBIUXAypgxcWJeOSUHB7QBvB2ebUr8tl0C0YwPS2Ce+oBAbR/SQkG46aLfJAA==",
-      "dev": true,
-      "dependencies": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
-      }
-    },
-    "node_modules/karma-chrome-launcher/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/karma-coverage": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-0.5.5.tgz",
-      "integrity": "sha512-nC6B3DdP0IhNVUH25kx7ztVBT5belTC4MQ2tDhvvGMUhrpUPA3vUipBC9XqE9WqfHQDjRfQdn4z7Y0iKC6axBA==",
-      "dev": true,
-      "dependencies": {
-        "dateformat": "^1.0.6",
-        "istanbul": "^0.4.0",
-        "minimatch": "^3.0.0",
-        "source-map": "^0.5.1"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/dateformat": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-      "integrity": "sha512-5sFRfAAmbHdIts+eKjR9kYJoF0ViCMVX9yqLu5A7S/v+nd077KgCITOMiirmyCBiZpKLDXbBOkYm6tu7rX/TKg==",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
-      },
-      "bin": {
-        "dateformat": "bin/cli.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
-      "dev": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+    "node_modules/just-extend": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
+      "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
       "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/karma-coverage/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+    "node_modules/karma": {
+      "version": "0.13.22",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-0.13.22.tgz",
+      "integrity": "sha512-A9/7e/IzHUkTcfjnTy5Wzo2P5wPuf7+QZh1JzNdTpYA0AN/vSrxfFjPKtKC3jRYJFZMJ7S1I9L2LItaJS1XMSg==",
       "dev": true,
       "dependencies": {
+        "batch": "^0.5.3",
+        "bluebird": "^2.9.27",
+        "body-parser": "^1.12.4",
+        "chokidar": "^1.4.1",
+        "colors": "^1.1.0",
+        "connect": "^3.3.5",
+        "core-js": "^2.1.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "expand-braces": "^0.1.1",
+        "glob": "^7.0.0",
         "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^3.8.0",
+        "log4js": "^0.6.31",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.0",
+        "optimist": "^0.6.1",
+        "rimraf": "^2.3.3",
+        "socket.io": "^1.4.5",
+        "source-map": "^0.5.3",
+        "useragent": "^2.1.6"
+      },
+      "bin": {
+        "karma": "bin/karma"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "0.10 || 0.12 || 4 || 5"
       }
     },
-    "node_modules/karma-coverage/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+    "node_modules/karma-chrome-launcher": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
+      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "which": "^1.2.1"
       }
     },
-    "node_modules/karma-coverage/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+    "node_modules/karma-chrome-launcher/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/karma-coverage/node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
+    "node_modules/karma-coverage": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
+      "integrity": "sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-reports": "^3.0.5",
+        "minimatch": "^3.0.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/karma-coverage/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+    "node_modules/karma-firefox-launcher": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.3.tgz",
+      "integrity": "sha512-LMM2bseebLbYjODBOVt7TCPP9OI2vZIXCavIXhkO9m+10Uj5l7u/SKoeRmYx8FYHTVGZSpk6peX+3BMHC1WwNw==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^2.2.0",
+        "which": "^3.0.0"
       }
     },
-    "node_modules/karma-coverage/node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
+    "node_modules/karma-firefox-launcher/node_modules/which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "get-stdin": "^4.0.1"
+        "isexe": "^2.0.0"
       },
       "bin": {
-        "strip-indent": "cli.js"
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/karma-firefox-launcher": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.7.tgz",
-      "integrity": "sha512-jS+2RpaVUlEojyWJWsL5MVSxW0h6dRiQ0bpT19bYmLejkI3qCENWU6+xkCOc8d3/K1l6h2mkz+XCi2KQqOyncQ==",
-      "dev": true
-    },
     "node_modules/karma-jasmine": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.3.8.tgz",
@@ -15676,24 +17107,28 @@
       }
     },
     "node_modules/karma-junit-reporter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-1.2.0.tgz",
-      "integrity": "sha512-FeuLOKlXNtJhIQK3oQASbO5QOib762CEHV8+L9wwTQpiZJgp7xKg3sNno66rL5bQPV2soG6fJdAFWqqnMJuh2w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-2.0.1.tgz",
+      "integrity": "sha512-VtcGfE0JE4OE1wn0LK8xxDKaTP7slN8DO3I+4xg6gAi1IoAHAXOJ1V9G/y45Xg6sxdxPOR3THCFtDlAfBo9Afw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-is-absolute": "^1.0.0",
-        "xmlbuilder": "8.2.2"
+        "xmlbuilder": "12.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
       },
       "peerDependencies": {
         "karma": ">=0.9"
       }
     },
     "node_modules/karma-requirejs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.6.tgz",
-      "integrity": "sha512-8T7U+QwCy36XIYvC1obbWnN766kCck6hcJ7ehr6cgSLq9SnsvqWUETexHbkOPQ2SXnabCb6lbLDNUk3yCPbbrA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/karma-requirejs/-/karma-requirejs-1.1.0.tgz",
+      "integrity": "sha512-MHTOYKdwwJBkvYid0TaYvBzOnFH3TDtzo6ie5E4o9SaUSXXsfMRLa/whUz6efVIgTxj1xnKYasNn/XwEgJeB/Q==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "karma": ">=0.9",
         "requirejs": "^2.1.0"
@@ -15723,18 +17158,26 @@
       }
     },
     "node_modules/karma-spec-reporter": {
-      "version": "0.0.36",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.36.tgz",
-      "integrity": "sha512-11bvOl1x6ryKZph7kmbmMpbi8vsngEGxGOoeTlIcDaH3ab3j8aPJnZ+r+K/SS0sBSGy5VGkGYO2+hLct7hw/6w==",
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.20.tgz",
+      "integrity": "sha512-pl+KmLNwnu802F/q9cZx5n20FuxA0ebwM3uMuy4Qh+GGfviy4EFK8I5Bl2cWogSRBUC2Fhg5oOsUFVlv/j5tuA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "colors": "1.4.0"
+        "colors": "~0.6.0"
       },
       "peerDependencies": {
         "karma": ">=0.9"
       }
     },
+    "node_modules/karma-spec-reporter/node_modules/colors": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "integrity": "sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/karma-webpack": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.1.tgz",
@@ -15776,15 +17219,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/karma-webpack/node_modules/webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      }
-    },
     "node_modules/karma/node_modules/lodash": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -15844,15 +17278,17 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/known-css-properties": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
-      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
+      "version": "0.34.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.34.0.tgz",
+      "integrity": "sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/language-subtag-registry": {
@@ -15888,13 +17324,15 @@
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
       "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
       "deprecated": "use String.prototype.padStart()",
-      "dev": true
+      "dev": true,
+      "license": "WTFPL"
     },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -15929,46 +17367,6 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -16074,6 +17472,13 @@
       "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
       "dev": true
     },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -16125,7 +17530,8 @@
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.template": {
       "version": "4.5.0",
@@ -16158,16 +17564,20 @@
       "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
     },
     "node_modules/log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.0.tgz",
+      "integrity": "sha512-zrc91EDk2M+2AXo/9BTvK91pqb7qrPg2nX/Hy+u8a5qQlbaOflCKO+6SqgZ+M+xUFxGdKTgwnGiL96b1W3ikRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^2.4.2"
+        "is-unicode-supported": "^2.0.0",
+        "yoctocolors": "^2.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log4js": {
@@ -16193,12 +17603,6 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/lolex": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz",
-      "integrity": "sha512-/bpxDL56TG5LS5zoXxKqA6Ro5tkOS5M8cm/7yQcwLIKIcM2HR5fjjNCaIhJNv96SEk4hNGSafYMZK42Xv5fihQ==",
-      "dev": true
-    },
     "node_modules/longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -16218,19 +17622,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
-      "dev": true,
-      "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -16255,6 +17646,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -16265,26 +17657,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-dir/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -16292,12 +17670,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/make-dir/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/make-fetch-happen": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
@@ -16385,138 +17757,47 @@
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/meow/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/meow/node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+    "node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "CC0-1.0"
     },
-    "node_modules/meow/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+    "node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
+      "dev": true
+    },
+    "node_modules/meow": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
+      "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/meow/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -16532,11 +17813,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -16544,20 +17826,22 @@
       }
     },
     "node_modules/micromatch/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/micromatch/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -16601,6 +17885,7 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -16614,20 +17899,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/mini-create-react-context": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.3.tgz",
-      "integrity": "sha512-TtF6hZE59SGmS4U8529qB+jJFeW6asTLDIpPgvPLSCsooAwJS7QprHIFTqv9/Qh3NdLwQxFYgiHX5lqb6jqzPA==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dependencies": {
-        "@babel/runtime": "^7.12.1",
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "prop-types": "^15.0.0",
-        "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
-      }
-    },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
@@ -16691,9 +17962,10 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -16901,9 +18173,10 @@
       }
     },
     "node_modules/moment-timezone": {
-      "version": "0.5.45",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
-      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+      "version": "0.5.46",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz",
+      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
+      "license": "MIT",
       "dependencies": {
         "moment": "^2.29.4"
       },
@@ -16918,9 +18191,10 @@
       "dev": true
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/mute-stream": {
       "version": "0.0.5",
@@ -16929,17 +18203,17 @@
       "dev": true
     },
     "node_modules/nan": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
-      "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
       "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -17002,18 +18276,20 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/native-promise-only": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
-      "integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==",
-      "dev": true
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/nearley": {
       "version": "2.20.1",
       "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
@@ -17061,27 +18337,62 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node_modules/node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+    "node_modules/nise": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz",
+      "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
+        "@sinonjs/commons": "^3.0.1",
+        "@sinonjs/fake-timers": "^13.0.1",
+        "@sinonjs/text-encoding": "^0.7.3",
+        "just-extend": "^6.2.0",
+        "path-to-regexp": "^8.1.0"
       }
     },
-    "node_modules/node-fetch/node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+    "node_modules/nise/node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/nise/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "node_modules/nise/node_modules/path-to-regexp": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/node-gyp": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz",
-      "integrity": "sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz",
+      "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==",
+      "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
@@ -17089,9 +18400,9 @@
         "graceful-fs": "^4.2.6",
         "make-fetch-happen": "^13.0.0",
         "nopt": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "proc-log": "^4.1.0",
         "semver": "^7.3.5",
-        "tar": "^6.1.2",
+        "tar": "^6.2.1",
         "which": "^4.0.0"
       },
       "bin": {
@@ -17101,39 +18412,31 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/node-gyp/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/node-gyp/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -17142,25 +18445,31 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
       "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=16"
       }
     },
-    "node_modules/node-gyp/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/node-gyp/node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
     "node_modules/node-gyp/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -17171,27 +18480,11 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/node-gyp/node_modules/nopt": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz",
-      "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==",
-      "dependencies": {
-        "abbrev": "^2.0.0"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/node-gyp/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -17203,6 +18496,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
       "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^3.1.1"
       },
@@ -17213,11 +18507,6 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/node-gyp/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -17230,6 +18519,7 @@
       "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
+      "peer": true,
       "dependencies": {
         "growly": "^1.3.0",
         "is-wsl": "^2.2.0",
@@ -17245,6 +18535,7 @@
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
       "optional": true,
+      "peer": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -17258,6 +18549,7 @@
       "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "dev": true,
       "optional": true,
+      "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -17273,7 +18565,8 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "peer": true
     },
     "node_modules/node-releases": {
       "version": "2.0.18",
@@ -17282,15 +18575,18 @@
       "license": "MIT"
     },
     "node_modules/nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
-      "dev": true,
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
+      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "license": "ISC",
       "dependencies": {
-        "abbrev": "1"
+        "abbrev": "^2.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/normalize-package-data": {
@@ -17318,6 +18614,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17361,6 +18658,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -17380,15 +18678,6 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/null-check": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha512-j8ZNHg19TyIQOWCGeeQJBuu6xZYIEurf8M1Qsfd8mFrGEfIZytbw18YjKWg+LcO25NowXGZXZpKAx+Ui3TFfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -17413,6 +18702,7 @@
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
@@ -17587,6 +18877,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
+      "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array.prototype.reduce": "^1.0.6",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "gopd": "^1.0.1",
+        "safe-array-concat": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object.groupby": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
@@ -17696,6 +19008,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -17776,18 +19089,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -17847,6 +19148,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -17938,7 +19245,6 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
       "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dev": true,
       "dependencies": {
         "entities": "^4.4.0"
       },
@@ -18041,15 +19347,16 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-scurry": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
-      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^9.1.1 || ^10.0.0",
+        "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -18087,9 +19394,9 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -18103,43 +19410,13 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/picturefill": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz",
-      "integrity": "sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
+    "node_modules/picturefill": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz",
+      "integrity": "sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8.0"
       }
     },
     "node_modules/pirates": {
@@ -18745,16 +20022,19 @@
       }
     },
     "node_modules/plur": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
-      "integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-5.1.0.tgz",
+      "integrity": "sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "irregular-plurals": "^2.0.0"
+        "irregular-plurals": "^3.3.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/pluralize": {
@@ -18767,7 +20047,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/point-in-polygon": {
       "version": "0.0.0",
@@ -19144,10 +20425,11 @@
       }
     },
     "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-      "dev": true
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
+      "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/postcss-selector-parser": {
       "version": "2.2.3",
@@ -19300,58 +20582,42 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/pretty-format/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/pretty-format/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "license": "MIT"
     },
     "node_modules/proc-log": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
-      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "license": "ISC",
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -19371,14 +20637,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dependencies": {
-        "asap": "~2.0.3"
-      }
-    },
     "node_modules/promise-retry": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
@@ -19396,6 +20654,7 @@
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -19405,13 +20664,14 @@
       }
     },
     "node_modules/prop-types": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
-      "integrity": "sha512-H16NHdiZ8szYSKNkCpmKmS8BCogxyABjJ1AqQknIY2iTpy1xC04egoBAzjKm+WU2pbuNxFonw921dnxR0QYAdw==",
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "license": "MIT",
       "dependencies": {
-        "fbjs": "^0.8.16",
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
       }
     },
     "node_modules/prop-types-exact": {
@@ -19457,6 +20717,32 @@
         "once": "^1.3.1"
       }
     },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/q": {
       "version": "0.9.7",
       "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
@@ -19518,16 +20804,6 @@
         }
       ]
     },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
@@ -19662,16 +20938,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/react-bootstrap/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-bootstrap/node_modules/react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -19712,16 +20978,6 @@
         "react": "^16.14.0"
       }
     },
-    "node_modules/react-dom/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-dropzone": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.3.0.tgz",
@@ -19753,16 +21009,6 @@
         "react": "^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/react-focus-lock/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-focus-on": {
       "version": "3.9.2",
       "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.9.2.tgz",
@@ -19800,16 +21046,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/react-focus-on/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-focus-on/node_modules/react-focus-lock": {
       "version": "2.11.2",
       "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.11.2.tgz",
@@ -19897,43 +21133,30 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/react-overlays/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-proptype-conditional-require": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz",
       "integrity": "sha512-nopsRn7KnGgazBe2c3H2+Kf+Csp6PGDRLiBkYEDMKY8o/EIgft/WnIm/OnAKTawZiLnJXHAqhpFBddvs6NiXlw=="
     },
     "node_modules/react-redux": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
-      "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
-      "dependencies": {
-        "hoist-non-react-statics": "^2.5.0",
-        "invariant": "^2.0.0",
-        "lodash": "^4.17.5",
-        "lodash-es": "^4.17.5",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz",
+      "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2",
+        "hoist-non-react-statics": "^3.3.0",
+        "invariant": "^2.2.4",
         "loose-envify": "^1.1.0",
-        "prop-types": "^15.6.0"
+        "prop-types": "^15.6.1",
+        "react-is": "^16.6.0",
+        "react-lifecycles-compat": "^3.0.0"
       },
       "peerDependencies": {
         "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0-0",
         "redux": "^2.0.0 || ^3.0.0 || ^4.0.0-0"
       }
     },
-    "node_modules/react-redux/node_modules/hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-    },
     "node_modules/react-remove-scroll": {
       "version": "2.5.9",
       "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.9.tgz",
@@ -19995,26 +21218,16 @@
         "react": "^16.3.0"
       }
     },
-    "node_modules/react-responsive/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-router": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz",
-      "integrity": "sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
+      "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "hoist-non-react-statics": "^3.1.0",
         "loose-envify": "^1.3.1",
-        "mini-create-react-context": "^0.3.0",
         "path-to-regexp": "^1.7.0",
         "prop-types": "^15.6.2",
         "react-is": "^16.6.0",
@@ -20026,15 +21239,16 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz",
-      "integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
+      "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "loose-envify": "^1.3.1",
         "prop-types": "^15.6.2",
-        "react-router": "5.1.2",
+        "react-router": "5.3.4",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
       },
@@ -20042,30 +21256,11 @@
         "react": ">=15"
       }
     },
-    "node_modules/react-router-dom/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/react-router/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "node_modules/react-slick": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.29.0.tgz",
-      "integrity": "sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA==",
+      "version": "0.30.2",
+      "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.30.2.tgz",
+      "integrity": "sha512-XvQJi7mRHuiU3b9irsqS9SGIgftIfdV5/tNcURTb5LdIokRA5kIIx3l4rlq2XYHfxcSntXapoRg/GxaVOM1yfg==",
+      "license": "MIT",
       "dependencies": {
         "classnames": "^2.2.5",
         "enquire.js": "^2.1.6",
@@ -20109,120 +21304,38 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "react": "^16.8.3 || ^17.0.0-0 || ^18.0.0"
-      }
-    },
-    "node_modules/react-test-renderer": {
-      "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
-      "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "react-is": "^16.8.6",
-        "scheduler": "^0.19.1"
-      },
-      "peerDependencies": {
-        "react": "^16.14.0"
-      }
-    },
-    "node_modules/react-test-renderer/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/react-transition-group": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-      "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
-      "dependencies": {
-        "dom-helpers": "^3.4.0",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2",
-        "react-lifecycles-compat": "^3.0.4"
-      },
-      "peerDependencies": {
-        "react": ">=15.0.0",
-        "react-dom": ">=15.0.0"
-      }
-    },
-    "node_modules/react-transition-group/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/react/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "react": "^16.8.3 || ^17.0.0-0 || ^18.0.0"
       }
     },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+    "node_modules/react-test-renderer": {
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
+      "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.8.6",
+        "scheduler": "^0.19.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "react": "^16.14.0"
       }
     },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+    "node_modules/react-transition-group": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+      "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+      "dependencies": {
+        "dom-helpers": "^3.4.0",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2",
+        "react-lifecycles-compat": "^3.0.4"
+      },
+      "peerDependencies": {
+        "react": ">=15.0.0",
+        "react-dom": ">=15.0.0"
       }
     },
     "node_modules/readable-stream": {
@@ -20586,30 +21699,29 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rechoir": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+    "node_modules/realpath-native": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
+      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "resolve": "^1.20.0"
+        "util.promisify": "^1.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=4"
       }
     },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
+        "resolve": "^1.20.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/reduce-css-calc": {
@@ -20690,12 +21802,14 @@
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -20759,14 +21873,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
+      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.11.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -20774,25 +21889,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "license": "MIT"
+    },
     "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
+      "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -20817,24 +21931,13 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
-      "dev": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/request": {
       "version": "2.88.2",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
       "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -20866,6 +21969,7 @@
       "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
       "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lodash": "^4.17.19"
       },
@@ -20882,6 +21986,7 @@
       "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
       "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "request-promise-core": "1.1.4",
         "stealthy-require": "^1.1.1",
@@ -20894,20 +21999,12 @@
         "request": "^2.34"
       }
     },
-    "node_modules/request-promise-native/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/request-promise-native/node_modules/tough-cookie": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -20916,34 +22013,12 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/request/node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/request/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/request/node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
       "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.6"
       }
@@ -20953,6 +22028,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -20967,6 +22043,7 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "uuid": "bin/uuid"
       }
@@ -20976,6 +22053,7 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -21098,6 +22176,16 @@
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/restore-cursor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
@@ -21193,42 +22281,49 @@
       }
     },
     "node_modules/rtlcss": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.6.2.tgz",
-      "integrity": "sha512-06LFAr+GAPo+BvaynsXRfoYTJvSaWRyOhURCQ7aeI1MKph9meM222F+Zkt3bDamyHHJuGi3VPtiRkpyswmQbGA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.3.0.tgz",
+      "integrity": "sha512-FI+pHEn7Wc4NqKXMXFM+VAYKEj/mRIcW4h24YVwVtyjI+EqGrLc2Hx/Ny0lrZ21cBWU2goLy36eqMcNj3AQJig==",
       "license": "MIT",
       "dependencies": {
-        "@choojs/findup": "^0.2.1",
-        "chalk": "^2.4.2",
-        "mkdirp": "^0.5.1",
-        "postcss": "^6.0.23",
-        "strip-json-comments": "^2.0.0"
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.21",
+        "strip-json-comments": "^3.1.1"
       },
       "bin": {
         "rtlcss": "bin/rtlcss.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
     "node_modules/rtlcss/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/rtlcss/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/run-async": {
@@ -21340,13 +22435,6 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "node_modules/samsam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
-      "deprecated": "This package has been deprecated in favour of @sinonjs/samsam",
-      "dev": true
-    },
     "node_modules/sane": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
@@ -21901,12 +22989,13 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.72.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz",
-      "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==",
+      "version": "1.82.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.82.0.tgz",
+      "integrity": "sha512-j4GMCTa8elGyN9A7x7bEglx0VgSpNUG4W4wNedQ33wSMdnkqQCT8HTwOaVSV4e6yQovcu/3Oc4coJP/l0xhL2Q==",
+      "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -21914,12 +23003,16 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.1.1.tgz",
-      "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.4.tgz",
+      "integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
+      "license": "MIT",
       "dependencies": {
         "neo-async": "^2.6.2"
       },
@@ -21955,93 +23048,32 @@
         }
       }
     },
-    "node_modules/sass/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/sass/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "readdirp": "^4.0.1"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">= 14.16.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/sass/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sass/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/sass/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
     "node_modules/sass/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/sax": {
@@ -22050,14 +23082,15 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=v12.22.7"
       }
     },
     "node_modules/scheduler": {
@@ -22124,33 +23157,39 @@
       "integrity": "sha512-qGVDoreyYiP1pkQnbnFAUIS5AjenNwwQBdl7zeos9etl+hYKWahjRTfzAZZYBv5xNHx7vNKCmaLDQZ6Fr2AEXg=="
     },
     "node_modules/selenium-webdriver": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
-      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
+      "version": "4.27.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.27.0.tgz",
+      "integrity": "sha512-LkTJrNz5socxpPnWPODQ2bQ65eYx9JK+DQMYNihpTjMCqHwgWGYQnQTCAAche2W3ZP87alA+1zYPvgS8tHNzMQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/SeleniumHQ"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/selenium"
+        }
+      ],
       "license": "Apache-2.0",
       "dependencies": {
-        "jszip": "^3.1.3",
-        "rimraf": "^2.5.4",
-        "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
+        "@bazel/runfiles": "^6.3.1",
+        "jszip": "^3.10.1",
+        "tmp": "^0.2.3",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">= 6.9.0"
+        "node": ">= 14.21.0"
       }
     },
-    "node_modules/selenium-webdriver/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+    "node_modules/selenium-webdriver/node_modules/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.14"
       }
     },
     "node_modules/semver": {
@@ -22169,12 +23208,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -22256,7 +23289,8 @@
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "dev": true
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
@@ -22312,7 +23346,8 @@
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "peer": true
     },
     "node_modules/side-channel": {
       "version": "1.0.6",
@@ -22343,31 +23378,73 @@
       "integrity": "sha512-Mc/gH3RvlKvB/gkp9XwgDKEWrSYyefIJPGG8Jk1suZms/rISdUuVEMx5O1WBnTWaScvxXDvGJrZQWblUmQHjkQ=="
     },
     "node_modules/sinon": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.4.1.tgz",
-      "integrity": "sha512-vFTrO9Wt0ECffDYIPSP/E5bBugt0UjcBQOfQUMh66xzkyPEnhl/vM2LRZi2ajuTdkH07sA6DzrM6KvdvGIH8xw==",
-      "deprecated": "16.1.1",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz",
+      "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "diff": "^3.1.0",
-        "formatio": "1.2.0",
-        "lolex": "^1.6.0",
-        "native-promise-only": "^0.8.1",
-        "path-to-regexp": "^1.7.0",
-        "samsam": "^1.1.3",
-        "text-encoding": "0.6.4",
-        "type-detect": "^4.0.0"
+        "@sinonjs/commons": "^3.0.1",
+        "@sinonjs/fake-timers": "^13.0.2",
+        "@sinonjs/samsam": "^8.0.1",
+        "diff": "^7.0.0",
+        "nise": "^6.1.1",
+        "supports-color": "^7.2.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/sinon"
+      }
+    },
+    "node_modules/sinon/node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "node_modules/sinon/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.1.103"
+        "node": ">=8"
+      }
+    },
+    "node_modules/sinon/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -22768,9 +23845,10 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -22865,6 +23943,7 @@
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -22889,7 +23968,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ssri": {
       "version": "10.0.5",
@@ -22906,6 +23986,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -22917,6 +23998,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -22973,6 +24055,7 @@
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
       "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -23004,6 +24087,7 @@
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -23195,6 +24279,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -23213,29 +24298,15 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -23244,47 +24315,19 @@
       }
     },
     "node_modules/style-loader": {
-      "version": "0.18.2",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz",
-      "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==",
-      "dependencies": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^0.3.0"
-      },
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz",
+      "integrity": "sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/style-loader/node_modules/ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-      "dependencies": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
-      }
-    },
-    "node_modules/style-loader/node_modules/fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw=="
-    },
-    "node_modules/style-loader/node_modules/json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA=="
-    },
-    "node_modules/style-loader/node_modules/schema-utils": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-      "integrity": "sha512-QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q==",
-      "dependencies": {
-        "ajv": "^5.0.0"
+        "node": ">= 18.12.0"
       },
-      "engines": {
-        "node": ">= 4.3 < 5.0.0 || >= 5.10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.27.0"
       }
     },
     "node_modules/style-search": {
@@ -23294,214 +24337,389 @@
       "dev": true
     },
     "node_modules/stylelint": {
-      "version": "14.16.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
-      "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.10.0.tgz",
+      "integrity": "sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/stylelint"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/stylelint"
+        }
+      ],
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@csstools/selector-specificity": "^2.0.2",
+        "@csstools/css-parser-algorithms": "^3.0.1",
+        "@csstools/css-tokenizer": "^3.0.1",
+        "@csstools/media-query-list-parser": "^3.0.1",
+        "@csstools/selector-specificity": "^4.0.0",
+        "@dual-bundle/import-meta-resolve": "^4.1.0",
         "balanced-match": "^2.0.0",
         "colord": "^2.9.3",
-        "cosmiconfig": "^7.1.0",
-        "css-functions-list": "^3.1.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.2.12",
+        "cosmiconfig": "^9.0.0",
+        "css-functions-list": "^3.2.3",
+        "css-tree": "^3.0.0",
+        "debug": "^4.3.7",
+        "fast-glob": "^3.3.2",
         "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^9.1.0",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
-        "html-tags": "^3.2.0",
-        "ignore": "^5.2.1",
-        "import-lazy": "^4.0.0",
+        "html-tags": "^3.3.1",
+        "ignore": "^6.0.2",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.26.0",
+        "known-css-properties": "^0.34.0",
         "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.5",
+        "meow": "^13.2.0",
+        "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.19",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.11",
+        "picocolors": "^1.0.1",
+        "postcss": "^8.4.47",
+        "postcss-resolve-nested-selector": "^0.1.6",
+        "postcss-safe-parser": "^7.0.1",
+        "postcss-selector-parser": "^6.1.2",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.3.0",
+        "supports-hyperlinks": "^3.1.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.8.1",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.2"
+        "table": "^6.8.2",
+        "write-file-atomic": "^5.0.1"
       },
       "bin": {
-        "stylelint": "bin/stylelint.js"
+        "stylelint": "bin/stylelint.mjs"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-formatter-pretty/-/stylelint-formatter-pretty-4.0.1.tgz",
+      "integrity": "sha512-39nasPN8QNdMBq2eghI/SwpyVKx8kJGtmE/KJ5oFvCg0ZvZ5qjJbQgEulzC0gT70XZ+iRk7p1W5tE9IBQhFjPw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz/"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^7.0.0",
+        "log-symbols": "^7.0.0",
+        "picocolors": "^1.0.0",
+        "plur": "^5.1.0",
+        "string-width": "^7.0.0",
+        "supports-hyperlinks": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "stylelint": ">=16.0.0"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint-formatter-pretty/node_modules/supports-hyperlinks": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
+      "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
+      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "node_modules/stylelint/node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
+      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/stylelint-formatter-pretty": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/stylelint-formatter-pretty/-/stylelint-formatter-pretty-1.1.4.tgz",
-      "integrity": "sha512-wgPu7UaWJO8ISiSXelp46jhtM8J/CIsrndgpUOow80v0GvyrmLrRURCFV16oKddkH0NcjlO91C7c+ef2U+siNw==",
+    "node_modules/stylelint/node_modules/@csstools/media-query-list-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz",
+      "integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "license": "MIT",
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "chalk": "^3.0.0",
-        "log-symbols": "^3.0.0",
-        "plur": "^3.1.1",
-        "string-width": "^4.2.0"
+      "peer": true,
+      "engines": {
+        "node": ">=18"
       },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.1",
+        "@csstools/css-tokenizer": "^3.0.1"
+      }
+    },
+    "node_modules/stylelint/node_modules/@csstools/selector-specificity": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
+      "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.1.0"
       }
     },
-    "node_modules/stylelint-formatter-pretty/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/stylelint/node_modules/css-tree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.0.1.tgz",
+      "integrity": "sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "mdn-data": "2.12.1",
+        "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
-    "node_modules/stylelint-formatter-pretty/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+    "node_modules/stylelint/node_modules/file-entry-cache": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.1.0.tgz",
+      "integrity": "sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "flat-cache": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/stylelint-formatter-pretty/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/stylelint/node_modules/flat-cache": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz",
+      "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "flatted": "^3.3.1",
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/stylelint-formatter-pretty/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/stylelint-formatter-pretty/node_modules/has-flag": {
+    "node_modules/stylelint/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/stylelint-formatter-pretty/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/stylelint/node_modules/ignore": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint-scss": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
-      "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1 || ^15.0.0"
-      }
-    },
-    "node_modules/stylelint-scss/node_modules/postcss-selector-parser": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
-      "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/stylelint-scss/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/@csstools/selector-specificity": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
-      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
-      "dev": true,
       "peer": true,
       "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.10"
+        "node": ">= 4"
       }
     },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+    "node_modules/stylelint/node_modules/mdn-data": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.1.tgz",
+      "integrity": "sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==",
       "dev": true,
+      "license": "CC0-1.0",
       "peer": true
     },
     "node_modules/stylelint/node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
       "dev": true,
       "funding": [
         {
@@ -23517,38 +24735,51 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/stylelint/node_modules/postcss-safe-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz",
+      "integrity": "sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "peer": true,
       "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "node": ">=18.0"
       },
       "peerDependencies": {
-        "postcss": "^8.3.3"
+        "postcss": "^8.4.31"
       }
     },
     "node_modules/stylelint/node_modules/postcss-selector-parser": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
-      "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -23565,63 +24796,76 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/stylelint/node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+    "node_modules/stylelint/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
+      "license": "ISC",
       "peer": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/stylelint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+    "node_modules/stylelint/node_modules/supports-hyperlinks": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
+      "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/stylelint/node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -23831,22 +25075,6 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terser": {
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.30.0.tgz",
@@ -23961,14 +25189,7 @@
       },
       "engines": {
         "node": ">=8"
-      }
-    },
-    "node_modules/text-encoding": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-      "integrity": "sha512-hJnc6Qg3dWoOMkqP53F0dzRIgtmsAge09kxUIqGrEUS4qr5rWLckGYaQAVr+opBrIMRErGgy6f5aPnyPpyGRfg==",
-      "deprecated": "no longer maintained",
-      "dev": true
+      }
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -23976,12 +25197,6 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/throat": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
-      "dev": true
-    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -24055,14 +25270,6 @@
       "integrity": "sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==",
       "dev": true
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -24149,41 +25356,16 @@
         "node": ">=6"
       }
     },
-    "node_modules/tough-cookie/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.1"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tr46/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/tsconfig-paths": {
@@ -24227,11 +25409,37 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
+      "license": "0BSD",
+      "peer": true
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -24243,7 +25451,8 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true
+      "dev": true,
+      "license": "Unlicense"
     },
     "node_modules/type": {
       "version": "2.7.2",
@@ -24371,13 +25580,19 @@
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+    "node_modules/typescript": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
       }
     },
     "node_modules/typhonjs-ast-walker": {
@@ -24435,28 +25650,6 @@
       "integrity": "sha512-2qReiiM1W8dVZakdAhZuEVxQvr+/MlqWGFkPckpDT733tUgYRQmJMvjulXs6cnmpMUqc+d1OVaYbnInZ4tzC7A==",
       "dev": true
     },
-    "node_modules/ua-parser-js": {
-      "version": "0.7.37",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz",
-      "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/uglify-js": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz",
@@ -24474,11 +25667,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/uglify-js/node_modules/async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ=="
-    },
     "node_modules/uglify-js/node_modules/camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
@@ -24505,14 +25693,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/uglify-js/node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/uglify-js/node_modules/yargs": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
@@ -24564,9 +25744,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
-      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
       "license": "MIT"
     },
     "node_modules/underscore.string": {
@@ -24592,9 +25772,10 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -24603,6 +25784,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -24612,9 +25794,10 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -24623,6 +25806,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -24772,9 +25956,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "funding": [
         {
           "type": "opencollective",
@@ -24791,8 +25975,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -24809,14 +25993,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/uri-js/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/urijs": {
       "version": "1.19.11",
       "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
@@ -24945,6 +26121,25 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/util.promisify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.2.tgz",
+      "integrity": "sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "object.getownpropertydescriptors": "^2.1.6",
+        "safe-array-concat": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/util/node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
@@ -24965,39 +26160,32 @@
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
       "optional": true,
+      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
-      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/v8-to-istanbul": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
-      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
+        "convert-source-map": "^2.0.0"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=10.12.0"
       }
     },
-    "node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
+      "license": "MIT"
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
@@ -25031,6 +26219,7 @@
       "engines": [
         "node >=0.6.0"
       ],
+      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -25041,7 +26230,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/void-elements": {
       "version": "2.0.1",
@@ -25057,19 +26247,30 @@
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dev": true,
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
     "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+      "license": "MIT",
       "dependencies": {
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      }
+    },
+    "node_modules/w3c-xmlserializer/node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/walker": {
@@ -25102,26 +26303,27 @@
       }
     },
     "node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=10.4"
+        "node": ">=12"
       }
     },
     "node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -25262,11 +26464,12 @@
       }
     },
     "node_modules/webpack-merge": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz",
-      "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "license": "MIT",
       "dependencies": {
-        "lodash": "^4.17.4"
+        "lodash": "^4.17.15"
       }
     },
     "node_modules/webpack-sources": {
@@ -25343,6 +26546,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
       "dependencies": {
         "iconv-lite": "0.4.24"
       }
@@ -25356,19 +26560,20 @@
     "node_modules/whatwg-mimetype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
     },
     "node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "license": "MIT",
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/whet.extend": {
@@ -25470,12 +26675,6 @@
         "rbush": "^1.3.2"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
-    },
     "node_modules/which-typed-array": {
       "version": "1.1.15",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
@@ -25518,23 +26717,29 @@
       }
     },
     "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
     "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/wrap-ansi-cjs": {
@@ -25589,6 +26794,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -25604,6 +26810,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -25615,7 +26822,8 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
@@ -25635,27 +26843,30 @@
       }
     },
     "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -25675,43 +26886,24 @@
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
-    },
-    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "dev": true,
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/xml2js/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
     },
     "node_modules/xmlbuilder": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
-      "integrity": "sha512-eKRAFz04jghooy8muekqzo8uCSVNeyRedbuJrp0fovbLIi7wlsYtdUn3vBAAPq2Y3/0xMz2WMEUQ8yhVVO9Stw==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-12.0.0.tgz",
+      "integrity": "sha512-lMo8DJ8u6JRWp0/Y4XLa/atVDr75H9litKlb2E5j3V3MesoL50EBgZDWoLT3F/LztVnG67GjPXLZpqcky/UMnQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6.0"
       }
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "license": "MIT"
     },
     "node_modules/xmlhttprequest-ssl": {
       "version": "1.6.3",
@@ -25732,46 +26924,37 @@
       }
     },
     "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/yargs-parser": {
@@ -25784,16 +26967,13 @@
       }
     },
     "node_modules/yargs/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
     "node_modules/yeast": {
@@ -25813,6 +26993,19 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/yoctocolors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
+      "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 3bd526c3b481..8ed93a322633 100644
--- a/package.json
+++ b/package.json
@@ -12,14 +12,34 @@
     "compile-sass-dev": "scripts/compile_sass.py --env=development",
     "watch": "{ npm run watch-webpack& npm run watch-sass& } && sleep infinity",
     "watch-webpack": "npm run webpack-dev -- --watch",
-    "watch-sass": "scripts/watch_sass.sh"
+    "watch-sass": "scripts/watch_sass.sh",
+    "lint": "python scripts/eslint.py",
+    "test": "npm run test-jest && npm run test-karma",
+    "test-jest": "jest",
+    "test-karma": "npm run test-karma-vanilla && npm run test-karma-require && echo 'WARNING: Skipped broken webpack tests. For details, see: https://github.com/openedx/edx-platform/issues/35956'",
+    "test-karma-vanilla": "npm run test-cms-vanilla && npm run test-xmodule-vanilla && npm run test-common-vanilla",
+    "test-karma-require": "npm run test-cms-require && npm run test-common-require",
+    "test-karma-webpack": "npm run test-cms-webpack && npm run test-lms-webpack && npm run test-xmodule-webpack",
+    "test-karma-conf": "${NODE_WRAPPER:-xvfb-run --auto-servernum} node --max_old_space_size=4096 node_modules/.bin/karma start --single-run=true --capture-timeout=60000 --browsers=FirefoxNoUpdates",
+    "test-cms": "npm run test-cms-vanilla && npm run test-cms-require && npm run test-cms-webpack",
+    "test-cms-vanilla": "npm run test-karma-conf -- cms/static/karma_cms.conf.js",
+    "test-cms-require": "npm run test-karma-conf -- cms/static/karma_cms_squire.conf.js",
+    "test-cms-webpack": "npm run test-karma-conf -- cms/static/karma_cms_webpack.conf.js",
+    "test-lms": "npm run test-jest && npm run test-lms-webpack",
+    "test-lms-webpack": "npm run test-karma-conf -- lms/static/karma_lms.conf.js",
+    "test-xmodule": "npm run test-xmodule-vanilla && npm run test-xmodule-webpack",
+    "test-xmodule-vanilla": "npm run test-karma-conf -- xmodule/js/karma_xmodule.conf.js",
+    "test-xmodule-webpack": "npm run test-karma-conf -- xmodule/js/karma_xmodule_webpack.conf.js",
+    "test-common": "npm run test-common-vanilla && npm run test-common-require",
+    "test-common-vanilla": "npm run test-karma-conf -- common/static/karma_common.conf.js",
+    "test-common-require": "npm run test-karma-conf -- common/static/karma_common_requirejs.conf.js"
   },
   "dependencies": {
-    "@babel/core": "7.25.2",
+    "@babel/core": "7.26.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
     "@babel/plugin-transform-object-assign": "^7.18.6",
     "@babel/preset-env": "^7.19.0",
-    "@babel/preset-react": "7.24.7",
+    "@babel/preset-react": "7.26.3",
     "@edx/brand-edx.org": "^2.0.7",
     "@edx/edx-bootstrap": "1.0.4",
     "@edx/edx-proctoring": "^4.18.1",
@@ -34,84 +54,84 @@
     "backbone.paginator": "2.0.8",
     "bootstrap": "4.0.0",
     "camelize": "1.0.1",
-    "classnames": "2.3.1",
+    "classnames": "2.5.1",
     "css-loader": "0.28.8",
     "datatables": "1.10.18",
-    "datatables.net-fixedcolumns": "3.2.6",
+    "datatables.net-fixedcolumns": "5.0.4",
     "edx-proctoring-proctortrack": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#f0fa9edbd16aa5af5a41ac309d2609e529ea8732",
-    "edx-ui-toolkit": "1.5.5",
+    "edx-ui-toolkit": "1.8.6",
     "exports-loader": "0.6.4",
     "file-loader": "^6.2.0",
     "font-awesome": "4.7.0",
     "hls.js": "0.14.17",
-    "imports-loader": "0.7.1",
-    "jest-environment-jsdom": "^26.0.0",
+    "imports-loader": "0.8.0",
+    "jest-environment-jsdom": "^29.0.0",
     "jquery": "2.2.4",
     "jquery-migrate": "1.4.1",
     "jquery.scrollto": "2.1.3",
     "js-cookie": "3.0.5",
     "moment": "2.30.1",
-    "moment-timezone": "0.5.45",
-    "node-gyp": "10.0.1",
+    "moment-timezone": "0.5.46",
+    "node-gyp": "10.3.1",
     "picturefill": "3.0.3",
     "popper.js": "1.16.1",
-    "prop-types": "15.6.0",
+    "prop-types": "15.8.1",
     "raw-loader": "0.5.1",
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-focus-lock": "^1.19.1",
-    "react-redux": "5.0.7",
-    "react-router-dom": "5.1.2",
-    "react-slick": "0.29.0",
+    "react-redux": "5.1.2",
+    "react-router-dom": "5.3.4",
+    "react-slick": "0.30.2",
     "redux": "3.7.2",
     "redux-thunk": "2.2.0",
     "requirejs": "2.3.7",
-    "rtlcss": "2.6.2",
+    "rtlcss": "4.3.0",
     "sass": "^1.54.8",
-    "sass-loader": "^14.1.1",
+    "sass-loader": "^16.0.0",
     "scriptjs": "2.5.9",
-    "style-loader": "0.18.2",
+    "style-loader": "4.0.0",
     "svg-inline-loader": "0.8.2",
     "uglify-js": "2.7.0",
-    "underscore": "1.12.1",
+    "underscore": "1.13.7",
     "underscore.string": "3.3.6",
     "webpack": "^5.90.3",
     "webpack-bundle-tracker": "0.4.3",
-    "webpack-merge": "4.1.1",
+    "webpack-merge": "4.2.2",
     "whatwg-fetch": "2.0.4",
     "which-country": "1.0.0"
   },
   "devDependencies": {
-    "@edx/eslint-config": "^3.1.1",
-    "@edx/mockprock": "github:openedx/mockprock#3ad18c6888e6521e9bf7a4df0db6f8579b928235",
+    "@edx/eslint-config": "^4.0.0",
+    "@edx/mockprock": "github:openedx/mockprock#d70b05231bd46b0122616c24e209c890ef2633c0",
     "@edx/stylelint-config-edx": "2.3.3",
-    "babel-jest": "26.6.3",
+    "babel-jest": "29.7.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.8",
-    "eslint-import-resolver-webpack": "0.13.8",
+    "eslint-import-resolver-webpack": "0.13.9",
     "jasmine-core": "2.6.4",
     "jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
-    "jest": "26.6.3",
-    "jest-enzyme": "6.1.2",
+    "jest": "29.7.0",
+    "jest-enzyme": "7.1.2",
     "karma": "0.13.22",
-    "karma-chrome-launcher": "0.2.3",
-    "karma-coverage": "0.5.5",
-    "karma-firefox-launcher": "0.1.7",
+    "karma-chrome-launcher": "3.2.0",
+    "karma-coverage": "2.2.1",
+    "karma-firefox-launcher": "2.1.3",
     "karma-jasmine": "0.3.8",
     "karma-jasmine-html-reporter": "0.2.2",
-    "karma-junit-reporter": "1.2.0",
-    "karma-requirejs": "0.2.6",
+    "karma-junit-reporter": "2.0.1",
+    "karma-requirejs": "1.1.0",
     "karma-selenium-webdriver-launcher": "github:openedx/karma-selenium-webdriver-launcher#0.0.4-openedx.0",
     "karma-sourcemap-loader": "0.4.0",
-    "karma-spec-reporter": "0.0.36",
+    "karma-spec-reporter": "0.0.20",
     "karma-webpack": "^5.0.1",
     "plato": "1.7.0",
     "react-test-renderer": "16.14.0",
-    "selenium-webdriver": "3.6.0",
-    "sinon": "2.4.1",
+    "selenium-webdriver": "4.27.0",
+    "sinon": "19.0.2",
     "squirejs": "0.1.0",
     "string-replace-loader": "^3.1.0",
-    "stylelint-formatter-pretty": "1.1.4",
+    "stylelint-formatter-pretty": "4.0.1",
     "webpack-cli": "^5.1.4"
   }
 }
diff --git a/pavelib/__init__.py b/pavelib/__init__.py
deleted file mode 100644
index 875068166ff5..000000000000
--- a/pavelib/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""  # lint-amnesty, pylint: disable=django-not-configured
-paver commands
-"""
-
-
-from . import assets, js_test, prereqs, quality
diff --git a/pavelib/assets.py b/pavelib/assets.py
deleted file mode 100644
index f437b6427f93..000000000000
--- a/pavelib/assets.py
+++ /dev/null
@@ -1,506 +0,0 @@
-"""
-Asset compilation and collection.
-
-This entire module is DEPRECATED. In Redwood, it exists just as a collection of temporary compatibility wrappers.
-In Sumac, this module will be deleted. To migrate, follow the advice in the printed warnings and/or read the
-instructions on the DEPR ticket: https://github.com/openedx/edx-platform/issues/31895
-"""
-
-import argparse
-import glob
-import json
-import shlex
-import traceback
-from functools import wraps
-from threading import Timer
-
-from paver import tasks
-from paver.easy import call_task, cmdopts, consume_args, needs, no_help, sh, task
-from watchdog.events import PatternMatchingEventHandler
-from watchdog.observers import Observer  # pylint: disable=unused-import  # Used by Tutor. Remove after Sumac cut.
-
-from .utils.cmd import django_cmd
-from .utils.envs import Env
-from .utils.timer import timed
-
-
-SYSTEMS = {
-    'lms': 'lms',
-    'cms': 'cms',
-    'studio': 'cms',
-}
-
-WARNING_SYMBOLS = "⚠️ " * 50  # A row of 'warning' emoji to catch CLI users' attention
-
-
-def run_deprecated_command_wrapper(*, old_command, ignored_old_flags, new_command):
-    """
-    Run the new version of shell command, plus a warning that the old version is deprecated.
-    """
-    depr_warning = (
-        "\n" +
-        f"{WARNING_SYMBOLS}\n" +
-        "\n" +
-        f"WARNING: '{old_command}' is DEPRECATED! It will be removed before Sumac.\n" +
-        "The command you ran is now just a temporary wrapper around a new,\n" +
-        "supported command, which you should use instead:\n" +
-        "\n" +
-        f"\t{new_command}\n" +
-        "\n" +
-        "Details: https://github.com/openedx/edx-platform/issues/31895\n" +
-        "".join(
-            f" WARNING: ignored deprecated paver flag '{flag}'\n"
-            for flag in ignored_old_flags
-        ) +
-        f"{WARNING_SYMBOLS}\n" +
-        "\n"
-    )
-    # Print deprecation warning twice so that it's more likely to be seen in the logs.
-    print(depr_warning)
-    sh(new_command)
-    print(depr_warning)
-
-
-def debounce(seconds=1):
-    """
-    Prevents the decorated function from being called more than every `seconds`
-    seconds. Waits until calls stop coming in before calling the decorated
-    function.
-
-    This is DEPRECATED. It exists in Redwood just to ease the transition for Tutor.
-    """
-    def decorator(func):
-        func.timer = None
-
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            def call():
-                func(*args, **kwargs)
-                func.timer = None
-            if func.timer:
-                func.timer.cancel()
-            func.timer = Timer(seconds, call)
-            func.timer.start()
-
-        return wrapper
-    return decorator
-
-
-class SassWatcher(PatternMatchingEventHandler):
-    """
-    Watches for sass file changes
-
-    This is DEPRECATED. It exists in Redwood just to ease the transition for Tutor.
-    """
-    ignore_directories = True
-    patterns = ['*.scss']
-
-    def register(self, observer, directories):
-        """
-        register files with observer
-        Arguments:
-            observer (watchdog.observers.Observer): sass file observer
-            directories (list): list of directories to be register for sass watcher.
-        """
-        for dirname in directories:
-            paths = []
-            if '*' in dirname:
-                paths.extend(glob.glob(dirname))
-            else:
-                paths.append(dirname)
-
-            for obs_dirname in paths:
-                observer.schedule(self, obs_dirname, recursive=True)
-
-    @debounce()
-    def on_any_event(self, event):
-        print('\tCHANGED:', event.src_path)
-        try:
-            compile_sass()      # pylint: disable=no-value-for-parameter
-        except Exception:       # pylint: disable=broad-except
-            traceback.print_exc()
-
-
-@task
-@no_help
-@cmdopts([
-    ('system=', 's', 'The system to compile sass for (defaults to all)'),
-    ('theme-dirs=', '-td', 'Theme dirs containing all themes (defaults to None)'),
-    ('themes=', '-t', 'The theme to compile sass for (defaults to None)'),
-    ('debug', 'd', 'Whether to use development settings'),
-    ('force', '', 'DEPRECATED. Full recompilation is now always forced.'),
-])
-@timed
-def compile_sass(options):
-    """
-    Compile Sass to CSS. If command is called without any arguments, it will
-    only compile lms, cms sass for the open source theme. And none of the comprehensive theme's sass would be compiled.
-
-    If you want to compile sass for all comprehensive themes you will have to run compile_sass
-    specifying all the themes that need to be compiled..
-
-    The following is a list of some possible ways to use this command.
-
-    Command:
-        paver compile_sass
-    Description:
-        compile sass files for both lms and cms. If command is called like above (i.e. without any arguments) it will
-        only compile lms, cms sass for the open source theme. None of the theme's sass will be compiled.
-
-    Command:
-        paver compile_sass --theme-dirs /edx/app/edxapp/edx-platform/themes --themes=red-theme
-    Description:
-        compile sass files for both lms and cms for 'red-theme' present in '/edx/app/edxapp/edx-platform/themes'
-
-    Command:
-        paver compile_sass --theme-dirs=/edx/app/edxapp/edx-platform/themes --themes red-theme stanford-style
-    Description:
-        compile sass files for both lms and cms for 'red-theme' and 'stanford-style' present in
-        '/edx/app/edxapp/edx-platform/themes'.
-
-    Command:
-        paver compile_sass --system=cms
-            --theme-dirs /edx/app/edxapp/edx-platform/themes /edx/app/edxapp/edx-platform/common/test/
-            --themes red-theme stanford-style test-theme
-    Description:
-        compile sass files for cms only for 'red-theme', 'stanford-style' and 'test-theme' present in
-        '/edx/app/edxapp/edx-platform/themes' and '/edx/app/edxapp/edx-platform/common/test/'.
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER. Use `npm run compile-sass` instead.
-    """
-    systems = [SYSTEMS[sys] for sys in get_parsed_option(options, 'system', ['lms', 'cms'])]  # normalize studio->cms
-    run_deprecated_command_wrapper(
-        old_command="paver compile_sass",
-        ignored_old_flags=(set(["--force"]) & set(options)),
-        new_command=shlex.join([
-            "npm",
-            "run",
-            ("compile-sass-dev" if options.get("debug") else "compile-sass"),
-            "--",
-            *(["--dry"] if tasks.environment.dry_run else []),
-            *(["--skip-lms"] if "lms" not in systems else []),
-            *(["--skip-cms"] if "cms" not in systems else []),
-            *(
-                arg
-                for theme_dir in get_parsed_option(options, 'theme_dirs', [])
-                for arg in ["--theme-dir", str(theme_dir)]
-            ),
-            *(
-                arg
-                for theme in get_parsed_option(options, "themes", [])
-                for arg in ["--theme", theme]
-            ),
-        ]),
-    )
-
-
-def _compile_sass(system, theme, debug, force, _timing_info):
-    """
-    This is a DEPRECATED COMPATIBILITY WRAPPER
-
-    It exists to ease the transition for Tutor in Redwood, which directly imported and used this function.
-    """
-    run_deprecated_command_wrapper(
-        old_command="pavelib.assets:_compile_sass",
-        ignored_old_flags=(set(["--force"]) if force else set()),
-        new_command=[
-            "npm",
-            "run",
-            ("compile-sass-dev" if debug else "compile-sass"),
-            "--",
-            *(["--dry"] if tasks.environment.dry_run else []),
-            *(
-                ["--skip-default", "--theme-dir", str(theme.parent), "--theme", str(theme.name)]
-                if theme
-                else []
-            ),
-            ("--skip-cms" if system == "lms" else "--skip-lms"),
-        ]
-    )
-
-
-def process_npm_assets():
-    """
-    Process vendor libraries installed via NPM.
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER. It is now handled as part of `npm clean-install`.
-    If you need to invoke it explicitly, you can run `npm run postinstall`.
-    """
-    run_deprecated_command_wrapper(
-        old_command="pavelib.assets:process_npm_assets",
-        ignored_old_flags=[],
-        new_command=shlex.join(["npm", "run", "postinstall"]),
-    )
-
-
-@task
-@no_help
-def process_xmodule_assets():
-    """
-    Process XModule static assets.
-
-    This is a DEPRECATED COMPATIBILITY STUB. Refrences to it should be deleted.
-    """
-    print(
-        "\n" +
-        f"{WARNING_SYMBOLS}",
-        "\n" +
-        "WARNING: 'paver process_xmodule_assets' is DEPRECATED! It will be removed before Sumac.\n" +
-        "\n" +
-        "Starting with Quince, it is no longer necessary to post-process XModule assets, so \n" +
-        "'paver process_xmodule_assets' is a no-op. Please simply remove it from your build scripts.\n" +
-        "\n" +
-        "Details: https://github.com/openedx/edx-platform/issues/31895\n" +
-        f"{WARNING_SYMBOLS}",
-    )
-
-
-def collect_assets(systems, settings, **kwargs):
-    """
-    Collect static assets, including Django pipeline processing.
-    `systems` is a list of systems (e.g. 'lms' or 'studio' or both)
-    `settings` is the Django settings module to use.
-    `**kwargs` include arguments for using a log directory for collectstatic output. Defaults to /dev/null.
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER
-
-    It exists to ease the transition for Tutor in Redwood, which directly imported and used this function.
-    """
-    run_deprecated_command_wrapper(
-        old_command="pavelib.asset:collect_assets",
-        ignored_old_flags=[],
-        new_command=" && ".join(
-            "( " +
-            shlex.join(
-                ["./manage.py", SYSTEMS[sys], f"--settings={settings}", "collectstatic", "--noinput"]
-            ) + (
-                ""
-                if "collect_log_dir" not in kwargs else
-                " > /dev/null"
-                if kwargs["collect_log_dir"] is None else
-                f"> {kwargs['collect_log_dir']}/{SYSTEMS[sys]}-collectstatic.out"
-            ) +
-            " )"
-            for sys in systems
-        ),
-    )
-
-
-def execute_compile_sass(args):
-    """
-    Construct django management command compile_sass (defined in theming app) and execute it.
-    Args:
-        args: command line argument passed via update_assets command
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER. Use `npm run compile-sass` instead.
-    """
-    for sys in args.system:
-        options = ""
-        options += " --theme-dirs " + " ".join(args.theme_dirs) if args.theme_dirs else ""
-        options += " --themes " + " ".join(args.themes) if args.themes else ""
-        options += " --debug" if args.debug else ""
-
-        sh(
-            django_cmd(
-                sys,
-                args.settings,
-                "compile_sass {system} {options}".format(
-                    system='cms' if sys == 'studio' else sys,
-                    options=options,
-                ),
-            ),
-        )
-
-
-@task
-@cmdopts([
-    ('settings=', 's', "Django settings (defaults to devstack)"),
-    ('watch', 'w', "DEPRECATED. This flag never did anything anyway."),
-])
-@timed
-def webpack(options):
-    """
-    Run a Webpack build.
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER. Use `npm run webpack` instead.
-    """
-    settings = getattr(options, 'settings', Env.DEVSTACK_SETTINGS)
-    result = Env.get_django_settings(['STATIC_ROOT', 'WEBPACK_CONFIG_PATH'], "lms", settings=settings)
-    static_root_lms, config_path = result
-    static_root_cms, = Env.get_django_settings(["STATIC_ROOT"], "cms", settings=settings)
-    js_env_extra_config_setting, = Env.get_django_json_settings(["JS_ENV_EXTRA_CONFIG"], "cms", settings=settings)
-    js_env_extra_config = json.dumps(js_env_extra_config_setting or "{}")
-    node_env = "development" if config_path == 'webpack.dev.config.js' else "production"
-    run_deprecated_command_wrapper(
-        old_command="paver webpack",
-        ignored_old_flags=(set(["watch"]) & set(options)),
-        new_command=' '.join([
-            f"WEBPACK_CONFIG_PATH={config_path}",
-            f"NODE_ENV={node_env}",
-            f"STATIC_ROOT_LMS={static_root_lms}",
-            f"STATIC_ROOT_CMS={static_root_cms}",
-            f"JS_ENV_EXTRA_CONFIG={js_env_extra_config}",
-            "npm",
-            "run",
-            "webpack",
-        ]),
-    )
-
-
-def get_parsed_option(command_opts, opt_key, default=None):
-    """
-    Extract user command option and parse it.
-    Arguments:
-        command_opts: Command line arguments passed via paver command.
-        opt_key: name of option to get and parse
-        default: if `command_opt_value` not in `command_opts`, `command_opt_value` will be set to default.
-    Returns:
-         list or None
-    """
-    command_opt_value = getattr(command_opts, opt_key, default)
-    if command_opt_value:
-        command_opt_value = listfy(command_opt_value)
-
-    return command_opt_value
-
-
-def listfy(data):
-    """
-    Check and convert data to list.
-    Arguments:
-        data: data structure to be converted.
-    """
-
-    if isinstance(data, str):
-        data = data.split(',')
-    elif not isinstance(data, list):
-        data = [data]
-
-    return data
-
-
-@task
-@cmdopts([
-    ('background', 'b', 'DEPRECATED. Use shell tools like & to run in background if needed.'),
-    ('settings=', 's', "DEPRECATED. Django is not longer invoked to compile JS/Sass."),
-    ('theme-dirs=', '-td', 'The themes dir containing all themes (defaults to None)'),
-    ('themes=', '-t', 'DEPRECATED. All themes in --theme-dirs are now watched.'),
-    ('wait=', '-w', 'DEPRECATED. Watchdog\'s default wait time is now used.'),
-])
-@timed
-def watch_assets(options):
-    """
-    Watch for changes to asset files, and regenerate js/css
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER. Use `npm run watch` instead.
-    """
-    # Don't watch assets when performing a dry run
-    if tasks.environment.dry_run:
-        return
-
-    theme_dirs = ':'.join(get_parsed_option(options, 'theme_dirs', []))
-    run_deprecated_command_wrapper(
-        old_command="paver watch_assets",
-        ignored_old_flags=(set(["debug", "themes", "settings", "background"]) & set(options)),
-        new_command=shlex.join([
-            *(
-                ["env", f"COMPREHENSIVE_THEME_DIRS={theme_dirs}"]
-                if theme_dirs else []
-            ),
-            "npm",
-            "run",
-            "watch",
-        ]),
-    )
-
-
-@task
-@needs(
-    'pavelib.prereqs.install_node_prereqs',
-    'pavelib.prereqs.install_python_prereqs',
-)
-@consume_args
-@timed
-def update_assets(args):
-    """
-    Compile Sass, then collect static assets.
-
-    This is a DEPRECATED COMPATIBILITY WRAPPER around other DEPRECATED COMPATIBILITY WRAPPERS.
-    The aggregate affect of this command can be achieved with this sequence of commands instead:
-
-    * pip install -r requirements/edx/assets.txt   # replaces install_python_prereqs
-    * npm clean-install                            # replaces install_node_prereqs
-    * npm run build                                # replaces execute_compile_sass and webpack
-    * ./manage.py lms collectstatic --noinput      # replaces collect_assets (for LMS)
-    * ./manage.py cms collectstatic --noinput      # replaces collect_assets (for CMS)
-    """
-    parser = argparse.ArgumentParser(prog='paver update_assets')
-    parser.add_argument(
-        'system', type=str, nargs='*', default=["lms", "studio"],
-        help="lms or studio",
-    )
-    parser.add_argument(
-        '--settings', type=str, default=Env.DEVSTACK_SETTINGS,
-        help="Django settings module",
-    )
-    parser.add_argument(
-        '--debug', action='store_true', default=False,
-        help="Enable all debugging",
-    )
-    parser.add_argument(
-        '--debug-collect', action='store_true', default=False,
-        help="Disable collect static",
-    )
-    parser.add_argument(
-        '--skip-collect', dest='collect', action='store_false', default=True,
-        help="Skip collection of static assets",
-    )
-    parser.add_argument(
-        '--watch', action='store_true', default=False,
-        help="Watch files for changes",
-    )
-    parser.add_argument(
-        '--theme-dirs', dest='theme_dirs', type=str, nargs='+', default=None,
-        help="base directories where themes are placed",
-    )
-    parser.add_argument(
-        '--themes', type=str, nargs='+', default=None,
-        help="list of themes to compile sass for. ignored when --watch is used; all themes are watched.",
-    )
-    parser.add_argument(
-        '--collect-log', dest="collect_log_dir", default=None,
-        help="When running collectstatic, direct output to specified log directory",
-    )
-    parser.add_argument(
-        '--wait', type=float, default=0.0,
-        help="DEPRECATED. Watchdog's default wait time is now used.",
-    )
-    args = parser.parse_args(args)
-
-    # Build Webpack
-    call_task('pavelib.assets.webpack', options={'settings': args.settings})
-
-    # Compile sass for themes and system
-    execute_compile_sass(args)
-
-    if args.collect:
-        if args.collect_log_dir:
-            collect_log_args = {"collect_log_dir": args.collect_log_dir}
-        elif args.debug or args.debug_collect:
-            collect_log_args = {"collect_log_dir": None}
-        else:
-            collect_log_args = {}
-
-        collect_assets(args.system, args.settings, **collect_log_args)
-
-    if args.watch:
-        call_task(
-            'pavelib.assets.watch_assets',
-            options={
-                'background': not args.debug,
-                'settings': args.settings,
-                'theme_dirs': args.theme_dirs,
-                'themes': args.themes,
-                'wait': [float(args.wait)]
-            },
-        )
diff --git a/pavelib/js_test.py b/pavelib/js_test.py
deleted file mode 100644
index fb9c213499ac..000000000000
--- a/pavelib/js_test.py
+++ /dev/null
@@ -1,143 +0,0 @@
-"""
-Javascript test tasks
-"""
-
-
-import os
-import re
-import sys
-
-from paver.easy import cmdopts, needs, sh, task
-
-from pavelib.utils.envs import Env
-from pavelib.utils.test.suites import JestSnapshotTestSuite, JsTestSuite
-from pavelib.utils.timer import timed
-
-try:
-    from pygments.console import colorize
-except ImportError:
-    colorize = lambda color, text: text
-
-__test__ = False  # do not collect
-
-
-@task
-@needs(
-    'pavelib.prereqs.install_node_prereqs',
-    'pavelib.utils.test.utils.clean_reports_dir',
-)
-@cmdopts([
-    ("suite=", "s", "Test suite to run"),
-    ("mode=", "m", "dev or run"),
-    ("coverage", "c", "Run test under coverage"),
-    ("port=", "p", "Port to run test server on (dev mode only)"),
-    ('skip-clean', 'C', 'skip cleaning repository before running tests'),
-    ('skip_clean', None, 'deprecated in favor of skip-clean'),
-], share_with=["pavelib.utils.tests.utils.clean_reports_dir"])
-@timed
-def test_js(options):
-    """
-    Run the JavaScript tests
-    """
-    mode = getattr(options, 'mode', 'run')
-    port = None
-    skip_clean = getattr(options, 'skip_clean', False)
-
-    if mode == 'run':
-        suite = getattr(options, 'suite', 'all')
-        coverage = getattr(options, 'coverage', False)
-    elif mode == 'dev':
-        suite = getattr(options, 'suite', None)
-        coverage = False
-        port = getattr(options, 'port', None)
-    else:
-        sys.stderr.write("Invalid mode. Please choose 'dev' or 'run'.")
-        return
-
-    if (suite != 'all') and (suite not in Env.JS_TEST_ID_KEYS):
-        sys.stderr.write(
-            "Unknown test suite. Please choose from ({suites})\n".format(
-                suites=", ".join(Env.JS_TEST_ID_KEYS)
-            )
-        )
-        return
-
-    if suite != 'jest-snapshot':
-        test_suite = JsTestSuite(suite, mode=mode, with_coverage=coverage, port=port, skip_clean=skip_clean)
-        test_suite.run()
-
-    if (suite == 'jest-snapshot') or (suite == 'all'):  # lint-amnesty, pylint: disable=consider-using-in
-        test_suite = JestSnapshotTestSuite('jest')
-        test_suite.run()
-
-
-@task
-@cmdopts([
-    ("suite=", "s", "Test suite to run"),
-    ("coverage", "c", "Run test under coverage"),
-])
-@timed
-def test_js_run(options):
-    """
-    Run the JavaScript tests and print results to the console
-    """
-    options.mode = 'run'
-    test_js(options)
-
-
-@task
-@cmdopts([
-    ("suite=", "s", "Test suite to run"),
-    ("port=", "p", "Port to run test server on"),
-])
-@timed
-def test_js_dev(options):
-    """
-    Run the JavaScript tests in your default browsers
-    """
-    options.mode = 'dev'
-    test_js(options)
-
-
-@task
-@needs('pavelib.prereqs.install_coverage_prereqs')
-@cmdopts([
-    ("compare-branch=", "b", "Branch to compare against, defaults to origin/master"),
-], share_with=['coverage'])
-@timed
-def diff_coverage(options):
-    """
-    Build the diff coverage reports
-    """
-    compare_branch = options.get('compare_branch', 'origin/master')
-
-    # Find all coverage XML files (both Python and JavaScript)
-    xml_reports = []
-
-    for filepath in Env.REPORT_DIR.walk():
-        if bool(re.match(r'^coverage.*\.xml$', filepath.basename())):
-            xml_reports.append(filepath)
-
-    if not xml_reports:
-        err_msg = colorize(
-            'red',
-            "No coverage info found.  Run `paver test` before running "
-            "`paver coverage`.\n"
-        )
-        sys.stderr.write(err_msg)
-    else:
-        xml_report_str = ' '.join(xml_reports)
-        diff_html_path = os.path.join(Env.REPORT_DIR, 'diff_coverage_combined.html')
-
-        # Generate the diff coverage reports (HTML and console)
-        # The --diff-range-notation parameter is a workaround for https://github.com/Bachmann1234/diff_cover/issues/153
-        sh(
-            "diff-cover {xml_report_str} --diff-range-notation '..' --compare-branch={compare_branch} "
-            "--html-report {diff_html_path}".format(
-                xml_report_str=xml_report_str,
-                compare_branch=compare_branch,
-                diff_html_path=diff_html_path,
-            )
-        )
-
-        print("\n")
diff --git a/pavelib/paver_tests/__init__.py b/pavelib/paver_tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/pavelib/paver_tests/conftest.py b/pavelib/paver_tests/conftest.py
deleted file mode 100644
index 214a35e3fe85..000000000000
--- a/pavelib/paver_tests/conftest.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-Pytest fixtures for the pavelib unit tests.
-"""
-
-
-import os
-from shutil import rmtree
-
-import pytest
-
-from pavelib.utils.envs import Env
-
-
-@pytest.fixture(autouse=True, scope='session')
-def delete_quality_junit_xml():
-    """
-    Delete the JUnit XML results files for quality check tasks run during the
-    unit tests.
-    """
-    yield
-    if os.path.exists(Env.QUALITY_DIR):
-        rmtree(Env.QUALITY_DIR, ignore_errors=True)
diff --git a/pavelib/paver_tests/pylint_test_list.json b/pavelib/paver_tests/pylint_test_list.json
deleted file mode 100644
index d0e8b43aa93d..000000000000
--- a/pavelib/paver_tests/pylint_test_list.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-    "foo/bar.py:192: [C0111(missing-docstring), Bliptv] Missing docstring",
-    "foo/bar/test.py:74: [C0322(no-space-before-operator)] Operator not preceded by a space",
-    "ugly/string/test.py:16: [C0103(invalid-name)] Invalid name \"whats up\" for type constant (should match (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$)",
-    "multiple/lines/test.py:72: [C0322(no-space-before-operator)] Operator not preceded by a space\nFOO_BAR='pipeline.storage.NonPackagingPipelineStorage'\n                   ^"
-]
diff --git a/pavelib/paver_tests/test_assets.py b/pavelib/paver_tests/test_assets.py
deleted file mode 100644
index f7100a7f03c3..000000000000
--- a/pavelib/paver_tests/test_assets.py
+++ /dev/null
@@ -1,130 +0,0 @@
-"""Unit tests for the Paver asset tasks."""
-
-import json
-import os
-from pathlib import Path
-from unittest import TestCase
-from unittest.mock import patch
-
-import ddt
-import paver.easy
-from paver import tasks
-
-import pavelib.assets
-from pavelib.assets import Env
-
-
-REPO_ROOT = Path(__file__).parent.parent.parent
-
-LMS_SETTINGS = {
-    "WEBPACK_CONFIG_PATH": "webpack.fake.config.js",
-    "STATIC_ROOT": "/fake/lms/staticfiles",
-
-}
-CMS_SETTINGS = {
-    "WEBPACK_CONFIG_PATH": "webpack.fake.config",
-    "STATIC_ROOT": "/fake/cms/staticfiles",
-    "JS_ENV_EXTRA_CONFIG": json.dumps({"key1": [True, False], "key2": {"key2.1": 1369, "key2.2": "1369"}}),
-}
-
-
-def _mock_get_django_settings(django_settings, system, settings=None):  # pylint: disable=unused-argument
-    return [(LMS_SETTINGS if system == "lms" else CMS_SETTINGS)[s] for s in django_settings]
-
-
-@ddt.ddt
-@patch.object(Env, 'get_django_settings', _mock_get_django_settings)
-@patch.object(Env, 'get_django_json_settings', _mock_get_django_settings)
-class TestDeprecatedPaverAssets(TestCase):
-    """
-    Simple test to ensure that the soon-to-be-removed Paver commands are correctly translated into the new npm-run
-    commands.
-    """
-    def setUp(self):
-        super().setUp()
-        self.maxDiff = None
-        os.environ['NO_PREREQ_INSTALL'] = 'true'
-        tasks.environment = tasks.Environment()
-
-    def tearDown(self):
-        super().tearDown()
-        del os.environ['NO_PREREQ_INSTALL']
-
-    @ddt.data(
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={},
-            expected=["npm run compile-sass --"],
-        ),
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={"system": "lms,studio"},
-            expected=["npm run compile-sass --"],
-        ),
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={"debug": True},
-            expected=["npm run compile-sass-dev --"],
-        ),
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={"system": "lms"},
-            expected=["npm run compile-sass -- --skip-cms"],
-        ),
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={"system": "studio"},
-            expected=["npm run compile-sass -- --skip-lms"],
-        ),
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={"system": "cms", "theme_dirs": f"{REPO_ROOT}/common/test,{REPO_ROOT}/themes"},
-            expected=[
-                "npm run compile-sass -- --skip-lms " +
-                f"--theme-dir {REPO_ROOT}/common/test --theme-dir {REPO_ROOT}/themes"
-            ],
-        ),
-        dict(
-            task_name='pavelib.assets.compile_sass',
-            args=[],
-            kwargs={"theme_dirs": f"{REPO_ROOT}/common/test,{REPO_ROOT}/themes", "themes": "red-theme,test-theme"},
-            expected=[
-                "npm run compile-sass -- " +
-                f"--theme-dir {REPO_ROOT}/common/test --theme-dir {REPO_ROOT}/themes " +
-                "--theme red-theme --theme test-theme"
-            ],
-        ),
-        dict(
-            task_name='pavelib.assets.update_assets',
-            args=["lms", "studio", "--settings=fake.settings"],
-            kwargs={},
-            expected=[
-                (
-                    "WEBPACK_CONFIG_PATH=webpack.fake.config.js " +
-                    "NODE_ENV=production " +
-                    "STATIC_ROOT_LMS=/fake/lms/staticfiles " +
-                    "STATIC_ROOT_CMS=/fake/cms/staticfiles " +
-                    'JS_ENV_EXTRA_CONFIG=' +
-                    '"{\\"key1\\": [true, false], \\"key2\\": {\\"key2.1\\": 1369, \\"key2.2\\": \\"1369\\"}}" ' +
-                    "npm run webpack"
-                ),
-                "python manage.py lms --settings=fake.settings compile_sass lms ",
-                "python manage.py cms --settings=fake.settings compile_sass cms ",
-                (
-                    "( ./manage.py lms --settings=fake.settings collectstatic --noinput ) && " +
-                    "( ./manage.py cms --settings=fake.settings collectstatic --noinput )"
-                ),
-            ],
-        ),
-    )
-    @ddt.unpack
-    @patch.object(pavelib.assets, 'sh')
-    def test_paver_assets_wrapper_invokes_new_commands(self, mock_sh, task_name, args, kwargs, expected):
-        paver.easy.call_task(task_name, args=args, options=kwargs)
-        assert [call_args[0] for (call_args, call_kwargs) in mock_sh.call_args_list] == expected
diff --git a/pavelib/paver_tests/test_eslint.py b/pavelib/paver_tests/test_eslint.py
deleted file mode 100644
index 5802d7d0d21b..000000000000
--- a/pavelib/paver_tests/test_eslint.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
-Tests for Paver's Stylelint tasks.
-"""
-
-
-import unittest
-from unittest.mock import patch
-
-import pytest
-from paver.easy import BuildFailure, call_task
-
-import pavelib.quality
-
-
-class TestPaverESLint(unittest.TestCase):
-    """
-    For testing run_eslint
-    """
-
-    def setUp(self):
-        super().setUp()
-
-        # Mock the paver @needs decorator
-        self._mock_paver_needs = patch.object(pavelib.quality.run_eslint, 'needs').start()
-        self._mock_paver_needs.return_value = 0
-
-        # Mock shell commands
-        patcher = patch('pavelib.quality.sh')
-        self._mock_paver_sh = patcher.start()
-
-        # Cleanup mocks
-        self.addCleanup(patcher.stop)
-        self.addCleanup(self._mock_paver_needs.stop)
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_count_from_last_line')
-    def test_eslint_violation_number_not_found(self, mock_count, mock_report_dir, mock_write_metric):  # pylint: disable=unused-argument
-        """
-        run_eslint encounters an error parsing the eslint output log
-        """
-        mock_count.return_value = None
-        with pytest.raises(BuildFailure):
-            call_task('pavelib.quality.run_eslint', args=[''])
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_count_from_last_line')
-    def test_eslint_vanilla(self, mock_count, mock_report_dir, mock_write_metric):  # pylint: disable=unused-argument
-        """
-        eslint finds violations, but a limit was not set
-        """
-        mock_count.return_value = 1
-        pavelib.quality.run_eslint("")
diff --git a/pavelib/paver_tests/test_js_test.py b/pavelib/paver_tests/test_js_test.py
deleted file mode 100644
index 4b165a156674..000000000000
--- a/pavelib/paver_tests/test_js_test.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Unit tests for the Paver JavaScript testing tasks."""
-
-from unittest.mock import patch
-
-import ddt
-from paver.easy import call_task
-
-import pavelib.js_test
-from pavelib.utils.envs import Env
-
-from .utils import PaverTestCase
-
-
-@ddt.ddt
-class TestPaverJavaScriptTestTasks(PaverTestCase):
-    """
-    Test the Paver JavaScript testing tasks.
-    """
-
-    EXPECTED_DELETE_JAVASCRIPT_REPORT_COMMAND = 'find {platform_root}/reports/javascript -type f -delete'
-    EXPECTED_KARMA_OPTIONS = (
-        "{config_file} "
-        "--single-run={single_run} "
-        "--capture-timeout=60000 "
-        "--junitreportpath="
-        "{platform_root}/reports/javascript/javascript_xunit-{suite}.xml "
-        "--browsers={browser}"
-    )
-    EXPECTED_COVERAGE_OPTIONS = (
-        ' --coverage --coveragereportpath={platform_root}/reports/javascript/coverage-{suite}.xml'
-    )
-
-    EXPECTED_COMMANDS = [
-        "make report_dir",
-        'git clean -fqdx test_root/logs test_root/data test_root/staticfiles test_root/uploads',
-        "find . -name '.git' -prune -o -name '*.pyc' -exec rm {} \\;",
-        'rm -rf test_root/log/auto_screenshots/*',
-        "rm -rf /tmp/mako_[cl]ms",
-    ]
-
-    def setUp(self):
-        super().setUp()
-
-        # Mock the paver @needs decorator
-        self._mock_paver_needs = patch.object(pavelib.js_test.test_js, 'needs').start()
-        self._mock_paver_needs.return_value = 0
-
-        # Cleanup mocks
-        self.addCleanup(self._mock_paver_needs.stop)
-
-    @ddt.data(
-        [""],
-        ["--coverage"],
-        ["--suite=lms"],
-        ["--suite=lms --coverage"],
-    )
-    @ddt.unpack
-    def test_test_js_run(self, options_string):
-        """
-        Test the "test_js_run" task.
-        """
-        options = self.parse_options_string(options_string)
-        self.reset_task_messages()
-        call_task("pavelib.js_test.test_js_run", options=options)
-        self.verify_messages(options=options, dev_mode=False)
-
-    @ddt.data(
-        [""],
-        ["--port=9999"],
-        ["--suite=lms"],
-        ["--suite=lms --port=9999"],
-    )
-    @ddt.unpack
-    def test_test_js_dev(self, options_string):
-        """
-        Test the "test_js_run" task.
-        """
-        options = self.parse_options_string(options_string)
-        self.reset_task_messages()
-        call_task("pavelib.js_test.test_js_dev", options=options)
-        self.verify_messages(options=options, dev_mode=True)
-
-    def parse_options_string(self, options_string):
-        """
-        Parse a string containing the options for a test run
-        """
-        parameters = options_string.split(" ")
-        suite = "all"
-        if "--system=lms" in parameters:
-            suite = "lms"
-        elif "--system=common" in parameters:
-            suite = "common"
-        coverage = "--coverage" in parameters
-        port = None
-        if "--port=9999" in parameters:
-            port = 9999
-        return {
-            "suite": suite,
-            "coverage": coverage,
-            "port": port,
-        }
-
-    def verify_messages(self, options, dev_mode):
-        """
-        Verify that the messages generated when running tests are as expected
-        for the specified options and dev_mode.
-        """
-        is_coverage = options['coverage']
-        port = options['port']
-        expected_messages = []
-        suites = Env.JS_TEST_ID_KEYS if options['suite'] == 'all' else [options['suite']]
-
-        expected_messages.extend(self.EXPECTED_COMMANDS)
-        if not dev_mode and not is_coverage:
-            expected_messages.append(self.EXPECTED_DELETE_JAVASCRIPT_REPORT_COMMAND.format(
-                platform_root=self.platform_root
-            ))
-
-        command_template = (
-            'node --max_old_space_size=4096 node_modules/.bin/karma start {options}'
-        )
-
-        for suite in suites:
-            # Karma test command
-            if suite != 'jest-snapshot':
-                karma_config_file = Env.KARMA_CONFIG_FILES[Env.JS_TEST_ID_KEYS.index(suite)]
-                expected_test_tool_command = command_template.format(
-                    options=self.EXPECTED_KARMA_OPTIONS.format(
-                        config_file=karma_config_file,
-                        single_run='false' if dev_mode else 'true',
-                        suite=suite,
-                        platform_root=self.platform_root,
-                        browser=Env.KARMA_BROWSER,
-                    ),
-                )
-                if is_coverage:
-                    expected_test_tool_command += self.EXPECTED_COVERAGE_OPTIONS.format(
-                        platform_root=self.platform_root,
-                        suite=suite
-                    )
-                if port:
-                    expected_test_tool_command += f" --port={port}"
-            else:
-                expected_test_tool_command = 'jest'
-
-            expected_messages.append(expected_test_tool_command)
-
-        assert self.task_messages == expected_messages
diff --git a/pavelib/paver_tests/test_paver_quality.py b/pavelib/paver_tests/test_paver_quality.py
deleted file mode 100644
index 36d6dd59e172..000000000000
--- a/pavelib/paver_tests/test_paver_quality.py
+++ /dev/null
@@ -1,156 +0,0 @@
-"""  # lint-amnesty, pylint: disable=django-not-configured
-Tests for paver quality tasks
-"""
-
-
-import os
-import shutil  # lint-amnesty, pylint: disable=unused-import
-import tempfile
-import textwrap
-import unittest
-from unittest.mock import MagicMock, mock_open, patch  # lint-amnesty, pylint: disable=unused-import
-
-import pytest  # lint-amnesty, pylint: disable=unused-import
-from ddt import data, ddt, file_data, unpack  # lint-amnesty, pylint: disable=unused-import
-from path import Path as path
-from paver.easy import BuildFailure  # lint-amnesty, pylint: disable=unused-import
-
-import pavelib.quality
-from pavelib.paver_tests.utils import PaverTestCase, fail_on_eslint  # lint-amnesty, pylint: disable=unused-import
-
-OPEN_BUILTIN = 'builtins.open'
-
-
-@ddt
-class TestPaverQualityViolations(unittest.TestCase):
-    """
-    For testing the paver violations-counting tasks
-    """
-    def setUp(self):
-        super().setUp()
-        self.f = tempfile.NamedTemporaryFile(delete=False)  # lint-amnesty, pylint: disable=consider-using-with
-        self.f.close()
-        self.addCleanup(os.remove, self.f.name)
-
-    def test_pep8_parser(self):
-        with open(self.f.name, 'w') as f:
-            f.write("hello\nhithere")
-        num = len(pavelib.quality._pep8_violations(f.name))  # pylint: disable=protected-access
-        assert num == 2
-
-
-class TestPaverReportViolationsCounts(unittest.TestCase):
-    """
-    For testing utility functions for getting counts from reports for
-    run_eslint and run_xsslint.
-    """
-
-    def setUp(self):
-        super().setUp()
-
-        # Temporary file infrastructure
-        self.f = tempfile.NamedTemporaryFile(delete=False)  # lint-amnesty, pylint: disable=consider-using-with
-        self.f.close()
-
-        # Cleanup various mocks and tempfiles
-        self.addCleanup(os.remove, self.f.name)
-
-    def test_get_eslint_violations_count(self):
-        with open(self.f.name, 'w') as f:
-            f.write("3000 violations found")
-        actual_count = pavelib.quality._get_count_from_last_line(self.f.name, "eslint")  # pylint: disable=protected-access
-        assert actual_count == 3000
-
-    def test_get_eslint_violations_no_number_found(self):
-        with open(self.f.name, 'w') as f:
-            f.write("Not expected string regex")
-        actual_count = pavelib.quality._get_count_from_last_line(self.f.name, "eslint")  # pylint: disable=protected-access
-        assert actual_count is None
-
-    def test_get_eslint_violations_count_truncated_report(self):
-        """
-        A truncated report (i.e. last line is just a violation)
-        """
-        with open(self.f.name, 'w') as f:
-            f.write("foo/bar/js/fizzbuzz.js: line 45, col 59, Missing semicolon.")
-        actual_count = pavelib.quality._get_count_from_last_line(self.f.name, "eslint")  # pylint: disable=protected-access
-        assert actual_count is None
-
-    def test_generic_value(self):
-        """
-        Default behavior is to look for an integer appearing at head of line
-        """
-        with open(self.f.name, 'w') as f:
-            f.write("5.777 good to see you")
-        actual_count = pavelib.quality._get_count_from_last_line(self.f.name, "foo")  # pylint: disable=protected-access
-        assert actual_count == 5
-
-    def test_generic_value_none_found(self):
-        """
-        Default behavior is to look for an integer appearing at head of line
-        """
-        with open(self.f.name, 'w') as f:
-            f.write("hello 5.777 good to see you")
-        actual_count = pavelib.quality._get_count_from_last_line(self.f.name, "foo")  # pylint: disable=protected-access
-        assert actual_count is None
-
-    def test_get_xsslint_counts_happy(self):
-        """
-        Test happy path getting violation counts from xsslint report.
-        """
-        report = textwrap.dedent("""
-            test.html: 30:53: javascript-jquery-append:  $('#test').append(print_tos);
-
-            javascript-concat-html: 310 violations
-            javascript-escape:      7 violations
-
-            2608 violations total
-        """)
-        with open(self.f.name, 'w') as f:
-            f.write(report)
-        counts = pavelib.quality._get_xsslint_counts(self.f.name)  # pylint: disable=protected-access
-        self.assertDictEqual(counts, {
-            'rules': {
-                'javascript-concat-html': 310,
-                'javascript-escape': 7,
-            },
-            'total': 2608,
-        })
-
-    def test_get_xsslint_counts_bad_counts(self):
-        """
-        Test getting violation counts from truncated and malformed xsslint
-        report.
-        """
-        report = textwrap.dedent("""
-            javascript-concat-html: violations
-        """)
-        with open(self.f.name, 'w') as f:
-            f.write(report)
-        counts = pavelib.quality._get_xsslint_counts(self.f.name)  # pylint: disable=protected-access
-        self.assertDictEqual(counts, {
-            'rules': {},
-            'total': None,
-        })
-
-
-class TestPrepareReportDir(unittest.TestCase):
-    """
-    Tests the report directory preparation
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.test_dir = tempfile.mkdtemp()
-        self.test_file = tempfile.NamedTemporaryFile(delete=False, dir=self.test_dir)  # lint-amnesty, pylint: disable=consider-using-with
-        self.addCleanup(os.removedirs, self.test_dir)
-
-    def test_report_dir_with_files(self):
-        assert os.path.exists(self.test_file.name)
-        pavelib.quality._prepare_report_dir(path(self.test_dir))  # pylint: disable=protected-access
-        assert not os.path.exists(self.test_file.name)
-
-    def test_report_dir_without_files(self):
-        os.remove(self.test_file.name)
-        pavelib.quality._prepare_report_dir(path(self.test_dir))  # pylint: disable=protected-access
-        assert os.listdir(path(self.test_dir)) == []
diff --git a/pavelib/paver_tests/test_pii_check.py b/pavelib/paver_tests/test_pii_check.py
deleted file mode 100644
index d034360acde0..000000000000
--- a/pavelib/paver_tests/test_pii_check.py
+++ /dev/null
@@ -1,79 +0,0 @@
-"""
-Tests for Paver's PII checker task.
-"""
-
-import shutil
-import tempfile
-import unittest
-from unittest.mock import patch
-
-from path import Path as path
-from paver.easy import call_task, BuildFailure
-
-import pavelib.quality
-from pavelib.utils.envs import Env
-
-
-class TestPaverPIICheck(unittest.TestCase):
-    """
-    For testing the paver run_pii_check task
-    """
-    def setUp(self):
-        super().setUp()
-        self.report_dir = path(tempfile.mkdtemp())
-        self.addCleanup(shutil.rmtree, self.report_dir)
-
-    @patch.object(pavelib.quality.run_pii_check, 'needs')
-    @patch('pavelib.quality.sh')
-    def test_pii_check_report_dir_override(self, mock_paver_sh, mock_needs):
-        """
-        run_pii_check succeeds with proper report dir
-        """
-        # Make the expected stdout files.
-        cms_stdout_report = self.report_dir / 'pii_check_cms.report'
-        cms_stdout_report.write_lines(['Coverage found 33 uncovered models:\n'])
-        lms_stdout_report = self.report_dir / 'pii_check_lms.report'
-        lms_stdout_report.write_lines(['Coverage found 66 uncovered models:\n'])
-
-        mock_needs.return_value = 0
-        call_task('pavelib.quality.run_pii_check', options={"report_dir": str(self.report_dir)})
-        mock_calls = [str(call) for call in mock_paver_sh.mock_calls]
-        assert len(mock_calls) == 2
-        assert any('lms.envs.test' in call for call in mock_calls)
-        assert any('cms.envs.test' in call for call in mock_calls)
-        assert all(str(self.report_dir) in call for call in mock_calls)
-        metrics_file = Env.METRICS_DIR / 'pii'
-        assert open(metrics_file).read() == 'Number of PII Annotation violations: 66\n'
-
-    @patch.object(pavelib.quality.run_pii_check, 'needs')
-    @patch('pavelib.quality.sh')
-    def test_pii_check_failed(self, mock_paver_sh, mock_needs):
-        """
-        run_pii_check fails due to crossing the threshold.
-        """
-        # Make the expected stdout files.
-        cms_stdout_report = self.report_dir / 'pii_check_cms.report'
-        cms_stdout_report.write_lines(['Coverage found 33 uncovered models:\n'])
-        lms_stdout_report = self.report_dir / 'pii_check_lms.report'
-        lms_stdout_report.write_lines([
-            'Coverage found 66 uncovered models:',
-            'Coverage threshold not met! Needed 100.0, actually 95.0!',
-        ])
-
-        mock_needs.return_value = 0
-        try:
-            with self.assertRaises(BuildFailure):
-                call_task('pavelib.quality.run_pii_check', options={"report_dir": str(self.report_dir)})
-        except SystemExit:
-            # Sometimes the BuildFailure raises a SystemExit, sometimes it doesn't, not sure why.
-            # As a hack, we just wrap it in try-except.
-            # This is not good, but these tests weren't even running for years, and we're removing this whole test
-            # suite soon anyway.
-            pass
-        mock_calls = [str(call) for call in mock_paver_sh.mock_calls]
-        assert len(mock_calls) == 2
-        assert any('lms.envs.test' in call for call in mock_calls)
-        assert any('cms.envs.test' in call for call in mock_calls)
-        assert all(str(self.report_dir) in call for call in mock_calls)
-        metrics_file = Env.METRICS_DIR / 'pii'
-        assert open(metrics_file).read() == 'Number of PII Annotation violations: 66\n'
diff --git a/pavelib/paver_tests/test_stylelint.py b/pavelib/paver_tests/test_stylelint.py
deleted file mode 100644
index 3e1c79c93f28..000000000000
--- a/pavelib/paver_tests/test_stylelint.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Tests for Paver's Stylelint tasks.
-"""
-
-from unittest.mock import MagicMock, patch
-
-import pytest
-import ddt
-from paver.easy import call_task
-
-from .utils import PaverTestCase
-
-
-@ddt.ddt
-class TestPaverStylelint(PaverTestCase):
-    """
-    Tests for Paver's Stylelint tasks.
-    """
-    @ddt.data(
-        [False],
-        [True],
-    )
-    @ddt.unpack
-    def test_run_stylelint(self, should_pass):
-        """
-        Verify that the quality task fails with Stylelint violations.
-        """
-        if should_pass:
-            _mock_stylelint_violations = MagicMock(return_value=0)
-            with patch('pavelib.quality._get_stylelint_violations', _mock_stylelint_violations):
-                call_task('pavelib.quality.run_stylelint')
-        else:
-            _mock_stylelint_violations = MagicMock(return_value=100)
-            with patch('pavelib.quality._get_stylelint_violations', _mock_stylelint_violations):
-                with pytest.raises(SystemExit):
-                    call_task('pavelib.quality.run_stylelint')
diff --git a/pavelib/paver_tests/test_timer.py b/pavelib/paver_tests/test_timer.py
deleted file mode 100644
index 5ccbf74abcf9..000000000000
--- a/pavelib/paver_tests/test_timer.py
+++ /dev/null
@@ -1,190 +0,0 @@
-"""
-Tests of the pavelib.utils.timer module.
-"""
-
-
-from datetime import datetime, timedelta
-from unittest import TestCase
-
-from unittest.mock import MagicMock, patch
-
-from pavelib.utils import timer
-
-
-@timer.timed
-def identity(*args, **kwargs):
-    """
-    An identity function used as a default task to test the timing of.
-    """
-    return args, kwargs
-
-
-MOCK_OPEN = MagicMock(spec=open)
-
-
-@patch.dict('pavelib.utils.timer.__builtins__', open=MOCK_OPEN)
-class TimedDecoratorTests(TestCase):
-    """
-    Tests of the pavelib.utils.timer:timed decorator.
-    """
-    def setUp(self):
-        super().setUp()
-
-        patch_dumps = patch.object(timer.json, 'dump', autospec=True)
-        self.mock_dump = patch_dumps.start()
-        self.addCleanup(patch_dumps.stop)
-
-        patch_makedirs = patch.object(timer.os, 'makedirs', autospec=True)
-        self.mock_makedirs = patch_makedirs.start()
-        self.addCleanup(patch_makedirs.stop)
-
-        patch_datetime = patch.object(timer, 'datetime', autospec=True)
-        self.mock_datetime = patch_datetime.start()
-        self.addCleanup(patch_datetime.stop)
-
-        patch_exists = patch.object(timer, 'exists', autospec=True)
-        self.mock_exists = patch_exists.start()
-        self.addCleanup(patch_exists.stop)
-
-        MOCK_OPEN.reset_mock()
-
-    def get_log_messages(self, task=identity, args=None, kwargs=None, raises=None):
-        """
-        Return all timing messages recorded during the execution of ``task``.
-        """
-        if args is None:
-            args = []
-        if kwargs is None:
-            kwargs = {}
-
-        if raises is None:
-            task(*args, **kwargs)
-        else:
-            self.assertRaises(raises, task, *args, **kwargs)
-
-        return [
-            call[0][0]  # log_message
-            for call in self.mock_dump.call_args_list
-        ]
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', '/tmp/some-log')
-    def test_times(self):
-        start = datetime(2016, 7, 20, 10, 56, 19)
-        end = start + timedelta(seconds=35.6)
-
-        self.mock_datetime.utcnow.side_effect = [start, end]
-
-        messages = self.get_log_messages()
-        assert len(messages) == 1
-
-        # I'm not using assertDictContainsSubset because it is
-        # removed in python 3.2 (because the arguments were backwards)
-        # and it wasn't ever replaced by anything *headdesk*
-        assert 'duration' in messages[0]
-        assert 35.6 == messages[0]['duration']
-
-        assert 'started_at' in messages[0]
-        assert start.isoformat(' ') == messages[0]['started_at']
-
-        assert 'ended_at' in messages[0]
-        assert end.isoformat(' ') == messages[0]['ended_at']
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', None)
-    def test_no_logs(self):
-        messages = self.get_log_messages()
-        assert len(messages) == 0
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', '/tmp/some-log')
-    def test_arguments(self):
-        messages = self.get_log_messages(args=(1, 'foo'), kwargs=dict(bar='baz'))
-        assert len(messages) == 1
-
-        # I'm not using assertDictContainsSubset because it is
-        # removed in python 3.2 (because the arguments were backwards)
-        # and it wasn't ever replaced by anything *headdesk*
-        assert 'args' in messages[0]
-        assert [repr(1), repr('foo')] == messages[0]['args']
-        assert 'kwargs' in messages[0]
-        assert {'bar': repr('baz')} == messages[0]['kwargs']
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', '/tmp/some-log')
-    def test_task_name(self):
-        messages = self.get_log_messages()
-        assert len(messages) == 1
-
-        # I'm not using assertDictContainsSubset because it is
-        # removed in python 3.2 (because the arguments were backwards)
-        # and it wasn't ever replaced by anything *headdesk*
-        assert 'task' in messages[0]
-        assert 'pavelib.paver_tests.test_timer.identity' == messages[0]['task']
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', '/tmp/some-log')
-    def test_exceptions(self):
-
-        @timer.timed
-        def raises():
-            """
-            A task used for testing exception handling of the timed decorator.
-            """
-            raise Exception('The Message!')
-
-        messages = self.get_log_messages(task=raises, raises=Exception)
-        assert len(messages) == 1
-
-        # I'm not using assertDictContainsSubset because it is
-        # removed in python 3.2 (because the arguments were backwards)
-        # and it wasn't ever replaced by anything *headdesk*
-        assert 'exception' in messages[0]
-        assert 'Exception: The Message!' == messages[0]['exception']
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', '/tmp/some-log-%Y-%m-%d-%H-%M-%S.log')
-    def test_date_formatting(self):
-        start = datetime(2016, 7, 20, 10, 56, 19)
-        end = start + timedelta(seconds=35.6)
-
-        self.mock_datetime.utcnow.side_effect = [start, end]
-
-        messages = self.get_log_messages()
-        assert len(messages) == 1
-
-        MOCK_OPEN.assert_called_once_with('/tmp/some-log-2016-07-20-10-56-19.log', 'a')
-
-    @patch.object(timer, 'PAVER_TIMER_LOG', '/tmp/some-log')
-    def test_nested_tasks(self):
-
-        @timer.timed
-        def parent():
-            """
-            A timed task that calls another task
-            """
-            identity()
-
-        parent_start = datetime(2016, 7, 20, 10, 56, 19)
-        parent_end = parent_start + timedelta(seconds=60)
-        child_start = parent_start + timedelta(seconds=10)
-        child_end = parent_end - timedelta(seconds=10)
-
-        self.mock_datetime.utcnow.side_effect = [parent_start, child_start, child_end, parent_end]
-
-        messages = self.get_log_messages(task=parent)
-        assert len(messages) == 2
-
-        # Child messages first
-        assert 'duration' in messages[0]
-        assert 40 == messages[0]['duration']
-
-        assert 'started_at' in messages[0]
-        assert child_start.isoformat(' ') == messages[0]['started_at']
-
-        assert 'ended_at' in messages[0]
-        assert child_end.isoformat(' ') == messages[0]['ended_at']
-
-        # Parent messages after
-        assert 'duration' in messages[1]
-        assert 60 == messages[1]['duration']
-
-        assert 'started_at' in messages[1]
-        assert parent_start.isoformat(' ') == messages[1]['started_at']
-
-        assert 'ended_at' in messages[1]
-        assert parent_end.isoformat(' ') == messages[1]['ended_at']
diff --git a/pavelib/paver_tests/test_xsslint.py b/pavelib/paver_tests/test_xsslint.py
deleted file mode 100644
index a9b4a41e1600..000000000000
--- a/pavelib/paver_tests/test_xsslint.py
+++ /dev/null
@@ -1,120 +0,0 @@
-"""
-Tests for paver xsslint quality tasks
-"""
-from unittest.mock import patch
-
-import pytest
-from paver.easy import call_task
-
-import pavelib.quality
-
-from .utils import PaverTestCase
-
-
-class PaverXSSLintTest(PaverTestCase):
-    """
-    Test run_xsslint with a mocked environment in order to pass in opts
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.reset_task_messages()
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_violation_number_not_found(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint encounters an error parsing the xsslint output log
-        """
-        _mock_counts.return_value = {}
-        with pytest.raises(SystemExit):
-            call_task('pavelib.quality.run_xsslint')
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_vanilla(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint finds violations, but a limit was not set
-        """
-        _mock_counts.return_value = {'total': 0}
-        call_task('pavelib.quality.run_xsslint')
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_invalid_thresholds_option(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint fails when thresholds option is poorly formatted
-        """
-        _mock_counts.return_value = {'total': 0}
-        with pytest.raises(SystemExit):
-            call_task('pavelib.quality.run_xsslint', options={"thresholds": "invalid"})
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_invalid_thresholds_option_key(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint fails when thresholds option is poorly formatted
-        """
-        _mock_counts.return_value = {'total': 0}
-        with pytest.raises(SystemExit):
-            call_task('pavelib.quality.run_xsslint', options={"thresholds": '{"invalid": 3}'})
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_too_many_violations(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint finds more violations than are allowed
-        """
-        _mock_counts.return_value = {'total': 4}
-        with pytest.raises(SystemExit):
-            call_task('pavelib.quality.run_xsslint', options={"thresholds": '{"total": 3}'})
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_under_limit(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint finds fewer violations than are allowed
-        """
-        _mock_counts.return_value = {'total': 4}
-        # No System Exit is expected
-        call_task('pavelib.quality.run_xsslint', options={"thresholds": '{"total": 5}'})
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_rule_violation_number_not_found(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint encounters an error parsing the xsslint output log for a
-        given rule threshold that was set.
-        """
-        _mock_counts.return_value = {'total': 4}
-        with pytest.raises(SystemExit):
-            call_task('pavelib.quality.run_xsslint', options={"thresholds": '{"rules": {"javascript-escape": 3}}'})
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_too_many_rule_violations(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint finds more rule violations than are allowed
-        """
-        _mock_counts.return_value = {'total': 4, 'rules': {'javascript-escape': 4}}
-        with pytest.raises(SystemExit):
-            call_task('pavelib.quality.run_xsslint', options={"thresholds": '{"rules": {"javascript-escape": 3}}'})
-
-    @patch.object(pavelib.quality, '_write_metric')
-    @patch.object(pavelib.quality, '_prepare_report_dir')
-    @patch.object(pavelib.quality, '_get_xsslint_counts')
-    def test_xsslint_under_rule_limit(self, _mock_counts, _mock_report_dir, _mock_write_metric):
-        """
-        run_xsslint finds fewer rule violations than are allowed
-        """
-        _mock_counts.return_value = {'total': 4, 'rules': {'javascript-escape': 4}}
-        # No System Exit is expected
-        call_task('pavelib.quality.run_xsslint', options={"thresholds": '{"rules": {"javascript-escape": 5}}'})
diff --git a/pavelib/paver_tests/utils.py b/pavelib/paver_tests/utils.py
deleted file mode 100644
index 1db26cf76a4c..000000000000
--- a/pavelib/paver_tests/utils.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""Unit tests for the Paver server tasks."""
-
-
-import os
-from unittest import TestCase
-from uuid import uuid4
-
-from paver import tasks
-from paver.easy import BuildFailure
-
-
-class PaverTestCase(TestCase):
-    """
-    Base class for Paver test cases.
-    """
-    def setUp(self):
-        super().setUp()
-
-        # Show full length diffs upon test failure
-        self.maxDiff = None  # pylint: disable=invalid-name
-
-        # Create a mock Paver environment
-        tasks.environment = MockEnvironment()
-
-        # Don't run pre-reqs
-        os.environ['NO_PREREQ_INSTALL'] = 'true'
-
-    def tearDown(self):
-        super().tearDown()
-        tasks.environment = tasks.Environment()
-        del os.environ['NO_PREREQ_INSTALL']
-
-    @property
-    def task_messages(self):
-        """Returns the messages output by the Paver task."""
-        return tasks.environment.messages
-
-    @property
-    def platform_root(self):
-        """Returns the current platform's root directory."""
-        return os.getcwd()
-
-    def reset_task_messages(self):
-        """Clear the recorded message"""
-        tasks.environment.messages = []
-
-
-class MockEnvironment(tasks.Environment):
-    """
-    Mock environment that collects information about Paver commands.
-    """
-    def __init__(self):
-        super().__init__()
-        self.dry_run = True
-        self.messages = []
-
-    def info(self, message, *args):
-        """Capture any messages that have been recorded"""
-        if args:
-            output = message % args
-        else:
-            output = message
-        if not output.startswith("--->"):
-            self.messages.append(str(output))
-
-
-def fail_on_eslint(*args, **kwargs):
-    """
-    For our tests, we need the call for diff-quality running eslint reports
-    to fail, since that is what is going to fail when we pass in a
-    percentage ("p") requirement.
-    """
-    if "eslint" in args[0]:  # lint-amnesty, pylint: disable=no-else-raise
-        raise BuildFailure('Subprocess return code: 1')
-    else:
-        if kwargs.get('capture', False):
-            return uuid4().hex
-        else:
-            return
-
-
-def fail_on_npm_install():
-    """
-    Used to simulate an error when executing "npm install"
-    """
-    return 1
-
-
-def unexpected_fail_on_npm_install(*args, **kwargs):  # pylint: disable=unused-argument
-    """
-    For our tests, we need the call for diff-quality running pycodestyle reports to fail, since that is what
-    is going to fail when we pass in a percentage ("p") requirement.
-    """
-    if ["npm", "install", "--verbose"] == args[0]:  # lint-amnesty, pylint: disable=no-else-raise
-        raise BuildFailure('Subprocess return code: 50')
-    else:
-        return
diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py
deleted file mode 100644
index 4453176c94da..000000000000
--- a/pavelib/prereqs.py
+++ /dev/null
@@ -1,351 +0,0 @@
-"""
-Install Python and Node prerequisites.
-"""
-
-
-import hashlib
-import os
-import re
-import subprocess
-import sys
-from distutils import sysconfig  # pylint: disable=deprecated-module
-
-from paver.easy import sh, task  # lint-amnesty, pylint: disable=unused-import
-
-from .utils.envs import Env
-from .utils.timer import timed
-
-PREREQS_STATE_DIR = os.getenv('PREREQ_CACHE_DIR', Env.REPO_ROOT / '.prereqs_cache')
-NO_PREREQ_MESSAGE = "NO_PREREQ_INSTALL is set, not installing prereqs"
-NO_PYTHON_UNINSTALL_MESSAGE = 'NO_PYTHON_UNINSTALL is set. No attempts will be made to uninstall old Python libs.'
-COVERAGE_REQ_FILE = 'requirements/edx/coverage.txt'
-
-# If you make any changes to this list you also need to make
-# a corresponding change to circle.yml, which is how the python
-# prerequisites are installed for builds on circleci.com
-toxenv = os.environ.get('TOXENV')
-if toxenv and toxenv != 'quality':
-    PYTHON_REQ_FILES = ['requirements/edx/testing.txt']
-else:
-    PYTHON_REQ_FILES = ['requirements/edx/development.txt']
-
-# Developers can have private requirements, for local copies of github repos,
-# or favorite debugging tools, etc.
-PRIVATE_REQS = 'requirements/edx/private.txt'
-if os.path.exists(PRIVATE_REQS):
-    PYTHON_REQ_FILES.append(PRIVATE_REQS)
-
-
-def str2bool(s):
-    s = str(s)
-    return s.lower() in ('yes', 'true', 't', '1')
-
-
-def no_prereq_install():
-    """
-    Determine if NO_PREREQ_INSTALL should be truthy or falsy.
-    """
-    return str2bool(os.environ.get('NO_PREREQ_INSTALL', 'False'))
-
-
-def no_python_uninstall():
-    """ Determine if we should run the uninstall_python_packages task. """
-    return str2bool(os.environ.get('NO_PYTHON_UNINSTALL', 'False'))
-
-
-def create_prereqs_cache_dir():
-    """Create the directory for storing the hashes, if it doesn't exist already."""
-    try:
-        os.makedirs(PREREQS_STATE_DIR)
-    except OSError:
-        if not os.path.isdir(PREREQS_STATE_DIR):
-            raise
-
-
-def compute_fingerprint(path_list):
-    """
-    Hash the contents of all the files and directories in `path_list`.
-    Returns the hex digest.
-    """
-
-    hasher = hashlib.sha1()
-
-    for path_item in path_list:
-
-        # For directories, create a hash based on the modification times
-        # of first-level subdirectories
-        if os.path.isdir(path_item):
-            for dirname in sorted(os.listdir(path_item)):
-                path_name = os.path.join(path_item, dirname)
-                if os.path.isdir(path_name):
-                    hasher.update(str(os.stat(path_name).st_mtime).encode('utf-8'))
-
-        # For files, hash the contents of the file
-        if os.path.isfile(path_item):
-            with open(path_item, "rb") as file_handle:
-                hasher.update(file_handle.read())
-
-    return hasher.hexdigest()
-
-
-def prereq_cache(cache_name, paths, install_func):
-    """
-    Conditionally execute `install_func()` only if the files/directories
-    specified by `paths` have changed.
-
-    If the code executes successfully (no exceptions are thrown), the cache
-    is updated with the new hash.
-    """
-    # Retrieve the old hash
-    cache_filename = cache_name.replace(" ", "_")
-    cache_file_path = os.path.join(PREREQS_STATE_DIR, f"{cache_filename}.sha1")
-    old_hash = None
-    if os.path.isfile(cache_file_path):
-        with open(cache_file_path) as cache_file:
-            old_hash = cache_file.read()
-
-    # Compare the old hash to the new hash
-    # If they do not match (either the cache hasn't been created, or the files have changed),
-    # then execute the code within the block.
-    new_hash = compute_fingerprint(paths)
-    if new_hash != old_hash:
-        install_func()
-
-        # Update the cache with the new hash
-        # If the code executed within the context fails (throws an exception),
-        # then this step won't get executed.
-        create_prereqs_cache_dir()
-        with open(cache_file_path, "wb") as cache_file:
-            # Since the pip requirement files are modified during the install
-            # process, we need to store the hash generated AFTER the installation
-            post_install_hash = compute_fingerprint(paths)
-            cache_file.write(post_install_hash.encode('utf-8'))
-    else:
-        print(f'{cache_name} unchanged, skipping...')
-
-
-def node_prereqs_installation():
-    """
-    Configures npm and installs Node prerequisites
-    """
-    # Before July 2023, these directories were created and written to
-    # as root. Afterwards, they are created as being owned by the
-    # `app` user -- but also need to be deleted by that user (due to
-    # how npm runs post-install scripts.) Developers with an older
-    # devstack installation who are reprovisioning will see errors
-    # here if the files are still owned by root. Deleting the files in
-    # advance prevents this error.
-    #
-    # This hack should probably be left in place for at least a year.
-    # See ADR 17 for more background on the transition.
-    sh("rm -rf common/static/common/js/vendor/ common/static/common/css/vendor/")
-    # At the time of this writing, the js dir has git-versioned files
-    # but the css dir does not, so the latter would have been created
-    # as root-owned (in the process of creating the vendor
-    # subdirectory). Delete it only if empty, just in case
-    # git-versioned files are added later.
-    sh("rmdir common/static/common/css || true")
-
-    # NPM installs hang sporadically. Log the installation process so that we
-    # determine if any packages are chronic offenders.
-    npm_log_file_path = f'{Env.GEN_LOG_DIR}/npm-install.log'
-    npm_log_file = open(npm_log_file_path, 'wb')  # lint-amnesty, pylint: disable=consider-using-with
-    npm_command = 'npm ci --verbose'.split()
-
-    # The implementation of Paver's `sh` function returns before the forked
-    # actually returns. Using a Popen object so that we can ensure that
-    # the forked process has returned
-    proc = subprocess.Popen(npm_command, stderr=npm_log_file)  # lint-amnesty, pylint: disable=consider-using-with
-    retcode = proc.wait()
-    if retcode == 1:
-        raise Exception(f"npm install failed: See {npm_log_file_path}")
-    print("Successfully clean-installed NPM packages. Log found at {}".format(
-        npm_log_file_path
-    ))
-
-
-def python_prereqs_installation():
-    """
-    Installs Python prerequisites
-    """
-    # 	edx-platform installs some Python projects from within the edx-platform repo itself.
-    sh("pip install -e .")
-    for req_file in PYTHON_REQ_FILES:
-        pip_install_req_file(req_file)
-
-
-def pip_install_req_file(req_file):
-    """Pip install the requirements file."""
-    pip_cmd = 'pip install -q --disable-pip-version-check --exists-action w'
-    sh(f"{pip_cmd} -r {req_file}")
-
-
-@task
-@timed
-def install_node_prereqs():
-    """
-    Installs Node prerequisites
-    """
-    if no_prereq_install():
-        print(NO_PREREQ_MESSAGE)
-        return
-
-    prereq_cache("Node prereqs", ["package.json", "package-lock.json"], node_prereqs_installation)
-
-
-# To add a package to the uninstall list, just add it to this list! No need
-# to touch any other part of this file.
-PACKAGES_TO_UNINSTALL = [
-    "MySQL-python",                 # Because mysqlclient shares the same directory name
-    "South",                        # Because it interferes with Django 1.8 migrations.
-    "edxval",                       # Because it was bork-installed somehow.
-    "django-storages",
-    "django-oauth2-provider",       # Because now it's called edx-django-oauth2-provider.
-    "edx-oauth2-provider",          # Because it moved from github to pypi
-    "enum34",                       # Because enum34 is not needed in python>3.4
-    "i18n-tools",                   # Because now it's called edx-i18n-tools
-    "moto",                         # Because we no longer use it and it conflicts with recent jsondiff versions
-    "python-saml",                  # Because python3-saml shares the same directory name
-    "pytest-faulthandler",          # Because it was bundled into pytest
-    "djangorestframework-jwt",      # Because now its called drf-jwt.
-]
-
-
-@task
-@timed
-def uninstall_python_packages():
-    """
-    Uninstall Python packages that need explicit uninstallation.
-
-    Some Python packages that we no longer want need to be explicitly
-    uninstalled, notably, South.  Some other packages were once installed in
-    ways that were resistant to being upgraded, like edxval.  Also uninstall
-    them.
-    """
-
-    if no_python_uninstall():
-        print(NO_PYTHON_UNINSTALL_MESSAGE)
-        return
-
-    # So that we don't constantly uninstall things, use a hash of the packages
-    # to be uninstalled.  Check it, and skip this if we're up to date.
-    hasher = hashlib.sha1()
-    hasher.update(repr(PACKAGES_TO_UNINSTALL).encode('utf-8'))
-    expected_version = hasher.hexdigest()
-    state_file_path = os.path.join(PREREQS_STATE_DIR, "Python_uninstall.sha1")
-    create_prereqs_cache_dir()
-
-    if os.path.isfile(state_file_path):
-        with open(state_file_path) as state_file:
-            version = state_file.read()
-        if version == expected_version:
-            print('Python uninstalls unchanged, skipping...')
-            return
-
-    # Run pip to find the packages we need to get rid of.  Believe it or not,
-    # edx-val is installed in a way that it is present twice, so we have a loop
-    # to really really get rid of it.
-    for _ in range(3):
-        uninstalled = False
-        frozen = sh("pip freeze", capture=True)
-
-        for package_name in PACKAGES_TO_UNINSTALL:
-            if package_in_frozen(package_name, frozen):
-                # Uninstall the pacakge
-                sh(f"pip uninstall --disable-pip-version-check -y {package_name}")
-                uninstalled = True
-        if not uninstalled:
-            break
-    else:
-        # We tried three times and didn't manage to get rid of the pests.
-        print("Couldn't uninstall unwanted Python packages!")
-        return
-
-    # Write our version.
-    with open(state_file_path, "wb") as state_file:
-        state_file.write(expected_version.encode('utf-8'))
-
-
-def package_in_frozen(package_name, frozen_output):
-    """Is this package in the output of 'pip freeze'?"""
-    # Look for either:
-    #
-    #   PACKAGE-NAME==
-    #
-    # or:
-    #
-    #   blah_blah#egg=package_name-version
-    #
-    pattern = r"(?mi)^{pkg}==|#egg={pkg_under}-".format(
-        pkg=re.escape(package_name),
-        pkg_under=re.escape(package_name.replace("-", "_")),
-    )
-    return bool(re.search(pattern, frozen_output))
-
-
-@task
-@timed
-def install_coverage_prereqs():
-    """ Install python prereqs for measuring coverage. """
-    if no_prereq_install():
-        print(NO_PREREQ_MESSAGE)
-        return
-    pip_install_req_file(COVERAGE_REQ_FILE)
-
-
-@task
-@timed
-def install_python_prereqs():
-    """
-    Installs Python prerequisites.
-    """
-    if no_prereq_install():
-        print(NO_PREREQ_MESSAGE)
-        return
-
-    uninstall_python_packages()
-
-    # Include all of the requirements files in the fingerprint.
-    files_to_fingerprint = list(PYTHON_REQ_FILES)
-
-    # Also fingerprint the directories where packages get installed:
-    # ("/edx/app/edxapp/venvs/edxapp/lib/python2.7/site-packages")
-    files_to_fingerprint.append(sysconfig.get_python_lib())
-
-    # In a virtualenv, "-e installs" get put in a src directory.
-    if Env.PIP_SRC:
-        src_dir = Env.PIP_SRC
-    else:
-        src_dir = os.path.join(sys.prefix, "src")
-    if os.path.isdir(src_dir):
-        files_to_fingerprint.append(src_dir)
-
-    # Also fingerprint this source file, so that if the logic for installations
-    # changes, we will redo the installation.
-    this_file = __file__
-    if this_file.endswith(".pyc"):
-        this_file = this_file[:-1]      # use the .py file instead of the .pyc
-    files_to_fingerprint.append(this_file)
-
-    prereq_cache("Python prereqs", files_to_fingerprint, python_prereqs_installation)
-
-
-@task
-@timed
-def install_prereqs():
-    """
-    Installs Node and Python prerequisites
-    """
-    if no_prereq_install():
-        print(NO_PREREQ_MESSAGE)
-        return
-
-    if not str2bool(os.environ.get('SKIP_NPM_INSTALL', 'False')):
-        install_node_prereqs()
-    install_python_prereqs()
-    log_installed_python_prereqs()
-
-
-def log_installed_python_prereqs():
-    """  Logs output of pip freeze for debugging. """
-    sh("pip freeze > {}".format(Env.GEN_LOG_DIR + "/pip_freeze.log"))
diff --git a/pavelib/quality.py b/pavelib/quality.py
deleted file mode 100644
index 774179f45048..000000000000
--- a/pavelib/quality.py
+++ /dev/null
@@ -1,602 +0,0 @@
-"""  # lint-amnesty, pylint: disable=django-not-configured
-Check code quality using pycodestyle, pylint, and diff_quality.
-"""
-
-import json
-import os
-import re
-from datetime import datetime
-from xml.sax.saxutils import quoteattr
-
-from paver.easy import BuildFailure, cmdopts, needs, sh, task
-
-from .utils.envs import Env
-from .utils.timer import timed
-
-ALL_SYSTEMS = 'lms,cms,common,openedx,pavelib,scripts'
-JUNIT_XML_TEMPLATE = """<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="{name}" tests="1" errors="0" failures="{failure_count}" skip="0">
-<testcase classname="pavelib.quality" name="{name}" time="{seconds}">{failure_element}</testcase>
-</testsuite>
-"""
-JUNIT_XML_FAILURE_TEMPLATE = '<failure message={message}/>'
-START_TIME = datetime.utcnow()
-
-
-def write_junit_xml(name, message=None):
-    """
-    Write a JUnit results XML file describing the outcome of a quality check.
-    """
-    if message:
-        failure_element = JUNIT_XML_FAILURE_TEMPLATE.format(message=quoteattr(message))
-    else:
-        failure_element = ''
-    data = {
-        'failure_count': 1 if message else 0,
-        'failure_element': failure_element,
-        'name': name,
-        'seconds': (datetime.utcnow() - START_TIME).total_seconds(),
-    }
-    Env.QUALITY_DIR.makedirs_p()
-    filename = Env.QUALITY_DIR / f'{name}.xml'
-    with open(filename, 'w') as f:
-        f.write(JUNIT_XML_TEMPLATE.format(**data))
-
-
-def fail_quality(name, message):
-    """
-    Fail the specified quality check by generating the JUnit XML results file
-    and raising a ``BuildFailure``.
-    """
-    write_junit_xml(name, message)
-    raise BuildFailure(message)
-
-
-def top_python_dirs(dirname):
-    """
-    Find the directories to start from in order to find all the Python files in `dirname`.
-    """
-    top_dirs = []
-
-    dir_init = os.path.join(dirname, "__init__.py")
-    if os.path.exists(dir_init):
-        top_dirs.append(dirname)
-
-    for directory in ['djangoapps', 'lib']:
-        subdir = os.path.join(dirname, directory)
-        subdir_init = os.path.join(subdir, "__init__.py")
-        if os.path.exists(subdir) and not os.path.exists(subdir_init):
-            dirs = os.listdir(subdir)
-            top_dirs.extend(d for d in dirs if os.path.isdir(os.path.join(subdir, d)))
-
-    modules_to_remove = ['__pycache__']
-    for module in modules_to_remove:
-        if module in top_dirs:
-            top_dirs.remove(module)
-
-    return top_dirs
-
-
-def _get_pep8_violations(clean=True):
-    """
-    Runs pycodestyle. Returns a tuple of (number_of_violations, violations_string)
-    where violations_string is a string of all PEP 8 violations found, separated
-    by new lines.
-    """
-    report_dir = (Env.REPORT_DIR / 'pep8')
-    if clean:
-        report_dir.rmtree(ignore_errors=True)
-    report_dir.makedirs_p()
-    report = report_dir / 'pep8.report'
-
-    # Make sure the metrics subdirectory exists
-    Env.METRICS_DIR.makedirs_p()
-
-    if not report.exists():
-        sh(f'pycodestyle . | tee {report} -a')
-
-    violations_list = _pep8_violations(report)
-
-    return len(violations_list), violations_list
-
-
-def _pep8_violations(report_file):
-    """
-    Returns the list of all PEP 8 violations in the given report_file.
-    """
-    with open(report_file) as f:
-        return f.readlines()
-
-
-@task
-@cmdopts([
-    ("system=", "s", "System to act on"),
-])
-@timed
-def run_pep8(options):  # pylint: disable=unused-argument
-    """
-    Run pycodestyle on system code.
-    Fail the task if any violations are found.
-    """
-    (count, violations_list) = _get_pep8_violations()
-    violations_list = ''.join(violations_list)
-
-    # Print number of violations to log
-    violations_count_str = f"Number of PEP 8 violations: {count}"
-    print(violations_count_str)
-    print(violations_list)
-
-    # Also write the number of violations to a file
-    with open(Env.METRICS_DIR / "pep8", "w") as f:
-        f.write(violations_count_str + '\n\n')
-        f.write(violations_list)
-
-    # Fail if any violations are found
-    if count:
-        failure_string = "FAILURE: Too many PEP 8 violations. " + violations_count_str
-        failure_string += f"\n\nViolations:\n{violations_list}"
-        fail_quality('pep8', failure_string)
-    else:
-        write_junit_xml('pep8')
-
-
-@task
-@needs(
-    'pavelib.prereqs.install_node_prereqs',
-    'pavelib.utils.test.utils.ensure_clean_package_lock',
-)
-@cmdopts([
-    ("limit=", "l", "limit for number of acceptable violations"),
-])
-@timed
-def run_eslint(options):
-    """
-    Runs eslint on static asset directories.
-    If limit option is passed, fails build if more violations than the limit are found.
-    """
-
-    eslint_report_dir = (Env.REPORT_DIR / "eslint")
-    eslint_report = eslint_report_dir / "eslint.report"
-    _prepare_report_dir(eslint_report_dir)
-    violations_limit = int(getattr(options, 'limit', -1))
-
-    sh(
-        "node --max_old_space_size=4096 node_modules/.bin/eslint "
-        "--ext .js --ext .jsx --format=compact . | tee {eslint_report}".format(
-            eslint_report=eslint_report
-        ),
-        ignore_error=True
-    )
-
-    try:
-        num_violations = int(_get_count_from_last_line(eslint_report, "eslint"))
-    except TypeError:
-        fail_quality(
-            'eslint',
-            "FAILURE: Number of eslint violations could not be found in {eslint_report}".format(
-                eslint_report=eslint_report
-            )
-        )
-
-    # Record the metric
-    _write_metric(num_violations, (Env.METRICS_DIR / "eslint"))
-
-    # Fail if number of violations is greater than the limit
-    if num_violations > violations_limit > -1:
-        fail_quality(
-            'eslint',
-            "FAILURE: Too many eslint violations ({count}).\nThe limit is {violations_limit}.".format(
-                count=num_violations, violations_limit=violations_limit
-            )
-        )
-    else:
-        write_junit_xml('eslint')
-
-
-def _get_stylelint_violations():
-    """
-    Returns the number of Stylelint violations.
-    """
-    stylelint_report_dir = (Env.REPORT_DIR / "stylelint")
-    stylelint_report = stylelint_report_dir / "stylelint.report"
-    _prepare_report_dir(stylelint_report_dir)
-    formatter = 'node_modules/stylelint-formatter-pretty'
-
-    sh(
-        "stylelint **/*.scss --custom-formatter={formatter} | tee {stylelint_report}".format(
-            formatter=formatter,
-            stylelint_report=stylelint_report,
-        ),
-        ignore_error=True
-    )
-
-    try:
-        return int(_get_count_from_last_line(stylelint_report, "stylelint"))
-    except TypeError:
-        fail_quality(
-            'stylelint',
-            "FAILURE: Number of stylelint violations could not be found in {stylelint_report}".format(
-                stylelint_report=stylelint_report
-            )
-        )
-
-
-@task
-@needs('pavelib.prereqs.install_node_prereqs')
-@cmdopts([
-    ("limit=", "l", "limit for number of acceptable violations"),
-])
-@timed
-def run_stylelint(options):
-    """
-    Runs stylelint on Sass files.
-    If limit option is passed, fails build if more violations than the limit are found.
-    """
-    violations_limit = 0
-    num_violations = _get_stylelint_violations()
-
-    # Record the metric
-    _write_metric(num_violations, (Env.METRICS_DIR / "stylelint"))
-
-    # Fail if number of violations is greater than the limit
-    if num_violations > violations_limit:
-        fail_quality(
-            'stylelint',
-            "FAILURE: Stylelint failed with too many violations: ({count}).\nThe limit is {violations_limit}.".format(
-                count=num_violations,
-                violations_limit=violations_limit,
-            )
-        )
-    else:
-        write_junit_xml('stylelint')
-
-
-@task
-@needs('pavelib.prereqs.install_python_prereqs')
-@cmdopts([
-    ("thresholds=", "t", "json containing limit for number of acceptable violations per rule"),
-])
-@timed
-def run_xsslint(options):
-    """
-    Runs xsslint/xss_linter.py on the codebase
-    """
-
-    thresholds_option = getattr(options, 'thresholds', '{}')
-    try:
-        violation_thresholds = json.loads(thresholds_option)
-    except ValueError:
-        violation_thresholds = None
-    if isinstance(violation_thresholds, dict) is False or \
-            any(key not in ("total", "rules") for key in violation_thresholds.keys()):
-
-        fail_quality(
-            'xsslint',
-            """FAILURE: Thresholds option "{thresholds_option}" was not supplied using proper format.\n"""
-            """Here is a properly formatted example, '{{"total":100,"rules":{{"javascript-escape":0}}}}' """
-            """with property names in double-quotes.""".format(
-                thresholds_option=thresholds_option
-            )
-        )
-
-    xsslint_script = "xss_linter.py"
-    xsslint_report_dir = (Env.REPORT_DIR / "xsslint")
-    xsslint_report = xsslint_report_dir / "xsslint.report"
-    _prepare_report_dir(xsslint_report_dir)
-
-    sh(
-        "{repo_root}/scripts/xsslint/{xsslint_script} --rule-totals --config={cfg_module} >> {xsslint_report}".format(
-            repo_root=Env.REPO_ROOT,
-            xsslint_script=xsslint_script,
-            xsslint_report=xsslint_report,
-            cfg_module='scripts.xsslint_config'
-        ),
-        ignore_error=True
-    )
-
-    xsslint_counts = _get_xsslint_counts(xsslint_report)
-
-    try:
-        metrics_str = "Number of {xsslint_script} violations: {num_violations}\n".format(
-            xsslint_script=xsslint_script, num_violations=int(xsslint_counts['total'])
-        )
-        if 'rules' in xsslint_counts and any(xsslint_counts['rules']):
-            metrics_str += "\n"
-            rule_keys = sorted(xsslint_counts['rules'].keys())
-            for rule in rule_keys:
-                metrics_str += "{rule} violations: {count}\n".format(
-                    rule=rule,
-                    count=int(xsslint_counts['rules'][rule])
-                )
-    except TypeError:
-        fail_quality(
-            'xsslint',
-            "FAILURE: Number of {xsslint_script} violations could not be found in {xsslint_report}".format(
-                xsslint_script=xsslint_script, xsslint_report=xsslint_report
-            )
-        )
-
-    metrics_report = (Env.METRICS_DIR / "xsslint")
-    # Record the metric
-    _write_metric(metrics_str, metrics_report)
-    # Print number of violations to log.
-    sh(f"cat {metrics_report}", ignore_error=True)
-
-    error_message = ""
-
-    # Test total violations against threshold.
-    if 'total' in list(violation_thresholds.keys()):
-        if violation_thresholds['total'] < xsslint_counts['total']:
-            error_message = "Too many violations total ({count}).\nThe limit is {violations_limit}.".format(
-                count=xsslint_counts['total'], violations_limit=violation_thresholds['total']
-            )
-
-    # Test rule violations against thresholds.
-    if 'rules' in violation_thresholds:
-        threshold_keys = sorted(violation_thresholds['rules'].keys())
-        for threshold_key in threshold_keys:
-            if threshold_key not in xsslint_counts['rules']:
-                error_message += (
-                    "\nNumber of {xsslint_script} violations for {rule} could not be found in "
-                    "{xsslint_report}."
-                ).format(
-                    xsslint_script=xsslint_script, rule=threshold_key, xsslint_report=xsslint_report
-                )
-            elif violation_thresholds['rules'][threshold_key] < xsslint_counts['rules'][threshold_key]:
-                error_message += \
-                    "\nToo many {rule} violations ({count}).\nThe {rule} limit is {violations_limit}.".format(
-                        rule=threshold_key, count=xsslint_counts['rules'][threshold_key],
-                        violations_limit=violation_thresholds['rules'][threshold_key],
-                    )
-
-    if error_message:
-        fail_quality(
-            'xsslint',
-            "FAILURE: XSSLinter Failed.\n{error_message}\n"
-            "See {xsslint_report} or run the following command to hone in on the problem:\n"
-            "  ./scripts/xss-commit-linter.sh -h".format(
-                error_message=error_message, xsslint_report=xsslint_report
-            )
-        )
-    else:
-        write_junit_xml('xsslint')
-
-
-def _write_metric(metric, filename):
-    """
-    Write a given metric to a given file
-    Used for things like reports/metrics/eslint, which will simply tell you the number of
-    eslint violations found
-    """
-    Env.METRICS_DIR.makedirs_p()
-
-    with open(filename, "w") as metric_file:
-        metric_file.write(str(metric))
-
-
-def _prepare_report_dir(dir_name):
-    """
-    Sets a given directory to a created, but empty state
-    """
-    dir_name.rmtree_p()
-    dir_name.mkdir_p()
-
-
-def _get_report_contents(filename, report_name, last_line_only=False):
-    """
-    Returns the contents of the given file. Use last_line_only to only return
-    the last line, which can be used for getting output from quality output
-    files.
-
-    Arguments:
-        last_line_only: True to return the last line only, False to return a
-            string with full contents.
-
-    Returns:
-        String containing full contents of the report, or the last line.
-
-    """
-    if os.path.isfile(filename):
-        with open(filename) as report_file:
-            if last_line_only:
-                lines = report_file.readlines()
-                for line in reversed(lines):
-                    if line != '\n':
-                        return line
-                return None
-            else:
-                return report_file.read()
-    else:
-        file_not_found_message = f"FAILURE: The following log file could not be found: {filename}"
-        fail_quality(report_name, file_not_found_message)
-
-
-def _get_count_from_last_line(filename, file_type):
-    """
-    This will return the number in the last line of a file.
-    It is returning only the value (as a floating number).
-    """
-    report_contents = _get_report_contents(filename, file_type, last_line_only=True)
-
-    if report_contents is None:
-        return 0
-
-    last_line = report_contents.strip()
-    # Example of the last line of a compact-formatted eslint report (for example): "62829 problems"
-    regex = r'^\d+'
-
-    try:
-        return float(re.search(regex, last_line).group(0))
-    # An AttributeError will occur if the regex finds no matches.
-    # A ValueError will occur if the returned regex cannot be cast as a float.
-    except (AttributeError, ValueError):
-        return None
-
-
-def _get_xsslint_counts(filename):
-    """
-    This returns a dict of violations from the xsslint report.
-
-    Arguments:
-        filename: The name of the xsslint report.
-
-    Returns:
-        A dict containing the following:
-            rules: A dict containing the count for each rule as follows:
-                violation-rule-id: N, where N is the number of violations
-            total: M, where M is the number of total violations
-
-    """
-    report_contents = _get_report_contents(filename, 'xsslint')
-    rule_count_regex = re.compile(r"^(?P<rule_id>[a-z-]+):\s+(?P<count>\d+) violations", re.MULTILINE)
-    total_count_regex = re.compile(r"^(?P<count>\d+) violations total", re.MULTILINE)
-    violations = {'rules': {}}
-    for violation_match in rule_count_regex.finditer(report_contents):
-        try:
-            violations['rules'][violation_match.group('rule_id')] = int(violation_match.group('count'))
-        except ValueError:
-            violations['rules'][violation_match.group('rule_id')] = None
-    try:
-        violations['total'] = int(total_count_regex.search(report_contents).group('count'))
-    # An AttributeError will occur if the regex finds no matches.
-    # A ValueError will occur if the returned regex cannot be cast as a float.
-    except (AttributeError, ValueError):
-        violations['total'] = None
-    return violations
-
-
-def _extract_missing_pii_annotations(filename):
-    """
-    Returns the number of uncovered models from the stdout report of django_find_annotations.
-
-    Arguments:
-        filename: Filename where stdout of django_find_annotations was captured.
-
-    Returns:
-        three-tuple containing:
-            1. The number of uncovered models,
-            2. A bool indicating whether the coverage is still below the threshold, and
-            3. The full report as a string.
-    """
-    uncovered_models = 0
-    pii_check_passed = True
-    if os.path.isfile(filename):
-        with open(filename) as report_file:
-            lines = report_file.readlines()
-
-            # Find the count of uncovered models.
-            uncovered_regex = re.compile(r'^Coverage found ([\d]+) uncovered')
-            for line in lines:
-                uncovered_match = uncovered_regex.match(line)
-                if uncovered_match:
-                    uncovered_models = int(uncovered_match.groups()[0])
-                    break
-
-            # Find a message which suggests the check failed.
-            failure_regex = re.compile(r'^Coverage threshold not met!')
-            for line in lines:
-                failure_match = failure_regex.match(line)
-                if failure_match:
-                    pii_check_passed = False
-                    break
-
-            # Each line in lines already contains a newline.
-            full_log = ''.join(lines)
-    else:
-        fail_quality('pii', f'FAILURE: Log file could not be found: {filename}')
-
-    return (uncovered_models, pii_check_passed, full_log)
-
-
-@task
-@needs('pavelib.prereqs.install_python_prereqs')
-@cmdopts([
-    ("report-dir=", "r", "Directory in which to put PII reports"),
-])
-@timed
-def run_pii_check(options):
-    """
-    Guarantee that all Django models are PII-annotated.
-    """
-    pii_report_name = 'pii'
-    default_report_dir = (Env.REPORT_DIR / pii_report_name)
-    report_dir = getattr(options, 'report_dir', default_report_dir)
-    output_file = os.path.join(report_dir, 'pii_check_{}.report')
-    env_report = []
-    pii_check_passed = True
-    for env_name, env_settings_file in (("CMS", "cms.envs.test"), ("LMS", "lms.envs.test")):
-        try:
-            print()
-            print(f"Running {env_name} PII Annotation check and report")
-            print("-" * 45)
-            run_output_file = str(output_file).format(env_name.lower())
-            sh(
-                "mkdir -p {} && "  # lint-amnesty, pylint: disable=duplicate-string-formatting-argument
-                "export DJANGO_SETTINGS_MODULE={}; "
-                "code_annotations django_find_annotations "
-                "--config_file .pii_annotations.yml --report_path {} --app_name {} "
-                "--lint --report --coverage | tee {}".format(
-                    report_dir, env_settings_file, report_dir, env_name.lower(), run_output_file
-                )
-            )
-            uncovered_model_count, pii_check_passed_env, full_log = _extract_missing_pii_annotations(run_output_file)
-            env_report.append((
-                uncovered_model_count,
-                full_log,
-            ))
-
-        except BuildFailure as error_message:
-            fail_quality(pii_report_name, f'FAILURE: {error_message}')
-
-        if not pii_check_passed_env:
-            pii_check_passed = False
-
-    # Determine which suite is the worst offender by obtaining the max() keying off uncovered_count.
-    uncovered_count, full_log = max(env_report, key=lambda r: r[0])
-
-    # Write metric file.
-    if uncovered_count is None:
-        uncovered_count = 0
-    metrics_str = f"Number of PII Annotation violations: {uncovered_count}\n"
-    _write_metric(metrics_str, (Env.METRICS_DIR / pii_report_name))
-
-    # Finally, fail the paver task if code_annotations suggests that the check failed.
-    if not pii_check_passed:
-        fail_quality('pii', full_log)
-
-
-@task
-@needs('pavelib.prereqs.install_python_prereqs')
-@timed
-def check_keywords():
-    """
-    Check Django model fields for names that conflict with a list of reserved keywords
-    """
-    report_path = os.path.join(Env.REPORT_DIR, 'reserved_keywords')
-    sh(f"mkdir -p {report_path}")
-
-    overall_status = True
-    for env, env_settings_file in [('lms', 'lms.envs.test'), ('cms', 'cms.envs.test')]:
-        report_file = f"{env}_reserved_keyword_report.csv"
-        override_file = os.path.join(Env.REPO_ROOT, "db_keyword_overrides.yml")
-        try:
-            sh(
-                "export DJANGO_SETTINGS_MODULE={settings_file}; "
-                "python manage.py {app} check_reserved_keywords "
-                "--override_file {override_file} "
-                "--report_path {report_path} "
-                "--report_file {report_file}".format(
-                    settings_file=env_settings_file, app=env, override_file=override_file,
-                    report_path=report_path, report_file=report_file
-                )
-            )
-        except BuildFailure:
-            overall_status = False
-
-    if not overall_status:
-        fail_quality(
-            'keywords',
-            'Failure: reserved keyword checker failed. Reports can be found here: {}'.format(
-                report_path
-            )
-        )
diff --git a/pavelib/utils/__init__.py b/pavelib/utils/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/pavelib/utils/cmd.py b/pavelib/utils/cmd.py
deleted file mode 100644
index a350c90a6a96..000000000000
--- a/pavelib/utils/cmd.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-Helper functions for constructing shell commands.
-"""
-
-
-def cmd(*args):
-    """
-    Concatenate the arguments into a space-separated shell command.
-    """
-    return " ".join(str(arg) for arg in args if arg)
-
-
-def django_cmd(sys, settings, *args):
-    """
-    Construct a Django management command.
-
-    `sys` is either 'lms' or 'studio'.
-    `settings` is the Django settings module (such as "dev" or "test")
-    `args` are concatenated to form the rest of the command.
-    """
-    # Maintain backwards compatibility with manage.py,
-    # which calls "studio" "cms"
-    sys = 'cms' if sys == 'studio' else sys
-    return cmd("python manage.py", sys, f"--settings={settings}", *args)
diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py
deleted file mode 100644
index d2cdd4a77d7a..000000000000
--- a/pavelib/utils/envs.py
+++ /dev/null
@@ -1,267 +0,0 @@
-"""
-Helper functions for loading environment settings.
-"""
-import configparser
-import json
-import os
-import sys
-from time import sleep
-
-from lazy import lazy
-from path import Path as path
-from paver.easy import BuildFailure, sh
-
-from pavelib.utils.cmd import django_cmd
-
-
-def repo_root():
-    """
-    Get the root of the git repository (edx-platform).
-
-    This sometimes fails on Docker Devstack, so it's been broken
-    down with some additional error handling.  It usually starts
-    working within 30 seconds or so; for more details, see
-    https://openedx.atlassian.net/browse/PLAT-1629 and
-    https://github.com/docker/for-mac/issues/1509
-    """
-    file_path = path(__file__)
-    attempt = 1
-    while True:
-        try:
-            absolute_path = file_path.abspath()
-            break
-        except OSError:
-            print(f'Attempt {attempt}/180 to get an absolute path failed')
-            if attempt < 180:
-                attempt += 1
-                sleep(1)
-            else:
-                print('Unable to determine the absolute path of the edx-platform repo, aborting')
-                raise
-    return absolute_path.parent.parent.parent
-
-
-class Env:
-    """
-    Load information about the execution environment.
-    """
-
-    # Root of the git repository (edx-platform)
-    REPO_ROOT = repo_root()
-
-    # Reports Directory
-    REPORT_DIR = REPO_ROOT / 'reports'
-    METRICS_DIR = REPORT_DIR / 'metrics'
-    QUALITY_DIR = REPORT_DIR / 'quality_junitxml'
-
-    # Generic log dir
-    GEN_LOG_DIR = REPO_ROOT / "test_root" / "log"
-
-    # Python unittest dirs
-    PYTHON_COVERAGERC = REPO_ROOT / ".coveragerc"
-
-    # Which Python version should be used in xdist workers?
-    PYTHON_VERSION = os.environ.get("PYTHON_VERSION", "2.7")
-
-    # Directory that videos are served from
-    VIDEO_SOURCE_DIR = REPO_ROOT / "test_root" / "data" / "video"
-
-    PRINT_SETTINGS_LOG_FILE = GEN_LOG_DIR / "print_settings.log"
-
-    # Detect if in a Docker container, and if so which one
-    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'
-
-    # Mongo databases that will be dropped before/after the tests run
-    MONGO_HOST = 'localhost'
-
-    # Test Ids Directory
-    TEST_DIR = REPO_ROOT / ".testids"
-
-    # Configured browser to use for the js test suites
-    SELENIUM_BROWSER = os.environ.get('SELENIUM_BROWSER', 'firefox')
-    if USING_DOCKER:
-        KARMA_BROWSER = 'ChromeDocker' if SELENIUM_BROWSER == 'chrome' else 'FirefoxDocker'
-    else:
-        KARMA_BROWSER = 'FirefoxNoUpdates'
-
-    # Files used to run each of the js test suites
-    # TODO:  Store this as a dict. Order seems to matter for some
-    # reason. See issue TE-415.
-    KARMA_CONFIG_FILES = [
-        REPO_ROOT / 'cms/static/karma_cms.conf.js',
-        REPO_ROOT / 'cms/static/karma_cms_squire.conf.js',
-        REPO_ROOT / 'cms/static/karma_cms_webpack.conf.js',
-        REPO_ROOT / 'lms/static/karma_lms.conf.js',
-        REPO_ROOT / 'xmodule/js/karma_xmodule.conf.js',
-        REPO_ROOT / 'xmodule/js/karma_xmodule_webpack.conf.js',
-        REPO_ROOT / 'common/static/karma_common.conf.js',
-        REPO_ROOT / 'common/static/karma_common_requirejs.conf.js',
-    ]
-
-    JS_TEST_ID_KEYS = [
-        'cms',
-        'cms-squire',
-        'cms-webpack',
-        'lms',
-        'xmodule',
-        'xmodule-webpack',
-        'common',
-        'common-requirejs',
-        'jest-snapshot'
-    ]
-
-    JS_REPORT_DIR = REPORT_DIR / 'javascript'
-
-    # Directories used for pavelib/ tests
-    IGNORED_TEST_DIRS = ('__pycache__', '.cache', '.pytest_cache')
-    LIB_TEST_DIRS = [path("pavelib/paver_tests"), path("scripts/xsslint/tests")]
-
-    # Directory for i18n test reports
-    I18N_REPORT_DIR = REPORT_DIR / 'i18n'
-
-    # Directory for keeping src folder that comes with pip installation.
-    # Setting this is equivalent to passing `--src <dir>` to pip directly.
-    PIP_SRC = os.environ.get("PIP_SRC")
-
-    # Service variant (lms, cms, etc.) configured with an environment variable
-    # We use this to determine which envs.json file to load.
-    SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
-
-    # If service variant not configured in env, then pass the correct
-    # environment for lms / cms
-    if not SERVICE_VARIANT:  # this will intentionally catch "";
-        if any(i in sys.argv[1:] for i in ('cms', 'studio')):
-            SERVICE_VARIANT = 'cms'
-        else:
-            SERVICE_VARIANT = 'lms'
-
-    @classmethod
-    def get_django_settings(cls, django_settings, system, settings=None, print_setting_args=None):
-        """
-        Interrogate Django environment for specific settings values
-        :param django_settings: list of django settings values to get
-        :param system: the django app to use when asking for the setting (lms | cms)
-        :param settings: the settings file to use when asking for the value
-        :param print_setting_args: the additional arguments to send to print_settings
-        :return: unicode value of the django setting
-        """
-        if not settings:
-            settings = os.environ.get("EDX_PLATFORM_SETTINGS", "aws")
-        log_dir = os.path.dirname(cls.PRINT_SETTINGS_LOG_FILE)
-        if not os.path.exists(log_dir):
-            os.makedirs(log_dir)
-        settings_length = len(django_settings)
-        django_settings = ' '.join(django_settings)  # parse_known_args makes a list again
-        print_setting_args = ' '.join(print_setting_args or [])
-        try:
-            value = sh(
-                django_cmd(
-                    system,
-                    settings,
-                    "print_setting {django_settings} 2>{log_file} {print_setting_args}".format(
-                        django_settings=django_settings,
-                        print_setting_args=print_setting_args,
-                        log_file=cls.PRINT_SETTINGS_LOG_FILE
-                    ).strip()
-                ),
-                capture=True
-            )
-            # else for cases where values are not found & sh returns one None value
-            return tuple(str(value).splitlines()) if value else tuple(None for _ in range(settings_length))
-        except BuildFailure:
-            print(f"Unable to print the value of the {django_settings} setting:")
-            with open(cls.PRINT_SETTINGS_LOG_FILE) as f:
-                print(f.read())
-            sys.exit(1)
-
-    @classmethod
-    def get_django_json_settings(cls, django_settings, system, settings=None):
-        """
-        Interrogate Django environment for specific settings value
-        :param django_settings: list of django settings values to get
-        :param system: the django app to use when asking for the setting (lms | cms)
-        :param settings: the settings file to use when asking for the value
-        :return: json string value of the django setting
-        """
-        return cls.get_django_settings(
-            django_settings,
-            system,
-            settings=settings,
-            print_setting_args=["--json"],
-        )
-
-    @classmethod
-    def covered_modules(cls):
-        """
-        List the source modules listed in .coveragerc for which coverage
-        will be measured.
-        """
-        coveragerc = configparser.RawConfigParser()
-        coveragerc.read(cls.PYTHON_COVERAGERC)
-        modules = coveragerc.get('run', 'source')
-        result = []
-        for module in modules.split('\n'):
-            module = module.strip()
-            if module:
-                result.append(module)
-        return result
-
-    @lazy
-    def env_tokens(self):
-        """
-        Return a dict of environment settings.
-        If we couldn't find the JSON file, issue a warning and return an empty dict.
-        """
-
-        # Find the env JSON file
-        if self.SERVICE_VARIANT:
-            env_path = self.REPO_ROOT.parent / f"{self.SERVICE_VARIANT}.env.json"
-        else:
-            env_path = path("env.json").abspath()
-
-        # If the file does not exist, here or one level up,
-        # issue a warning and return an empty dict
-        if not env_path.isfile():
-            env_path = env_path.parent.parent / env_path.basename()
-        if not env_path.isfile():
-            print(
-                "Warning: could not find environment JSON file "
-                "at '{path}'".format(path=env_path),
-                file=sys.stderr,
-            )
-            return {}
-
-        # Otherwise, load the file as JSON and return the resulting dict
-        try:
-            with open(env_path) as env_file:
-                return json.load(env_file)
-
-        except ValueError:
-            print(
-                "Error: Could not parse JSON "
-                "in {path}".format(path=env_path),
-                file=sys.stderr,
-            )
-            sys.exit(1)
-
-    @lazy
-    def feature_flags(self):
-        """
-        Return a dictionary of feature flags configured by the environment.
-        """
-        return self.env_tokens.get('FEATURES', {})
-
-    @classmethod
-    def rsync_dirs(cls):
-        """
-        List the directories that should be synced during pytest-xdist
-        execution.  Needs to include all modules for which coverage is
-        measured, not just the tests being run.
-        """
-        result = set()
-        for module in cls.covered_modules():
-            result.add(module.split('/')[0])
-        return result
diff --git a/pavelib/utils/process.py b/pavelib/utils/process.py
deleted file mode 100644
index da2dafa8803d..000000000000
--- a/pavelib/utils/process.py
+++ /dev/null
@@ -1,121 +0,0 @@
-"""
-Helper functions for managing processes.
-"""
-
-
-import atexit
-import os
-import signal
-import subprocess
-import sys
-
-import psutil
-from paver import tasks
-
-
-def kill_process(proc):
-    """
-    Kill the process `proc` created with `subprocess`.
-    """
-    p1_group = psutil.Process(proc.pid)
-    child_pids = p1_group.children(recursive=True)
-
-    for child_pid in child_pids:
-        os.kill(child_pid.pid, signal.SIGKILL)
-
-
-def run_multi_processes(cmd_list, out_log=None, err_log=None):
-    """
-    Run each shell command in `cmd_list` in a separate process,
-    piping stdout to `out_log` (a path) and stderr to `err_log` (also a path).
-
-    Terminates the processes on CTRL-C and ensures the processes are killed
-    if an error occurs.
-    """
-    kwargs = {'shell': True, 'cwd': None}
-    pids = []
-
-    if out_log:
-        out_log_file = open(out_log, 'w')  # lint-amnesty, pylint: disable=consider-using-with
-        kwargs['stdout'] = out_log_file
-
-    if err_log:
-        err_log_file = open(err_log, 'w')  # lint-amnesty, pylint: disable=consider-using-with
-        kwargs['stderr'] = err_log_file
-
-    # If the user is performing a dry run of a task, then just log
-    # the command strings and return so that no destructive operations
-    # are performed.
-    if tasks.environment.dry_run:
-        for cmd in cmd_list:
-            tasks.environment.info(cmd)
-        return
-
-    try:
-        for cmd in cmd_list:
-            pids.extend([subprocess.Popen(cmd, **kwargs)])
-
-        # pylint: disable=unused-argument
-        def _signal_handler(*args):
-            """
-            What to do when process is ended
-            """
-            print("\nEnding...")
-
-        signal.signal(signal.SIGINT, _signal_handler)
-        print("Enter CTL-C to end")
-        signal.pause()
-        print("Processes ending")
-
-    # pylint: disable=broad-except
-    except Exception as err:
-        print(f"Error running process {err}", file=sys.stderr)
-
-    finally:
-        for pid in pids:
-            kill_process(pid)
-
-
-def run_process(cmd, out_log=None, err_log=None):
-    """
-    Run the shell command `cmd` in a separate process,
-    piping stdout to `out_log` (a path) and stderr to `err_log` (also a path).
-
-    Terminates the process on CTRL-C or if an error occurs.
-    """
-    return run_multi_processes([cmd], out_log=out_log, err_log=err_log)
-
-
-def run_background_process(cmd, out_log=None, err_log=None, cwd=None):
-    """
-    Runs a command as a background process. Sends SIGINT at exit.
-    """
-
-    kwargs = {'shell': True, 'cwd': cwd}
-    if out_log:
-        out_log_file = open(out_log, 'w')  # lint-amnesty, pylint: disable=consider-using-with
-        kwargs['stdout'] = out_log_file
-
-    if err_log:
-        err_log_file = open(err_log, 'w')  # lint-amnesty, pylint: disable=consider-using-with
-        kwargs['stderr'] = err_log_file
-
-    proc = subprocess.Popen(cmd, **kwargs)  # lint-amnesty, pylint: disable=consider-using-with
-
-    def exit_handler():
-        """
-        Send SIGINT to the process's children. This is important
-        for running commands under coverage, as coverage will not
-        produce the correct artifacts if the child process isn't
-        killed properly.
-        """
-        p1_group = psutil.Process(proc.pid)
-        child_pids = p1_group.children(recursive=True)
-
-        for child_pid in child_pids:
-            os.kill(child_pid.pid, signal.SIGINT)
-
-        # Wait for process to actually finish
-        proc.wait()
-
-    atexit.register(exit_handler)
diff --git a/pavelib/utils/test/__init__.py b/pavelib/utils/test/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/pavelib/utils/test/suites/__init__.py b/pavelib/utils/test/suites/__init__.py
deleted file mode 100644
index 34ecd49c1c74..000000000000
--- a/pavelib/utils/test/suites/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""
-TestSuite class and subclasses
-"""
-from .js_suite import JestSnapshotTestSuite, JsTestSuite
-from .suite import TestSuite
diff --git a/pavelib/utils/test/suites/js_suite.py b/pavelib/utils/test/suites/js_suite.py
deleted file mode 100644
index 4e53d454fee5..000000000000
--- a/pavelib/utils/test/suites/js_suite.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""
-Javascript test tasks
-"""
-
-
-from paver import tasks
-
-from pavelib.utils.envs import Env
-from pavelib.utils.test import utils as test_utils
-from pavelib.utils.test.suites.suite import TestSuite
-
-__test__ = False  # do not collect
-
-
-class JsTestSuite(TestSuite):
-    """
-    A class for running JavaScript tests.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.run_under_coverage = kwargs.get('with_coverage', True)
-        self.mode = kwargs.get('mode', 'run')
-        self.report_dir = Env.JS_REPORT_DIR
-        self.opts = kwargs
-
-        suite = args[0]
-        self.subsuites = self._default_subsuites if suite == 'all' else [JsTestSubSuite(*args, **kwargs)]
-
-    def __enter__(self):
-        super().__enter__()
-        if tasks.environment.dry_run:
-            tasks.environment.info("make report_dir")
-        else:
-            self.report_dir.makedirs_p()
-        if not self.skip_clean:
-            test_utils.clean_test_files()
-
-        if self.mode == 'run' and not self.run_under_coverage:
-            test_utils.clean_dir(self.report_dir)
-
-    @property
-    def _default_subsuites(self):
-        """
-        Returns all JS test suites
-        """
-        return [JsTestSubSuite(test_id, **self.opts) for test_id in Env.JS_TEST_ID_KEYS if test_id != 'jest-snapshot']
-
-
-class JsTestSubSuite(TestSuite):
-    """
-    Class for JS suites like cms, cms-squire, lms, common,
-    common-requirejs and xmodule
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.test_id = args[0]
-        self.run_under_coverage = kwargs.get('with_coverage', True)
-        self.mode = kwargs.get('mode', 'run')
-        self.port = kwargs.get('port')
-        self.root = self.root + ' javascript'
-        self.report_dir = Env.JS_REPORT_DIR
-
-        try:
-            self.test_conf_file = Env.KARMA_CONFIG_FILES[Env.JS_TEST_ID_KEYS.index(self.test_id)]
-        except ValueError:
-            self.test_conf_file = Env.KARMA_CONFIG_FILES[0]
-
-        self.coverage_report = self.report_dir / f'coverage-{self.test_id}.xml'
-        self.xunit_report = self.report_dir / f'javascript_xunit-{self.test_id}.xml'
-
-    @property
-    def cmd(self):
-        """
-        Run the tests using karma runner.
-        """
-        cmd = [
-            "node",
-            "--max_old_space_size=4096",
-            "node_modules/.bin/karma",
-            "start",
-            self.test_conf_file,
-            "--single-run={}".format('false' if self.mode == 'dev' else 'true'),
-            "--capture-timeout=60000",
-            f"--junitreportpath={self.xunit_report}",
-            f"--browsers={Env.KARMA_BROWSER}",
-        ]
-
-        if self.port:
-            cmd.append(f"--port={self.port}")
-
-        if self.run_under_coverage:
-            cmd.extend([
-                "--coverage",
-                f"--coveragereportpath={self.coverage_report}",
-            ])
-
-        return cmd
-
-
-class JestSnapshotTestSuite(TestSuite):
-    """
-    A class for running Jest Snapshot tests.
-    """
-    @property
-    def cmd(self):
-        """
-        Run the tests using Jest.
-        """
-        return ["jest"]
diff --git a/pavelib/utils/test/suites/suite.py b/pavelib/utils/test/suites/suite.py
deleted file mode 100644
index 5a423c827c21..000000000000
--- a/pavelib/utils/test/suites/suite.py
+++ /dev/null
@@ -1,149 +0,0 @@
-"""
-A class used for defining and running test suites
-"""
-
-
-import os
-import subprocess
-import sys
-
-from paver import tasks
-
-from pavelib.utils.process import kill_process
-
-try:
-    from pygments.console import colorize
-except ImportError:
-    colorize = lambda color, text: text
-
-__test__ = False  # do not collect
-
-
-class TestSuite:
-    """
-    TestSuite is a class that defines how groups of tests run.
-    """
-    def __init__(self, *args, **kwargs):
-        self.root = args[0]
-        self.subsuites = kwargs.get('subsuites', [])
-        self.failed_suites = []
-        self.verbosity = int(kwargs.get('verbosity', 1))
-        self.skip_clean = kwargs.get('skip_clean', False)
-        self.passthrough_options = kwargs.get('passthrough_options', [])
-
-    def __enter__(self):
-        """
-        This will run before the test suite is run with the run_suite_tests method.
-        If self.run_test is called directly, it should be run in a 'with' block to
-        ensure that the proper context is created.
-
-        Specific setup tasks should be defined in each subsuite.
-
-        i.e. Checking for and defining required directories.
-        """
-        print(f"\nSetting up for {self.root}")
-        self.failed_suites = []
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        """
-        This is run after the tests run with the run_suite_tests method finish.
-        Specific clean up tasks should be defined in each subsuite.
-
-        If self.run_test is called directly, it should be run in a 'with' block
-        to ensure that clean up happens properly.
-
-        i.e. Cleaning mongo after the lms tests run.
-        """
-        print(f"\nCleaning up after {self.root}")
-
-    @property
-    def cmd(self):
-        """
-        The command to run tests (as a string). For this base class there is none.
-        """
-        return None
-
-    @staticmethod
-    def is_success(exit_code):
-        """
-        Determine if the given exit code represents a success of the test
-        suite.  By default, only a zero counts as a success.
-        """
-        return exit_code == 0
-
-    def run_test(self):
-        """
-        Runs a self.cmd in a subprocess and waits for it to finish.
-        It returns False if errors or failures occur. Otherwise, it
-        returns True.
-        """
-        cmd = " ".join(self.cmd)
-
-        if tasks.environment.dry_run:
-            tasks.environment.info(cmd)
-            return
-
-        sys.stdout.write(cmd)
-
-        msg = colorize(
-            'green',
-            '\n{bar}\n Running tests for {suite_name} \n{bar}\n'.format(suite_name=self.root, bar='=' * 40),
-        )
-
-        sys.stdout.write(msg)
-        sys.stdout.flush()
-
-        if 'TEST_SUITE' not in os.environ:
-            os.environ['TEST_SUITE'] = self.root.replace("/", "_")
-        kwargs = {'shell': True, 'cwd': None}
-        process = None
-
-        try:
-            process = subprocess.Popen(cmd, **kwargs)  # lint-amnesty, pylint: disable=consider-using-with
-            return self.is_success(process.wait())
-        except KeyboardInterrupt:
-            kill_process(process)
-            sys.exit(1)
-
-    def run_suite_tests(self):
-        """
-        Runs each of the suites in self.subsuites while tracking failures
-        """
-        # Uses __enter__ and __exit__ for context
-        with self:
-            # run the tests for this class, and for all subsuites
-            if self.cmd:
-                passed = self.run_test()
-                if not passed:
-                    self.failed_suites.append(self)
-
-            for suite in self.subsuites:
-                suite.run_suite_tests()
-                if suite.failed_suites:
-                    self.failed_suites.extend(suite.failed_suites)
-
-    def report_test_results(self):
-        """
-        Writes a list of failed_suites to sys.stderr
-        """
-        if self.failed_suites:
-            msg = colorize('red', "\n\n{bar}\nTests failed in the following suites:\n* ".format(bar="=" * 48))
-            msg += colorize('red', '\n* '.join([s.root for s in self.failed_suites]) + '\n\n')
-        else:
-            msg = colorize('green', "\n\n{bar}\nNo test failures ".format(bar="=" * 48))
-
-        print(msg)
-
-    def run(self):
-        """
-        Runs the tests in the suite while tracking and reporting failures.
-        """
-        self.run_suite_tests()
-
-        if tasks.environment.dry_run:
-            return
-
-        self.report_test_results()
-
-        if self.failed_suites:
-            sys.exit(1)
diff --git a/pavelib/utils/test/utils.py b/pavelib/utils/test/utils.py
deleted file mode 100644
index 0851251e2222..000000000000
--- a/pavelib/utils/test/utils.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""
-Helper functions for test tasks
-"""
-
-
-import os
-
-from paver.easy import cmdopts, sh, task
-
-from pavelib.utils.envs import Env
-from pavelib.utils.timer import timed
-
-
-MONGO_PORT_NUM = int(os.environ.get('EDXAPP_TEST_MONGO_PORT', '27017'))
-
-COVERAGE_CACHE_BUCKET = "edx-tools-coverage-caches"
-COVERAGE_CACHE_BASEPATH = "test_root/who_tests_what"
-COVERAGE_CACHE_BASELINE = "who_tests_what.{}.baseline".format(os.environ.get('WTW_CONTEXT', 'all'))
-WHO_TESTS_WHAT_DIFF = "who_tests_what.diff"
-
-
-__test__ = False  # do not collect
-
-
-@task
-@timed
-def clean_test_files():
-    """
-    Clean fixture files used by tests and .pyc files
-    """
-    sh("git clean -fqdx test_root/logs test_root/data test_root/staticfiles test_root/uploads")
-    # This find command removes all the *.pyc files that aren't in the .git
-    # directory.  See this blog post for more details:
-    # http://nedbatchelder.com/blog/201505/be_careful_deleting_files_around_git.html
-    sh(r"find . -name '.git' -prune -o -name '*.pyc' -exec rm {} \;")
-    sh("rm -rf test_root/log/auto_screenshots/*")
-    sh("rm -rf /tmp/mako_[cl]ms")
-
-
-@task
-@timed
-def ensure_clean_package_lock():
-    """
-    Ensure no untracked changes have been made in the current git context.
-    """
-    sh("""
-      git diff --name-only --exit-code package-lock.json ||
-      (echo \"Dirty package-lock.json, run 'npm install' and commit the generated changes\" && exit 1)
-    """)
-
-
-def clean_dir(directory):
-    """
-    Delete all the files from the specified directory.
-    """
-    # We delete the files but preserve the directory structure
-    # so that coverage.py has a place to put the reports.
-    sh(f'find {directory} -type f -delete')
-
-
-@task
-@cmdopts([
-    ('skip-clean', 'C', 'skip cleaning repository before running tests'),
-    ('skip_clean', None, 'deprecated in favor of skip-clean'),
-])
-@timed
-def clean_reports_dir(options):
-    """
-    Clean coverage files, to ensure that we don't use stale data to generate reports.
-    """
-    if getattr(options, 'skip_clean', False):
-        print('--skip-clean is set, skipping...')
-        return
-
-    # We delete the files but preserve the directory structure
-    # so that coverage.py has a place to put the reports.
-    reports_dir = Env.REPORT_DIR.makedirs_p()
-    clean_dir(reports_dir)
-
-
-@task
-@timed
-def clean_mongo():
-    """
-    Clean mongo test databases
-    """
-    sh("mongo {host}:{port} {repo_root}/scripts/delete-mongo-test-dbs.js".format(
-        host=Env.MONGO_HOST,
-        port=MONGO_PORT_NUM,
-        repo_root=Env.REPO_ROOT,
-    ))
diff --git a/pavelib/utils/timer.py b/pavelib/utils/timer.py
deleted file mode 100644
index fc6f3003736a..000000000000
--- a/pavelib/utils/timer.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""
-Tools for timing paver tasks
-"""
-
-
-import json
-import logging
-import os
-import sys
-import traceback
-from datetime import datetime
-from os.path import dirname, exists
-
-import wrapt
-
-LOGGER = logging.getLogger(__file__)
-PAVER_TIMER_LOG = os.environ.get('PAVER_TIMER_LOG')
-
-
-@wrapt.decorator
-def timed(wrapped, instance, args, kwargs):  # pylint: disable=unused-argument
-    """
-    Log execution time for a function to a log file.
-
-    Logging is only actually executed if the PAVER_TIMER_LOG environment variable
-    is set. That variable is expanded for the current user and current
-    environment variables. It also can have :meth:`~Datetime.strftime` format
-    identifiers which are substituted using the time when the task started.
-
-    For example, ``PAVER_TIMER_LOG='~/.paver.logs/%Y-%d-%m.log'`` will create a new
-    log file every day containing reconds for paver tasks run that day, and
-    will put those log files in the ``.paver.logs`` directory inside the users
-    home.
-
-    Must be earlier in the decorator stack than the paver task declaration.
-    """
-    start = datetime.utcnow()
-    exception_info = {}
-    try:
-        return wrapped(*args, **kwargs)
-    except Exception as exc:
-        exception_info = {
-            'exception': "".join(traceback.format_exception_only(type(exc), exc)).strip()
-        }
-        raise
-    finally:
-        end = datetime.utcnow()
-
-        # N.B. This is intended to provide a consistent interface and message format
-        # across all of Open edX tooling, so it deliberately eschews standard
-        # python logging infrastructure.
-        if PAVER_TIMER_LOG is not None:
-
-            log_path = start.strftime(PAVER_TIMER_LOG)
-
-            log_message = {
-                'python_version': sys.version,
-                'task': f"{wrapped.__module__}.{wrapped.__name__}",
-                'args': [repr(arg) for arg in args],
-                'kwargs': {key: repr(value) for key, value in kwargs.items()},
-                'started_at': start.isoformat(' '),
-                'ended_at': end.isoformat(' '),
-                'duration': (end - start).total_seconds(),
-            }
-            log_message.update(exception_info)
-
-            try:
-                log_dir = dirname(log_path)
-                if log_dir and not exists(log_dir):
-                    os.makedirs(log_dir)
-
-                with open(log_path, 'a') as outfile:
-                    json.dump(
-                        log_message,
-                        outfile,
-                        separators=(',', ':'),
-                        sort_keys=True,
-                    )
-                    outfile.write('\n')
-            except OSError:
-                # Squelch OSErrors, because we expect them and they shouldn't
-                # interrupt the rest of the process.
-                LOGGER.exception("Unable to write timing logs")
diff --git a/pavement.py b/pavement.py
deleted file mode 100644
index 41a6227dbfb5..000000000000
--- a/pavement.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import sys  # lint-amnesty, pylint: disable=django-not-configured, missing-module-docstring
-import os
-
-# Ensure that we can import pavelib, and that our copy of pavelib
-# takes precedence over anything else installed in the virtualenv.
-# In local dev, we usually don't need to do this, because Python
-# automatically puts the current working directory on the system path.
-# Until we re-run pip install, the other copies of edx-platform could
-# take precedence, leading to some strange results.
-sys.path.insert(0, os.path.dirname(__file__))
-
-from pavelib import *  # lint-amnesty, pylint: disable=wildcard-import, wrong-import-position
diff --git a/pylint_django_settings.py b/pylint_django_settings.py
index 75ceab2505f7..46abfd81f883 100644
--- a/pylint_django_settings.py
+++ b/pylint_django_settings.py
@@ -1,5 +1,3 @@
-from pylint.interfaces import IAstroidChecker
-from pylint.checkers import BaseChecker
 from pylint_django.checkers import ForeignKeyStringsChecker
 from pylint_plugin_utils import get_checker
 
@@ -8,52 +6,47 @@ class ArgumentCompatibilityError(Exception):
     pass
 
 
-class SetDjangoSettingsChecker(BaseChecker):
+def _get_django_settings_module(arguments):
     """
-    This isn't a checker, but setting django settings module when pylint command is ran.
-    This is to avoid 'django-not-configured' pylint warning
+    Determines the appropriate Django settings module based on the pylint command-line arguments.
+    It prevents the use of cms modules alongside lms or common modules.
 
+    :param arguments: List of command-line arguments passed to pylint
+    :return: A string representing the correct Django settings module ('cms.envs.test' or 'lms.envs.test')
+    :raises ArgumentCompatibilityError: If both cms and lms/common modules are present
     """
-    __implements__ = IAstroidChecker
-
-    name = 'set-django-settings'
-
-    msgs = {'R0991': ('bogus', 'bogus', 'bogus')}
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def open(self):
-        name_checker = get_checker(self.linter, ForeignKeyStringsChecker)
-        # pylint command should not run with modules from both cms and (lms, common) at once
-        cms_module = False
-        lms_module = False
-        common_module = False
-        arguments = self.linter.cmdline_parser.parse_args()[1]
-        for arg in arguments:
-            if arg.startswith('cms'):
-                cms_module = True
-            elif arg.startswith('lms'):
-                lms_module = True
-            elif arg.startswith('common'):
-                common_module = True
-
-        if cms_module and (lms_module or common_module):
-            # when cms module is present in pylint command, it can't be parired with (lms, common)
-            # as common and lms gives error with cms test settings
-            raise ArgumentCompatibilityError(
-                "Modules from both common and lms can't be paired with cms while running pylint"
-            )
-        elif cms_module:
-            # If a module from cms is present in pylint command arguments
-            # and ony other module from (openedx, pavelib) is present
-            # than test setting of cms is used
-            name_checker.config.django_settings_module = 'cms.envs.test'
-        else:
-            # If any module form (lms, common, openedx, pavelib) is present in
-            # pylint command arguments than test setting of lms is used
-            name_checker.config.django_settings_module = 'lms.envs.test'
+    cms_module, lms_module, common_module = False, False, False
+
+    for arg in arguments:
+        if arg.startswith("cms"):
+            cms_module = True
+        elif arg.startswith("lms"):
+            lms_module = True
+        elif arg.startswith("common"):
+            common_module = True
+
+    if cms_module and (lms_module or common_module):
+        # when cms module is present in pylint command, it can't be parired with (lms, common)
+        # as common and lms gives error with cms test settings
+        raise ArgumentCompatibilityError(
+            "Modules from both common and lms cannot be paired with cms when running pylint"
+        )
+
+    # Return the appropriate Django settings module based on the arguments
+    return "cms.envs.test" if cms_module else "lms.envs.test"
 
 
 def register(linter):
-    linter.register_checker(SetDjangoSettingsChecker(linter))
+    """
+    Placeholder function to register the plugin with pylint.
+    """
+    pass
+
+
+def load_configuration(linter):
+    """
+    Configures the Django settings module based on the command-line arguments passed to pylint.
+    """
+    name_checker = get_checker(linter, ForeignKeyStringsChecker)
+    arguments = linter.cmdline_parser.parse_args()[1]
+    name_checker.config.django_settings_module = _get_django_settings_module(arguments)
diff --git a/pylintrc b/pylintrc
index 96b657e46eea..55a9bbab3b9c 100644
--- a/pylintrc
+++ b/pylintrc
@@ -64,12 +64,12 @@
 # SERIOUSLY.
 #
 # ------------------------------
-# Generated by edx-lint version: 5.3.0
+# Generated by edx-lint version: 5.3.7
 # ------------------------------
 [MASTER]
 ignore = ,.git,.tox,migrations,node_modules,.pycharm_helpers
 persistent = yes
-load-plugins = edx_lint.pylint,pylint_django,pylint_celery,pylint_pytest
+load-plugins = edx_lint.pylint,pylint_django_settings,pylint_django,pylint_celery,pylint_pytest
 
 [MESSAGES CONTROL]
 enable =
@@ -259,6 +259,7 @@ enable =
 	useless-suppression,
 disable =
 	bad-indentation,
+	broad-exception-raised,
 	consider-using-f-string,
 	duplicate-code,
 	file-ignored,
@@ -407,6 +408,6 @@ ext-import-graph =
 int-import-graph =
 
 [EXCEPTIONS]
-overgeneral-exceptions = Exception
+overgeneral-exceptions = builtins.Exception
 
-# 567bf30b121db79bc07a7028651f7efa0724e8a4
+# e624ea03d8124aa9cf2e577f830632344a0a07d9
diff --git a/pylintrc_tweaks b/pylintrc_tweaks
index 7911c08af9b2..1633da5c10a4 100644
--- a/pylintrc_tweaks
+++ b/pylintrc_tweaks
@@ -1,7 +1,7 @@
 # pylintrc tweaks for use with edx_lint.
 [MASTER]
 ignore+ = ,.git,.tox,migrations,node_modules,.pycharm_helpers
-load-plugins = edx_lint.pylint,pylint_django,pylint_celery,pylint_pytest
+load-plugins = edx_lint.pylint,pylint_django_settings,pylint_django,pylint_celery,pylint_pytest
 
 [MESSAGES CONTROL]
 disable+ =
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 0a17d4674bad..000000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-attr==0.3.2
-build==0.9.0
-click==8.1.3
-importlib==1.0.4
-importlib-resources==5.10.0
-packaging==21.3
-pep517==0.13.0
-pip-tools==6.9.0
-pyparsing==3.0.9
-tomli==2.0.1
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
index f2ef0216ca07..f3cc8fc9c9e8 100644
--- a/requirements/common_constraints.txt
+++ b/requirements/common_constraints.txt
@@ -15,7 +15,6 @@
 # Note: Changes to this file will automatically be used by other repos, referencing
 #  this file from Github directly. It does not require packaging in edx-lint.
 
-
 # using LTS django version
 Django<5.0
 
@@ -26,9 +25,10 @@ elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 
-# Cause: https://github.com/openedx/event-tracking/pull/290
-# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
-# We will pin event-tracking to do not break existing installations
-# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
-# has been resolved and edx-platform is running with pymongo>=4.4.0
+# Cause: https://github.com/openedx/edx-lint/issues/458
+# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
+pip<24.3
 
+# Cause: https://github.com/openedx/edx-lint/issues/475
+# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
+urllib3<2.3.0
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index e930233e11cb..79e55d633c7d 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -7,7 +7,8 @@
 # link to other information that will help people in the future to remove the
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
-
+# For further details on how to properly write constraints here please consult
+# https://openedx.atlassian.net/wiki/spaces/COMM/pages/4400250883/Adding+pinned+dependencies+in+constraint+file
 
 # This file contains all common constraints for edx-repos
 -c common_constraints.txt
@@ -18,127 +19,173 @@
 # Ticket: https://github.com/openedx/edx-platform/issues/35334
 algoliasearch<4.0.0
 
+
+# Date: 2020-02-26
 # As it is not clarified what exact breaking changes will be introduced as per
 # the next major release, ensure the installed version is within boundaries.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35280
 celery>=5.2.2,<6.0.0
 
+# Date: 2021-05-17
+# greater version breaking upgrade builds
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35279
+click==8.1.6
 
-# 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.25.2
+# Date: 2022-07-20
+# edx-enterprise, snowflake-connector-python require charset-normalizer==2.0.0
+# Can be removed once snowflake-connector-python>2.7.9 is released with the fix.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35278
+charset-normalizer<2.1.0
 
+# Date: 2024-02-02
 # Stay on LTS version, remove once this is added to common constraint
 Django<5.0
 
+# Date: 2020-02-10
 # django-oauth-toolkit version >=2.0.0 has breaking changes. More details
 # mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35277
 django-oauth-toolkit==1.7.1
 
+# Date: 2024-02-02
 # incremental upgrade
 django-simple-history==3.4.0
 
-# Adding pin to avoid any major upgrade
-pymongo<4.4.1
-
-# To override the constraint of edx-lint
-# This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved
-# and the upstream constraint in edx-lint has been removed.
-event-tracking==3.0.0
-
+# Date: 2021-05-17
 # greater version has breaking changes and requires some migration steps.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35276
 django-webpack-loader==0.7.0
 
-# At the time of writing this comment, we do not know whether py2neo>=2022
-# will support our currently-deployed Neo4j version (3.5).
-# Feel free to loosen this constraint if/when it is confirmed that a later
-# version of py2neo will work with Neo4j 3.5.
-py2neo<2022
-
-# edx-enterprise, snowflake-connector-python require charset-normalizer==2.0.0
-# Can be removed once snowflake-connector-python>2.7.9 is released with the fix.
-charset-normalizer<2.1.0
-
-# markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail
-# pinning the version untill the issue gets resolved in the package itself
-markdown<3.4.0
-
-# pycodestyle==2.9.0 generates false positive error E275.
-# Constraint can be removed once the issue https://github.com/PyCQA/pycodestyle/issues/1090 is fixed.
-pycodestyle<2.9.0
+# Date: 2023-06-20
+# Adding pin to avoid any major upgrade
+djangorestframework<3.15.0
 
-pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
+# Date: 2024-07-19
+# Generally speaking, the major version of django-stubs must either match the major version
+# of django, or exceed it by 1. So, we will need to perpetually constrain django-stubs and
+# update it as we perform django upgrades. For more details, see:
+# https://github.com/typeddjango/django-stubs?tab=readme-ov-file#version-compatibility
+# including the note on "Partial Support".
+# Issue: https://github.com/openedx/edx-platform/issues/35275
+django-stubs<6
 
-# urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages
-# which require urllib3<2 for now.
-# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
-urllib3<2.0.0
+# Date: 2024-07-23
+# django-storages==1.14.4 breaks course imports
+# Two lines were added in 1.14.4 that make file_exists_in_storage function always return False,
+# as the default value of AWS_S3_FILE_OVERWRITE is True
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35170
+django-storages<1.14.4
 
+# Date: 2019-08-16
+# 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==5.5.2
 
-# Adding pin to avoid any major upgrade
-djangorestframework<3.15.0
+# Date: 2024-05-09
+# This has to be constrained as well because newer versions of edx-i18n-tools need the
+# newer version of lxml but that requirement was not made expilict in the 1.6.0 version
+# of the package.  This can be un-pinned when we're upgrading lxml.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35274
+edx-i18n-tools<1.6.0
 
-# The version of django-stubs we can use depends on which Django release we're using
-# 1.16.0 works with Django 3.2 through 4.1
-django-stubs==1.16.0
-djangorestframework-stubs==3.14.0  # Pinned to match django-stubs. Remove this when we can remove the above pin.
+# Date: 2024-07-26
+# To override the constraint of edx-lint
+# This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved
+# and the upstream constraint in edx-lint has been removed.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35273
+event-tracking==3.0.0
 
+# Date: 2023-07-26
 # Our legacy Sass code is incompatible with anything except this ancient libsass version.
 # Here is a ticket to upgrade, but it's of debatable importance given that we are rapidly moving
 # away from legacy LMS/CMS frontends:
 # https://github.com/openedx/edx-platform/issues/31616
 libsass==0.10.0
 
-# greater version breaking upgrade builds
-click==8.1.6
+# Date: 2018-12-14
+# markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail
+# pinning the version untill the issue gets resolved in the package itself
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35271
+markdown<3.4.0
 
-# pinning this version to avoid updates while the library is being developed
-openedx-learning==0.11.2
+# Date: 2024-04-24
+# moto==5.0 contains breaking changes. Needs to be updated separately.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35270
+moto<5.0
 
-# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
-openai<=0.28.1
+# Date: 2024-07-16
+# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
+# Otherwise we see a failure while running the following command:
+# export DJANGO_SETTINGS_MODULE=cms.envs.test; python manage.py cms check_reserved_keywords --override_file db_keyword_overrides.yml --report_path reports/reserved_keywords --report_file cms_reserved_keyword_report.csv
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35126
+numpy<2.0.0
 
+# Date: 2024-01-26
 # optimizely-sdk 5.0.0 is breaking following test with segmentation fault
 # common/djangoapps/third_party_auth/tests/test_views.py::SAMLMetadataTest::test_secure_key_configuration
 # needs to be fixed in the follow up issue
-# https://github.com/openedx/edx-platform/issues/34103
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/34103
 optimizely-sdk<5.0
 
-# lxml>=5.0 introduced breaking changes related to system dependencies
-# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean]
-# This constraint can be removed once we upgrade to Python 3.11
-lxml<5.0
-# This has to be constrained as well because newer versions of edx-i18n-tools need the
-# newer version of lxml but that requirement was not made expilict in the 1.6.0 version
-# of the package.  This can be un-pinned when we're upgrading lxml.
-edx-i18n-tools<1.6.0
-
-# xmlsec==1.3.14 breaking tests for all builds, can be removed once a fix is available
-xmlsec<1.3.14
+# Date: 2023-09-18
+# pinning this version to avoid updates while the library is being developed
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35269
+openedx-learning==0.18.1
 
-# moto==5.0 contains breaking changes. Needs to be updated separately.
-moto<5.0
+# Date: 2023-11-29
+# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35268
+openai<=0.28.1
 
+# Date: 2024-04-26
 # path==16.12.0 breaks the unit test collections check
 # needs to be investigated and fixed separately
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35267
 path<16.12.0
 
-# Temporary to Support the python 3.11 Upgrade
-backports.zoneinfo;python_version<"3.9"  # Newer versions have zoneinfo available in the standard library
+# Date: 2022-08-03
+# pycodestyle==2.9.0 generates false positive error E275.
+# Constraint can be removed once the issue https://github.com/PyCQA/pycodestyle/issues/1090 is fixed.
+pycodestyle<2.9.0
 
-# Relevant GitHub Issue:  https://github.com/openedx/edx-platform/issues/35126
-# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
-# Otherwise we see a failure while running the following command:
-# export DJANGO_SETTINGS_MODULE=cms.envs.test; python manage.py cms check_reserved_keywords --override_file db_keyword_overrides.yml --report_path reports/reserved_keywords --report_file cms_reserved_keyword_report.csv
-numpy<2.0.0
+# Date: 2021-07-12
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/33560
+pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
+astroid<2.14.0
 
-# django-storages==1.14.4 breaks course imports
-# Two lines were added in 1.14.4 that make file_exists_in_storage function always return False,
-# as the default value of AWS_S3_FILE_OVERWRITE is True
-django-storages<1.14.4
+# Date: 2021-08-25
+# At the time of writing this comment, we do not know whether py2neo>=2022
+# will support our currently-deployed Neo4j version (3.5).
+# Feel free to loosen this constraint if/when it is confirmed that a later
+# version of py2neo will work with Neo4j 3.5.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35266
+py2neo<2022
+
+# Date: 2020-04-08
+# Adding pin to avoid any major upgrade
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35265
+pymongo<4.4.1
 
+# Date: 2024-08-06
 # social-auth-app-django 5.4.2 introduces a new migration that will not play nicely with large installations. This will touch
 # user tables, which are quite large, especially on instances like edx.org.
 # We are pinning this until after all the smaller migrations get handled and then we can migrate this all at once.
-# Ticket to unpin: https://github.com/edx/edx-arch-experiments/issues/760
+# Issue for unpinning: https://github.com/edx/edx-arch-experiments/issues/760
 social-auth-app-django<=5.4.1
+
+# # Date: 2024-10-14
+# # The edx-enterprise is currently using edx-rest-api-client==5.7.1, which needs to be updated first.
+# edx-rest-api-client==5.7.1
+
+# Date 2025-01-08
+# elasticsearch==7.13.x is downgrading urllib3 from 2.2.3 to 1.26.20
+# https://github.com/elastic/elasticsearch-py/blob/v7.13.4/setup.py#L42
+# We are pinning this until we can upgrade to a version of elasticsearch that uses a more recent version of urllib3.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35126
+elasticsearch==7.9.1
+
+# Date 2025-01-10
+# Cause: https://github.com/openedx/edx-platform/issues/36095
+# Issue for unpinning https://github.com/openedx/edx-platform/issues/36096
+lti-consumer-xblock==9.12.1
diff --git a/requirements/edx-sandbox/README.rst b/requirements/edx-sandbox/README.rst
index 51dd7488444e..4d628f3e2add 100644
--- a/requirements/edx-sandbox/README.rst
+++ b/requirements/edx-sandbox/README.rst
@@ -55,7 +55,7 @@ releases/quince.txt
 * Supports only Python 3.8
 
 releases/redwood.txt
-----------------------------------
+--------------------
 
 * Frozen at the time of the Redwood release
 * Supports Python 3.8 and Python 3.11
@@ -64,8 +64,8 @@ releases/redwood.txt
   (`NumPy changelog`_)
 * These upgrades prepare edx-sandbox for the Python 3.12 update in Sumac.
 
-releases/sumac.txt (FUTURE PLAN)
---------------------------------
+releases/sumac.txt
+------------------
 
 * Frozen at the time of the Sumac release
 * BREAKING CHANGE: Drops support for Python 3.8 (`Python changelog`_)
diff --git a/requirements/edx-sandbox/base.in b/requirements/edx-sandbox/base.in
index 4c1a61bc2723..0c331ce95d62 100644
--- a/requirements/edx-sandbox/base.in
+++ b/requirements/edx-sandbox/base.in
@@ -2,7 +2,7 @@
 
 chem                                # A helper library for chemistry calculations
 cryptography                        # Implementations of assorted cryptography algorithms
-lxml                                # XML parser
+lxml[html_clean]                    # XML parser
 matplotlib                          # 2D plotting library
 networkx                            # Utilities for creating, manipulating, and studying network graphs
 nltk                                # Natural language processing; used by the chem package
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
index 4a7b0c0a7d35..1bd3d149f487 100644
--- a/requirements/edx-sandbox/base.txt
+++ b/requirements/edx-sandbox/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cffi==1.17.0
+cffi==1.17.1
     # via cryptography
 chem==1.3.0
     # via -r requirements/edx-sandbox/base.in
@@ -14,32 +14,34 @@ click==8.1.6
     #   nltk
 codejail-includes==1.0.0
     # via -r requirements/edx-sandbox/base.in
-contourpy==1.2.1
+contourpy==1.3.1
     # via matplotlib
-cryptography==43.0.0
+cryptography==44.0.0
     # via -r requirements/edx-sandbox/base.in
 cycler==0.12.1
     # via matplotlib
-fonttools==4.53.1
+fonttools==4.55.3
     # via matplotlib
 joblib==1.4.2
     # via nltk
-kiwisolver==1.4.5
+kiwisolver==1.4.8
     # via matplotlib
-lxml==4.9.4
+lxml[html-clean,html_clean]==5.3.0
     # via
-    #   -c requirements/edx-sandbox/../constraints.txt
     #   -r requirements/edx-sandbox/base.in
+    #   lxml-html-clean
     #   openedx-calc
-markupsafe==2.1.5
+lxml-html-clean==0.4.1
+    # via lxml
+markupsafe==3.0.2
     # via
     #   chem
     #   openedx-calc
-matplotlib==3.9.2
+matplotlib==3.10.0
     # via -r requirements/edx-sandbox/base.in
 mpmath==1.3.0
     # via sympy
-networkx==3.3
+networkx==3.4.2
     # via -r requirements/edx-sandbox/base.in
 nltk==3.9.1
     # via
@@ -53,15 +55,15 @@ numpy==1.26.4
     #   matplotlib
     #   openedx-calc
     #   scipy
-openedx-calc==3.1.0
+openedx-calc==4.0.1
     # via -r requirements/edx-sandbox/base.in
-packaging==24.1
+packaging==24.2
     # via matplotlib
-pillow==10.4.0
+pillow==11.1.0
     # via matplotlib
 pycparser==2.22
     # via cffi
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via
     #   -r requirements/edx-sandbox/base.in
     #   chem
@@ -71,20 +73,20 @@ python-dateutil==2.9.0.post0
     # via matplotlib
 random2==1.0.2
     # via -r requirements/edx-sandbox/base.in
-regex==2024.7.24
+regex==2024.11.6
     # via nltk
-scipy==1.14.0
+scipy==1.15.0
     # via
     #   -r requirements/edx-sandbox/base.in
     #   chem
     #   openedx-calc
-six==1.16.0
+six==1.17.0
     # via
     #   codejail-includes
     #   python-dateutil
-sympy==1.13.2
+sympy==1.13.3
     # via
     #   -r requirements/edx-sandbox/base.in
     #   openedx-calc
-tqdm==4.66.5
+tqdm==4.67.1
     # via nltk
diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt
deleted file mode 100644
index 5164c3975a12..000000000000
--- a/requirements/edx-sandbox/py38.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is a temporary compatibility wrapper around quince.txt.
-# It will be removed before Sumac.
-
--r releases/quince.txt
diff --git a/requirements/edx-sandbox/releases/quince.txt b/requirements/edx-sandbox/releases/quince.txt
index c8b5cff8816e..270a6b4f0a90 100644
--- a/requirements/edx-sandbox/releases/quince.txt
+++ b/requirements/edx-sandbox/releases/quince.txt
@@ -56,7 +56,7 @@ numpy==1.22.4
     #   matplotlib
     #   openedx-calc
     #   scipy
-openedx-calc==3.1.0
+openedx-calc==3.1.2
     # via -r requirements/edx-sandbox/base.in
 packaging==23.2
     # via matplotlib
diff --git a/requirements/edx-sandbox/releases/redwood.txt b/requirements/edx-sandbox/releases/redwood.txt
index d12c994fd206..432985e40905 100644
--- a/requirements/edx-sandbox/releases/redwood.txt
+++ b/requirements/edx-sandbox/releases/redwood.txt
@@ -54,7 +54,7 @@ numpy==1.24.4
     #   matplotlib
     #   openedx-calc
     #   scipy
-openedx-calc==3.1.0
+openedx-calc==3.1.2
     # via -r requirements/edx-sandbox/base.in
 packaging==24.0
     # via matplotlib
diff --git a/requirements/edx-sandbox/releases/sumac.txt b/requirements/edx-sandbox/releases/sumac.txt
new file mode 100644
index 000000000000..991ea0efcf6a
--- /dev/null
+++ b/requirements/edx-sandbox/releases/sumac.txt
@@ -0,0 +1,90 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    make upgrade
+#
+cffi==1.17.1
+    # via cryptography
+chem==1.3.0
+    # via -r requirements/edx-sandbox/base.in
+click==8.1.6
+    # via
+    #   -c requirements/edx-sandbox/../constraints.txt
+    #   nltk
+codejail-includes==1.0.0
+    # via -r requirements/edx-sandbox/base.in
+contourpy==1.3.0
+    # via matplotlib
+cryptography==43.0.3
+    # via -r requirements/edx-sandbox/base.in
+cycler==0.12.1
+    # via matplotlib
+fonttools==4.54.1
+    # via matplotlib
+joblib==1.4.2
+    # via nltk
+kiwisolver==1.4.7
+    # via matplotlib
+lxml==4.9.4
+    # via
+    #   -c requirements/edx-sandbox/../constraints.txt
+    #   -r requirements/edx-sandbox/base.in
+    #   openedx-calc
+markupsafe==3.0.2
+    # via
+    #   chem
+    #   openedx-calc
+matplotlib==3.9.2
+    # via -r requirements/edx-sandbox/base.in
+mpmath==1.3.0
+    # via sympy
+networkx==3.4.2
+    # via -r requirements/edx-sandbox/base.in
+nltk==3.9.1
+    # via
+    #   -r requirements/edx-sandbox/base.in
+    #   chem
+numpy==1.26.4
+    # via
+    #   -c requirements/edx-sandbox/../constraints.txt
+    #   chem
+    #   contourpy
+    #   matplotlib
+    #   openedx-calc
+    #   scipy
+openedx-calc==3.1.2
+    # via -r requirements/edx-sandbox/base.in
+packaging==24.1
+    # via matplotlib
+pillow==11.0.0
+    # via matplotlib
+pycparser==2.22
+    # via cffi
+pyparsing==3.2.0
+    # via
+    #   -r requirements/edx-sandbox/base.in
+    #   chem
+    #   matplotlib
+    #   openedx-calc
+python-dateutil==2.9.0.post0
+    # via matplotlib
+random2==1.0.2
+    # via -r requirements/edx-sandbox/base.in
+regex==2024.9.11
+    # via nltk
+scipy==1.14.1
+    # via
+    #   -r requirements/edx-sandbox/base.in
+    #   chem
+    #   openedx-calc
+six==1.16.0
+    # via
+    #   codejail-includes
+    #   python-dateutil
+sympy==1.13.3
+    # via
+    #   -r requirements/edx-sandbox/base.in
+    #   openedx-calc
+tqdm==4.66.5
+    # via nltk
diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt
index 6c3e1a41515c..15c38017919c 100644
--- a/requirements/edx/assets.txt
+++ b/requirements/edx/assets.txt
@@ -14,5 +14,5 @@ libsass==0.10.0
     #   -r requirements/edx/assets.in
 nodeenv==1.9.1
     # via -r requirements/edx/assets.in
-six==1.16.0
+six==1.17.0
     # via libsass
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index fca1ed211bda..d73ac89b2a0a 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -6,21 +6,21 @@
 #
 -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack
     # via -r requirements/edx/github.in
-acid-xblock==0.3.1
+acid-xblock==0.4.1
     # via -r requirements/edx/kernel.in
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.4
     # via aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.11
     # via
     #   geoip2
     #   openai
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via aiohttp
 algoliasearch==3.0.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
-amqp==5.2.0
+amqp==5.3.1
     # via kombu
 analytics-python==1.4.post1
     # via -r requirements/edx/kernel.in
@@ -37,7 +37,7 @@ asgiref==3.8.1
     #   django-countries
 asn1crypto==1.5.1
     # via snowflake-connector-python
-attrs==24.2.0
+attrs==24.3.0
     # via
     #   -r requirements/edx/kernel.in
     #   aiohttp
@@ -54,13 +54,15 @@ babel==2.16.0
     #   enmerkar-underscore
 backoff==1.10.0
     # via analytics-python
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via paramiko
 beautifulsoup4==4.12.3
-    # via pynliner
-billiard==4.2.0
+    # via
+    #   openedx-forum
+    #   pynliner
+billiard==4.2.1
     # via celery
-bleach[css]==6.1.0
+bleach[css]==6.2.0
     # via
     #   edx-enterprise
     #   lti-consumer-xblock
@@ -70,24 +72,24 @@ bleach[css]==6.1.0
     #   xblock-poll
 boto==2.49.0
     # via -r requirements/edx/kernel.in
-boto3==1.35.1
+boto3==1.35.93
     # via
     #   -r requirements/edx/kernel.in
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.35.1
+botocore==1.35.93
     # via
     #   -r requirements/edx/kernel.in
     #   boto3
     #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/kernel.in
-cachecontrol==0.14.0
+cachecontrol==0.14.1
     # via firebase-admin
 cachetools==5.5.0
     # via google-auth
-camel-converter[pydantic]==3.1.2
+camel-converter[pydantic]==4.0.1
     # via meilisearch
 celery==5.4.0
     # via
@@ -99,14 +101,13 @@ celery==5.4.0
     #   edx-enterprise
     #   event-tracking
     #   openedx-learning
-certifi==2024.7.4
+certifi==2024.12.14
     # via
-    #   -r requirements/edx/paver.txt
     #   elasticsearch
     #   py2neo
     #   requests
     #   snowflake-connector-python
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
@@ -116,7 +117,6 @@ chardet==5.2.0
 charset-normalizer==2.0.12
     # via
     #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/paver.txt
     #   requests
     #   snowflake-connector-python
 chem==1.3.0
@@ -138,15 +138,15 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-code-annotations==1.8.0
+code-annotations==2.1.0
     # via
     #   edx-enterprise
     #   edx-toggles
 codejail-includes==1.0.0
     # via -r requirements/edx/kernel.in
-crowdsourcehinter-xblock==0.7
+crowdsourcehinter-xblock==0.8
     # via -r requirements/edx/bundled.in
-cryptography==42.0.8
+cryptography==44.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   django-fernet-fields-v2
@@ -168,7 +168,7 @@ defusedxml==0.7.1
     #   ora2
     #   python3-openid
     #   social-auth-core
-django==4.2.15
+django==4.2.17
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -234,6 +234,7 @@ django==4.2.15
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   social-auth-app-django
@@ -242,7 +243,7 @@ django==4.2.15
     #   xss-utils
 django-appconf==1.0.6
     # via django-statici18n
-django-cache-memoize==0.2.0
+django-cache-memoize==0.2.1
     # via edx-enterprise
 django-celery-results==2.5.1
     # via -r requirements/edx/kernel.in
@@ -254,7 +255,7 @@ django-config-models==2.7.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.4.0
+django-cors-headers==4.6.0
     # via -r requirements/edx/kernel.in
 django-countries==7.6.1
     # via
@@ -281,11 +282,11 @@ django-ipware==7.0.1
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-proctoring
-django-js-asset==2.2.0
+django-js-asset==3.0.1
     # via django-mptt
 django-method-override==1.0.4
     # via -r requirements/edx/kernel.in
-django-model-utils==4.5.1
+django-model-utils==5.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   django-user-tasks
@@ -309,16 +310,16 @@ django-mptt==0.16.0
     #   openedx-django-wiki
 django-multi-email-field==0.7.0
     # via edx-enterprise
-django-mysql==4.14.0
+django-mysql==4.15.0
     # via -r requirements/edx/kernel.in
 django-oauth-toolkit==1.7.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
-django-object-actions==4.2.0
+django-object-actions==4.3.0
     # via edx-enterprise
-django-pipeline==3.1.0
+django-pipeline==4.0.0
     # via -r requirements/edx/kernel.in
 django-push-notifications==3.1.0
     # via edx-ace
@@ -328,7 +329,7 @@ django-sekizai==4.1.0
     # via
     #   -r requirements/edx/kernel.in
     #   openedx-django-wiki
-django-ses==4.1.0
+django-ses==4.3.1
     # via -r requirements/edx/bundled.in
 django-simple-history==3.4.0
     # via
@@ -339,12 +340,13 @@ django-simple-history==3.4.0
     #   edx-organizations
     #   edx-proctoring
     #   ora2
-django-statici18n==2.5.0
+django-statici18n==2.6.0
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
+    #   xblocks-contrib
 django-storages==1.14.3
     # via
     #   -c requirements/edx/../constraints.txt
@@ -352,7 +354,7 @@ django-storages==1.14.3
     #   edxval
 django-user-tasks==3.2.0
     # via -r requirements/edx/kernel.in
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-django-utils
@@ -382,32 +384,31 @@ djangorestframework==3.14.0
     #   edx-organizations
     #   edx-proctoring
     #   edx-submissions
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
     # via edx-enterprise
-dnspython==2.6.1
-    # via
-    #   -r requirements/edx/paver.txt
-    #   pymongo
-done-xblock==2.3.0
+dnspython==2.7.0
+    # via pymongo
+done-xblock==2.4.0
     # via -r requirements/edx/bundled.in
 drf-jwt==1.19.2
     # via edx-drf-extensions
-drf-spectacular==0.27.2
+drf-spectacular==0.28.0
     # via -r requirements/edx/kernel.in
-drf-yasg==1.21.7
+drf-yasg==1.21.8
     # via
     #   django-user-tasks
     #   edx-api-doc-tools
-edx-ace==1.11.1
+edx-ace==1.11.3
     # via -r requirements/edx/kernel.in
-edx-api-doc-tools==1.8.0
+edx-api-doc-tools==2.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-name-affirmation
-edx-auth-backends==4.3.0
+edx-auth-backends==4.4.0
     # via -r requirements/edx/kernel.in
 edx-braze-client==0.2.5
     # via
@@ -417,7 +418,7 @@ edx-bulk-grades==1.1.0
     # via
     #   -r requirements/edx/kernel.in
     #   staff-graded-xblock
-edx-ccx-keys==1.3.0
+edx-ccx-keys==2.0.2
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
@@ -427,9 +428,9 @@ edx-celeryutils==1.3.0
     #   -r requirements/edx/kernel.in
     #   edx-name-affirmation
     #   super-csv
-edx-codejail==3.4.1
+edx-codejail==3.5.2
     # via -r requirements/edx/kernel.in
-edx-completion==4.6.7
+edx-completion==4.7.8
     # via -r requirements/edx/kernel.in
 edx-django-release-util==1.4.0
     # via
@@ -438,7 +439,7 @@ edx-django-release-util==1.4.0
     #   edxval
 edx-django-sites-extensions==4.2.0
     # via -r requirements/edx/kernel.in
-edx-django-utils==5.15.0
+edx-django-utils==7.1.0
     # via
     #   -r requirements/edx/kernel.in
     #   django-config-models
@@ -455,7 +456,7 @@ edx-django-utils==5.15.0
     #   openedx-events
     #   ora2
     #   super-csv
-edx-drf-extensions==10.3.0
+edx-drf-extensions==10.5.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-completion
@@ -467,27 +468,27 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.2
+edx-enterprise==5.5.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
-edx-event-bus-kafka==5.8.1
+edx-event-bus-kafka==6.0.0
     # via -r requirements/edx/kernel.in
-edx-event-bus-redis==0.5.0
+edx-event-bus-redis==0.5.1
     # via -r requirements/edx/kernel.in
 edx-i18n-tools==1.5.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
     #   ora2
+    #   xblocks-contrib
 edx-milestones==0.6.0
     # via -r requirements/edx/kernel.in
-edx-name-affirmation==2.3.7
+edx-name-affirmation==3.0.1
     # via -r requirements/edx/kernel.in
-edx-opaque-keys[django]==2.10.0
+edx-opaque-keys[django]==2.11.0
     # via
     #   -r requirements/edx/kernel.in
-    #   -r requirements/edx/paver.txt
     #   edx-bulk-grades
     #   edx-ccx-keys
     #   edx-completion
@@ -502,22 +503,24 @@ edx-opaque-keys[django]==2.10.0
     #   ora2
 edx-organizations==6.13.0
     # via -r requirements/edx/kernel.in
-edx-proctoring==4.18.1
+edx-proctoring==5.0.1
     # via
     #   -r requirements/edx/kernel.in
     #   edx-proctoring-proctortrack
-edx-rbac==1.9.0
+edx-rbac==1.10.0
     # via edx-enterprise
-edx-rest-api-client==5.7.1
+edx-rest-api-client==6.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.0.0
-    # via -r requirements/edx/kernel.in
+edx-search==4.1.1
+    # via
+    #   -r requirements/edx/kernel.in
+    #   openedx-forum
 edx-sga==0.25.0
     # via -r requirements/edx/bundled.in
-edx-submissions==3.7.7
+edx-submissions==3.8.4
     # via
     #   -r requirements/edx/kernel.in
     #   ora2
@@ -541,12 +544,14 @@ edx-when==2.5.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-proctoring
-edxval==2.5.0
+edxval==2.8.0
     # via -r requirements/edx/kernel.in
-elasticsearch==7.13.4
+elasticsearch==7.9.1
     # via
     #   -c requirements/edx/../common_constraints.txt
+    #   -c requirements/edx/../constraints.txt
     #   edx-search
+    #   openedx-forum
 enmerkar==0.7.1
     # via enmerkar-underscore
 enmerkar-underscore==2.3.1
@@ -558,13 +563,13 @@ event-tracking==3.0.0
     #   edx-completion
     #   edx-proctoring
     #   edx-search
-fastavro==1.9.5
+fastavro==1.10.0
     # via openedx-events
-filelock==3.15.4
+filelock==3.16.1
     # via snowflake-connector-python
-firebase-admin==6.5.0
+firebase-admin==6.6.0
     # via edx-ace
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   aiohttp
     #   aiosignal
@@ -580,20 +585,20 @@ fs-s3fs==0.1.8
     #   openedx-django-pyfs
 future==1.0.0
     # via pyjwkest
-geoip2==4.8.0
+geoip2==4.8.1
     # via -r requirements/edx/kernel.in
 glob2==0.7
     # via -r requirements/edx/kernel.in
-google-api-core[grpc]==2.19.1
+google-api-core[grpc]==2.24.0
     # via
     #   firebase-admin
     #   google-api-python-client
     #   google-cloud-core
     #   google-cloud-firestore
     #   google-cloud-storage
-google-api-python-client==2.141.0
+google-api-python-client==2.157.0
     # via firebase-admin
-google-auth==2.34.0
+google-auth==2.37.0
     # via
     #   google-api-core
     #   google-api-python-client
@@ -607,25 +612,25 @@ google-cloud-core==2.4.1
     # via
     #   google-cloud-firestore
     #   google-cloud-storage
-google-cloud-firestore==2.17.2
+google-cloud-firestore==2.19.0
     # via firebase-admin
-google-cloud-storage==2.18.2
+google-cloud-storage==2.19.0
     # via firebase-admin
-google-crc32c==1.5.0
+google-crc32c==1.6.0
     # via
     #   google-cloud-storage
     #   google-resumable-media
 google-resumable-media==2.7.2
     # via google-cloud-storage
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.66.0
     # via
     #   google-api-core
     #   grpcio-status
-grpcio==1.65.5
+grpcio==1.69.0
     # via
     #   google-api-core
     #   grpcio-status
-grpcio-status==1.65.5
+grpcio-status==1.69.0
     # via google-api-core
 gunicorn==23.0.0
     # via -r requirements/edx/kernel.in
@@ -639,16 +644,15 @@ httplib2==0.22.0
     # via
     #   google-api-python-client
     #   google-auth-httplib2
-icalendar==5.0.13
+icalendar==6.1.0
     # via -r requirements/edx/kernel.in
-idna==3.7
+idna==3.10
     # via
-    #   -r requirements/edx/paver.txt
     #   optimizely-sdk
     #   requests
     #   snowflake-connector-python
     #   yarl
-importlib-metadata==8.3.0
+importlib-metadata==8.5.0
     # via -r requirements/edx/kernel.in
 inflection==0.5.1
     # via
@@ -658,9 +662,9 @@ interchange==2021.0.4
     # via py2neo
 ipaddress==1.0.23
     # via -r requirements/edx/kernel.in
-isodate==0.6.1
+isodate==0.7.2
     # via python3-saml
-jinja2==3.1.4
+jinja2==3.1.5
     # via code-annotations
 jmespath==1.0.1
     # via
@@ -668,7 +672,7 @@ jmespath==1.0.1
     #   botocore
 joblib==1.4.2
     # via nltk
-jsondiff==2.2.0
+jsondiff==2.2.1
     # via edx-enterprise
 jsonfield==3.1.0
     # via
@@ -683,47 +687,46 @@ jsonschema==4.23.0
     # via
     #   drf-spectacular
     #   optimizely-sdk
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via jsonschema
 jwcrypto==1.5.6
     # via
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.4.0
+kombu==5.4.2
     # via celery
 laboratory==1.0.2
     # via -r requirements/edx/kernel.in
 lazy==1.6
     # via
-    #   -r requirements/edx/paver.txt
     #   acid-xblock
     #   lti-consumer-xblock
     #   ora2
     #   xblock
-libsass==0.10.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/paver.txt
 loremipsum==1.0.5
     # via ora2
-lti-consumer-xblock==9.11.3
-    # via -r requirements/edx/kernel.in
-lxml==4.9.4
+lti-consumer-xblock==9.12.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
+lxml[html-clean,html_clean]==5.3.0
+    # via
+    #   -r requirements/edx/kernel.in
     #   edx-i18n-tools
     #   edxval
     #   lti-consumer-xblock
+    #   lxml-html-clean
     #   olxcleaner
     #   openedx-calc
     #   ora2
     #   python3-saml
     #   xblock
     #   xmlsec
+lxml-html-clean==0.4.1
+    # via lxml
 mailsnake==1.6.4
     # via -r requirements/edx/bundled.in
-mako==1.3.5
+mako==1.3.8
     # via
     #   -r requirements/edx/kernel.in
     #   acid-xblock
@@ -737,9 +740,8 @@ markdown==3.3.7
     #   openedx-django-wiki
     #   staff-graded-xblock
     #   xblock-poll
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
-    #   -r requirements/edx/paver.txt
     #   chem
     #   jinja2
     #   mako
@@ -747,33 +749,33 @@ markupsafe==2.1.5
     #   xblock
 maxminddb==2.6.2
     # via geoip2
-meilisearch==0.31.4
-    # via -r requirements/edx/kernel.in
-mock==5.1.0
-    # via -r requirements/edx/paver.txt
-mongoengine==0.28.2
+meilisearch==0.33.0
+    # via
+    #   -r requirements/edx/kernel.in
+    #   edx-search
+mongoengine==0.29.1
     # via -r requirements/edx/kernel.in
 monotonic==1.6
     # via
     #   analytics-python
     #   py2neo
-more-itertools==10.4.0
+more-itertools==10.5.0
     # via cssutils
 mpmath==1.3.0
     # via sympy
-msgpack==1.0.8
+msgpack==1.1.0
     # via cachecontrol
-multidict==6.0.5
+multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
-mysqlclient==2.2.4
-    # via -r requirements/edx/kernel.in
-newrelic==9.13.0
+mysqlclient==2.2.6
     # via
-    #   -r requirements/edx/bundled.in
-    #   edx-django-utils
-nh3==0.2.18
+    #   -r requirements/edx/kernel.in
+    #   openedx-forum
+newrelic==10.4.0
+    # via edx-django-utils
+nh3==0.2.20
     # via -r requirements/edx/kernel.in
 nltk==3.9.1
     # via chem
@@ -799,58 +801,63 @@ openai==0.28.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   edx-enterprise
-openedx-atlas==0.6.1
-    # via -r requirements/edx/kernel.in
-openedx-calc==3.1.0
+openedx-atlas==0.6.2
+    # via
+    #   -r requirements/edx/kernel.in
+    #   openedx-forum
+openedx-calc==4.0.1
     # via -r requirements/edx/kernel.in
-openedx-django-pyfs==3.6.0
+openedx-django-pyfs==3.7.0
     # via
     #   lti-consumer-xblock
     #   xblock
+    #   xblocks-contrib
 openedx-django-require==2.1.0
     # via -r requirements/edx/kernel.in
 openedx-django-wiki==2.1.0
     # via -r requirements/edx/kernel.in
-openedx-events==9.12.0
+openedx-events==9.15.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
+    #   edx-name-affirmation
     #   event-tracking
     #   ora2
-openedx-filters==1.9.0
+openedx-filters==1.12.0
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.11.2
+openedx-forum==0.1.5
+    # via -r requirements/edx/kernel.in
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
-openedx-mongodbproxy==0.2.1
+openedx-mongodbproxy==0.2.2
     # via -r requirements/edx/kernel.in
 optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
-ora2==6.11.2
+ora2==6.14.3
     # via -r requirements/edx/bundled.in
-packaging==24.1
+packaging==24.2
     # via
     #   drf-yasg
     #   gunicorn
     #   py2neo
     #   snowflake-connector-python
-pansi==2020.7.3
+pansi==2024.11.0
     # via py2neo
-paramiko==3.4.1
+paramiko==3.5.0
     # via edx-enterprise
 path==16.11.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
-    #   -r requirements/edx/paver.txt
     #   edx-i18n-tools
     #   path-py
 path-py==12.5.0
@@ -858,78 +865,77 @@ path-py==12.5.0
     #   edx-enterprise
     #   ora2
     #   staff-graded-xblock
-paver==1.3.4
-    # via -r requirements/edx/paver.txt
-pbr==6.0.0
-    # via
-    #   -r requirements/edx/paver.txt
-    #   stevedore
+pbr==6.1.0
+    # via stevedore
 pgpy==0.6.0
     # via edx-enterprise
 piexif==1.1.3
     # via -r requirements/edx/kernel.in
-pillow==10.4.0
+pillow==11.1.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-organizations
     #   edxval
-platformdirs==4.2.2
+    #   pansi
+platformdirs==4.3.6
     # via snowflake-connector-python
 polib==1.2.0
     # via edx-i18n-tools
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via click-repl
-proto-plus==1.24.0
+propcache==0.2.1
+    # via
+    #   aiohttp
+    #   yarl
+proto-plus==1.25.0
     # via
     #   google-api-core
     #   google-cloud-firestore
-protobuf==5.27.3
+protobuf==5.29.2
     # via
     #   google-api-core
     #   google-cloud-firestore
     #   googleapis-common-protos
     #   grpcio-status
     #   proto-plus
-psutil==6.0.0
+psutil==6.1.1
     # via
-    #   -r requirements/edx/paver.txt
+    #   -r requirements/edx/kernel.in
     #   edx-django-utils
 py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   pgpy
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via google-auth
 pycountry==24.6.1
     # via -r requirements/edx/kernel.in
 pycparser==2.22
     # via cffi
-pycryptodomex==3.20.0
+pycryptodomex==3.21.0
     # via
     #   -r requirements/edx/kernel.in
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-pydantic==2.8.2
+pydantic==2.10.4
     # via camel-converter
-pydantic-core==2.20.1
+pydantic-core==2.27.2
     # via pydantic
-pygments==2.18.0
-    # via
-    #   -r requirements/edx/bundled.in
-    #   py2neo
+pygments==2.19.1
+    # via py2neo
 pyjwkest==1.4.2
     # via
     #   -r requirements/edx/kernel.in
     #   edx-token-utils
     #   lti-consumer-xblock
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.1
     # via
     #   -r requirements/edx/kernel.in
     #   drf-jwt
@@ -946,15 +952,15 @@ pylatexenc==2.10
 pylti1p3==2.0.0
     # via -r requirements/edx/kernel.in
 pymemcache==4.0.0
-    # via -r requirements/edx/paver.txt
+    # via -r requirements/edx/kernel.in
 pymongo==4.4.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
-    #   -r requirements/edx/paver.txt
     #   edx-opaque-keys
     #   event-tracking
     #   mongoengine
+    #   openedx-forum
     #   openedx-mongodbproxy
 pynacl==1.5.0
     # via
@@ -962,11 +968,11 @@ pynacl==1.5.0
     #   paramiko
 pynliner==0.8.0
     # via -r requirements/edx/kernel.in
-pyopenssl==24.2.1
+pyopenssl==24.3.0
     # via
     #   optimizely-sdk
     #   snowflake-connector-python
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via
     #   chem
     #   httplib2
@@ -992,8 +998,6 @@ python-dateutil==2.9.0.post0
     #   xblock
 python-ipware==3.0.0
     # via django-ipware
-python-memcached==1.62
-    # via -r requirements/edx/paver.txt
 python-slugify==8.0.4
     # via code-annotations
 python-swiftclient==4.6.0
@@ -1004,10 +1008,9 @@ python3-openid==3.2.0 ; python_version >= "3"
     #   social-auth-core
 python3-saml==1.16.0
     # via -r requirements/edx/kernel.in
-pytz==2024.1
+pytz==2024.2
     # via
     #   -r requirements/edx/kernel.in
-    #   django-ses
     #   djangorestframework
     #   drf-yasg
     #   edx-completion
@@ -1017,7 +1020,6 @@ pytz==2024.1
     #   edx-tincan-py35
     #   event-tracking
     #   fs
-    #   icalendar
     #   interchange
     #   olxcleaner
     #   ora2
@@ -1037,9 +1039,9 @@ pyyaml==6.0.2
     #   xblock
 random2==1.0.2
     # via -r requirements/edx/kernel.in
-recommender-xblock==2.2.0
+recommender-xblock==3.0.0
     # via -r requirements/edx/bundled.in
-redis==5.0.8
+redis==5.2.1
     # via
     #   -r requirements/edx/kernel.in
     #   walrus
@@ -1047,11 +1049,10 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-regex==2024.7.24
+regex==2024.11.6
     # via nltk
 requests==2.32.3
     # via
-    #   -r requirements/edx/paver.txt
     #   algoliasearch
     #   analytics-python
     #   cachecontrol
@@ -1066,6 +1067,7 @@ requests==2.32.3
     #   mailsnake
     #   meilisearch
     #   openai
+    #   openedx-forum
     #   optimizely-sdk
     #   pyjwkest
     #   pylti1p3
@@ -1080,23 +1082,23 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   social-auth-core
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   jsonschema
     #   referencing
 rsa==4.9
     # via google-auth
-rules==3.4
+rules==3.5
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-proctoring
     #   openedx-learning
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via boto3
 sailthru-client==2.2.3
     # via edx-ace
-scipy==1.14.0
+scipy==1.15.0
     # via
     #   chem
     #   openedx-calc
@@ -1111,12 +1113,10 @@ simplejson==3.19.3
     #   super-csv
     #   xblock
     #   xblock-utils
-six==1.16.0
+six==1.17.0
     # via
     #   -r requirements/edx/kernel.in
-    #   -r requirements/edx/paver.txt
     #   analytics-python
-    #   bleach
     #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
@@ -1131,11 +1131,7 @@ six==1.16.0
     #   fs-s3fs
     #   html5lib
     #   interchange
-    #   isodate
-    #   libsass
     #   optimizely-sdk
-    #   pansi
-    #   paver
     #   py2neo
     #   pyjwkest
     #   python-dateutil
@@ -1144,8 +1140,7 @@ slumber==0.7.1
     #   -r requirements/edx/kernel.in
     #   edx-bulk-grades
     #   edx-enterprise
-    #   edx-rest-api-client
-snowflake-connector-python==3.12.0
+snowflake-connector-python==3.12.4
     # via edx-enterprise
 social-auth-app-django==5.4.1
     # via
@@ -1157,7 +1152,7 @@ social-auth-core==4.5.4
     #   -r requirements/edx/kernel.in
     #   edx-auth-backends
     #   social-auth-app-django
-sorl-thumbnail==12.10.0
+sorl-thumbnail==12.11.0
     # via
     #   -r requirements/edx/kernel.in
     #   openedx-django-wiki
@@ -1167,14 +1162,13 @@ sortedcontainers==2.4.0
     #   snowflake-connector-python
 soupsieve==2.6
     # via beautifulsoup4
-sqlparse==0.5.1
+sqlparse==0.5.3
     # via django
 staff-graded-xblock==2.3.0
     # via -r requirements/edx/bundled.in
-stevedore==5.2.0
+stevedore==5.4.0
     # via
     #   -r requirements/edx/kernel.in
-    #   -r requirements/edx/paver.txt
     #   code-annotations
     #   edx-ace
     #   edx-django-utils
@@ -1182,23 +1176,22 @@ stevedore==5.2.0
     #   edx-opaque-keys
 super-csv==3.2.0
     # via edx-bulk-grades
-sympy==1.13.2
+sympy==1.13.3
     # via openedx-calc
 testfixtures==8.3.0
     # via edx-enterprise
 text-unidecode==1.3
     # via python-slugify
-tinycss2==1.2.1
+tinycss2==1.4.0
     # via bleach
 tomlkit==0.13.2
     # via snowflake-connector-python
-tqdm==4.66.5
+tqdm==4.67.1
     # via
     #   nltk
     #   openai
 typing-extensions==4.12.2
     # via
-    #   -r requirements/edx/paver.txt
     #   django-countries
     #   edx-opaque-keys
     #   jwcrypto
@@ -1206,8 +1199,11 @@ typing-extensions==4.12.2
     #   pydantic-core
     #   pylti1p3
     #   snowflake-connector-python
-tzdata==2024.1
-    # via celery
+tzdata==2024.2
+    # via
+    #   celery
+    #   icalendar
+    #   kombu
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/kernel.in
@@ -1217,10 +1213,9 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.19
+urllib3==2.2.3
     # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/paver.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   botocore
     #   elasticsearch
     #   py2neo
@@ -1236,8 +1231,6 @@ voluptuous==0.15.2
     # via ora2
 walrus==0.9.4
     # via edx-event-bus-redis
-watchdog==4.0.2
-    # via -r requirements/edx/paver.txt
 wcwidth==0.2.13
     # via prompt-toolkit
 web-fragments==2.2.0
@@ -1253,12 +1246,14 @@ webencodings==0.5.1
     #   bleach
     #   html5lib
     #   tinycss2
-webob==1.8.8
+webob==1.8.9
     # via
     #   -r requirements/edx/kernel.in
     #   xblock
-wrapt==1.16.0
-    # via -r requirements/edx/paver.txt
+wheel==0.45.1
+    # via django-pipeline
+wrapt==1.17.0
+    # via -r requirements/edx/kernel.in
 xblock[django]==5.1.0
     # via
     #   -r requirements/edx/kernel.in
@@ -1274,6 +1269,7 @@ xblock[django]==5.1.0
     #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-utils
+    #   xblocks-contrib
 xblock-drag-and-drop-v2==4.0.3
     # via -r requirements/edx/bundled.in
 xblock-google-drive==0.7.0
@@ -1284,15 +1280,15 @@ xblock-utils==4.0.0
     # via
     #   edx-sga
     #   xblock-poll
-xmlsec==1.3.13
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   python3-saml
+xblocks-contrib==0.1.0
+    # via -r requirements/edx/bundled.in
+xmlsec==1.3.14
+    # via python3-saml
 xss-utils==0.6.0
     # via -r requirements/edx/kernel.in
-yarl==1.9.4
+yarl==1.18.3
     # via aiohttp
-zipp==3.20.0
+zipp==3.21.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in
index b4685a3a2cbe..61f6007aa507 100644
--- a/requirements/edx/bundled.in
+++ b/requirements/edx/bundled.in
@@ -25,7 +25,6 @@
 # Follow up issue to remove this fork: https://github.com/openedx/edx-platform/issues/33456
 https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
 
-pygments                            # Used to support colors in paver command output
 # i18n_tool is needed at build time for pulling translations
 edx-i18n-tools>=0.4.6               # Commands for developers and translators to extract, compile and validate translations
 
@@ -34,7 +33,6 @@ algoliasearch                       # Algolia’s API client for indexed searchi
 django-ses                          # Django email backend for Amazon’s Simple Email Service
 edx-braze-client                    # a customer engagement platform used for edx.org
 mailsnake                           # MailChimp API; used for two management commands in the "mailing" djangoapp
-newrelic                            # New Relic agent for performance monitoring
 optimizely-sdk                      # Optimizely provides A/B testing and other features, used by edx.org
 
 
@@ -48,3 +46,4 @@ ora2>=4.5.0                         # Open Response Assessment XBlock
 xblock-poll                         # Xblock for polling users
 xblock-drag-and-drop-v2             # Drag and Drop XBlock
 xblock-google-drive                 # XBlock for google docs and calendar
+xblocks-contrib                     # Package having multiple core XBlocks, https://github.com/openedx/xblocks-contrib?tab=readme-ov-file#xblocks-being-moved-here
diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
index a004eeeb9ffa..26669aec6cb0 100644
--- a/requirements/edx/coverage.txt
+++ b/requirements/edx/coverage.txt
@@ -6,15 +6,15 @@
 #
 chardet==5.2.0
     # via diff-cover
-coverage==7.6.1
+coverage==7.6.10
     # via -r requirements/edx/coverage.in
-diff-cover==9.1.1
+diff-cover==9.2.1
     # via -r requirements/edx/coverage.in
-jinja2==3.1.4
+jinja2==3.1.5
     # via diff-cover
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via jinja2
 pluggy==1.5.0
     # via diff-cover
-pygments==2.18.0
+pygments==2.19.1
     # via diff-cover
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 196ef85d9223..a153f18be7a3 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -12,22 +12,22 @@ accessible-pygments==0.0.5
     # via
     #   -r requirements/edx/doc.txt
     #   pydata-sphinx-theme
-acid-xblock==0.3.1
+acid-xblock==0.4.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.11
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   geoip2
     #   openai
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -41,7 +41,7 @@ algoliasearch==3.0.0
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-amqp==5.2.0
+amqp==5.3.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -60,7 +60,7 @@ annotated-types==0.7.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pydantic
-anyio==4.4.0
+anyio==4.8.0
     # via
     #   -r requirements/edx/testing.txt
     #   starlette
@@ -76,6 +76,7 @@ asgiref==3.8.1
     #   django
     #   django-cors-headers
     #   django-countries
+    #   django-stubs
 asn1crypto==1.5.1
     # via
     #   -r requirements/edx/doc.txt
@@ -83,10 +84,13 @@ asn1crypto==1.5.1
     #   snowflake-connector-python
 astroid==2.13.5
     # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pylint
     #   pylint-celery
-attrs==24.2.0
+    #   sphinx-autoapi
+attrs==24.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -110,7 +114,7 @@ backoff==1.10.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   analytics-python
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -119,14 +123,15 @@ beautifulsoup4==4.12.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   openedx-forum
     #   pydata-sphinx-theme
     #   pynliner
-billiard==4.2.0
+billiard==4.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   celery
-bleach[css]==6.1.0
+bleach[css]==6.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -140,14 +145,14 @@ boto==2.49.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-boto3==1.35.1
+boto3==1.35.93
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.35.1
+botocore==1.35.93
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -157,11 +162,11 @@ bridgekeeper==0.9
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-build==1.2.1
+build==1.2.2.post1
     # via
     #   -r requirements/edx/../pip-tools.txt
     #   pip-tools
-cachecontrol==0.14.0
+cachecontrol==0.14.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -172,7 +177,7 @@ cachetools==5.5.0
     #   -r requirements/edx/testing.txt
     #   google-auth
     #   tox
-camel-converter[pydantic]==3.1.2
+camel-converter[pydantic]==4.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -188,7 +193,7 @@ celery==5.4.0
     #   edx-enterprise
     #   event-tracking
     #   openedx-learning
-certifi==2024.7.4
+certifi==2024.12.14
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -196,7 +201,7 @@ certifi==2024.7.4
     #   py2neo
     #   requests
     #   snowflake-connector-python
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -263,7 +268,7 @@ click-repl==0.3.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   celery
-code-annotations==1.8.0
+code-annotations==2.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -278,15 +283,15 @@ colorama==0.4.6
     # via
     #   -r requirements/edx/testing.txt
     #   tox
-coverage[toml]==7.6.1
+coverage[toml]==7.6.10
     # via
     #   -r requirements/edx/testing.txt
     #   pytest-cov
-crowdsourcehinter-xblock==0.7
+crowdsourcehinter-xblock==0.8
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-cryptography==42.0.8
+cryptography==44.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -311,7 +316,7 @@ cssutils==2.11.1
     #   pynliner
 ddt==1.7.2
     # via -r requirements/edx/testing.txt
-deepmerge==1.1.1
+deepmerge==2.0
     # via
     #   -r requirements/edx/doc.txt
     #   sphinxcontrib-openapi
@@ -323,17 +328,17 @@ defusedxml==0.7.1
     #   ora2
     #   python3-openid
     #   social-auth-core
-diff-cover==9.1.1
+diff-cover==9.2.1
     # via -r requirements/edx/testing.txt
-dill==0.3.8
+dill==0.3.9
     # via
     #   -r requirements/edx/testing.txt
     #   pylint
-distlib==0.3.8
+distlib==0.3.9
     # via
     #   -r requirements/edx/testing.txt
     #   virtualenv
-django==4.2.15
+django==4.2.17
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -403,6 +408,7 @@ django==4.2.15
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   social-auth-app-django
@@ -414,7 +420,7 @@ django-appconf==1.0.6
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-statici18n
-django-cache-memoize==0.2.0
+django-cache-memoize==0.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -435,7 +441,7 @@ django-config-models==2.7.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.4.0
+django-cors-headers==4.6.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -473,7 +479,7 @@ django-ipware==7.0.1
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
-django-js-asset==2.2.0
+django-js-asset==3.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -482,7 +488,7 @@ django-method-override==1.0.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-django-model-utils==4.5.1
+django-model-utils==5.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -511,7 +517,7 @@ django-multi-email-field==0.7.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-django-mysql==4.14.0
+django-mysql==4.15.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -521,12 +527,12 @@ django-oauth-toolkit==1.7.1
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-django-object-actions==4.2.0
+django-object-actions==4.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-django-pipeline==3.1.0
+django-pipeline==4.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -544,7 +550,7 @@ django-sekizai==4.1.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   openedx-django-wiki
-django-ses==4.1.0
+django-ses==4.3.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -558,31 +564,32 @@ django-simple-history==3.4.0
     #   edx-organizations
     #   edx-proctoring
     #   ora2
-django-statici18n==2.5.0
+django-statici18n==2.6.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
+    #   xblocks-contrib
 django-storages==1.14.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edxval
-django-stubs==1.16.0
+django-stubs==5.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/development.in
     #   djangorestframework-stubs
-django-stubs-ext==5.0.4
+django-stubs-ext==5.1.1
     # via django-stubs
 django-user-tasks==3.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -615,19 +622,18 @@ djangorestframework==3.14.0
     #   edx-organizations
     #   edx-proctoring
     #   edx-submissions
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   super-csv
-djangorestframework-stubs==3.14.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/development.in
+djangorestframework-stubs==3.15.2
+    # via -r requirements/edx/development.in
 djangorestframework-xml==2.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-dnspython==2.6.1
+dnspython==2.7.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -638,7 +644,7 @@ docutils==0.21.2
     #   pydata-sphinx-theme
     #   sphinx
     #   sphinx-mdinclude
-done-xblock==2.3.0
+done-xblock==2.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -647,26 +653,26 @@ drf-jwt==1.19.2
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-drf-extensions
-drf-spectacular==0.27.2
+drf-spectacular==0.28.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-drf-yasg==1.21.7
+drf-yasg==1.21.8
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-user-tasks
     #   edx-api-doc-tools
-edx-ace==1.11.1
+edx-ace==1.11.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-api-doc-tools==1.8.0
+edx-api-doc-tools==2.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-name-affirmation
-edx-auth-backends==4.3.0
+edx-auth-backends==4.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -680,7 +686,7 @@ edx-bulk-grades==1.1.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   staff-graded-xblock
-edx-ccx-keys==1.3.0
+edx-ccx-keys==2.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -692,11 +698,11 @@ edx-celeryutils==1.3.0
     #   -r requirements/edx/testing.txt
     #   edx-name-affirmation
     #   super-csv
-edx-codejail==3.4.1
+edx-codejail==3.5.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-completion==4.6.7
+edx-completion==4.7.8
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -710,7 +716,7 @@ edx-django-sites-extensions==4.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-django-utils==5.15.0
+edx-django-utils==7.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -728,7 +734,7 @@ edx-django-utils==5.15.0
     #   openedx-events
     #   ora2
     #   super-csv
-edx-drf-extensions==10.3.0
+edx-drf-extensions==10.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -741,16 +747,16 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.2
+edx-enterprise==5.5.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-event-bus-kafka==5.8.1
+edx-event-bus-kafka==6.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-event-bus-redis==0.5.0
+edx-event-bus-redis==0.5.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -760,17 +766,18 @@ edx-i18n-tools==1.5.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   ora2
-edx-lint==5.3.7
+    #   xblocks-contrib
+edx-lint==5.4.1
     # via -r requirements/edx/testing.txt
 edx-milestones==0.6.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-name-affirmation==2.3.7
+edx-name-affirmation==3.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-opaque-keys[django]==2.10.0
+edx-opaque-keys[django]==2.11.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -790,31 +797,32 @@ edx-organizations==6.13.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-proctoring==4.18.1
+edx-proctoring==5.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-proctoring-proctortrack
-edx-rbac==1.9.0
+edx-rbac==1.10.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-edx-rest-api-client==5.7.1
+edx-rest-api-client==6.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.0.0
+edx-search==4.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   openedx-forum
 edx-sga==0.25.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-submissions==3.7.7
+edx-submissions==3.8.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -846,16 +854,18 @@ edx-when==2.5.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-proctoring
-edxval==2.5.0
+edxval==2.8.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-elasticsearch==7.13.4
+elasticsearch==7.9.1
     # via
     #   -c requirements/edx/../common_constraints.txt
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-search
+    #   openedx-forum
 enmerkar==0.7.1
     # via
     #   -r requirements/edx/doc.txt
@@ -879,34 +889,34 @@ execnet==2.1.1
     #   pytest-xdist
 factory-boy==3.3.1
     # via -r requirements/edx/testing.txt
-faker==27.0.0
+faker==33.3.0
     # via
     #   -r requirements/edx/testing.txt
     #   factory-boy
-fastapi==0.112.1
+fastapi==0.115.6
     # via
     #   -r requirements/edx/testing.txt
     #   pact-python
-fastavro==1.9.5
+fastavro==1.10.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   openedx-events
-filelock==3.15.4
+filelock==3.16.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   snowflake-connector-python
     #   tox
     #   virtualenv
-firebase-admin==6.5.0
+firebase-admin==6.6.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-ace
 freezegun==1.5.1
     # via -r requirements/edx/testing.txt
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -929,21 +939,21 @@ future==1.0.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pyjwkest
-geoip2==4.8.0
+geoip2==4.8.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-gitdb==4.0.11
+gitdb==4.0.12
     # via
     #   -r requirements/edx/doc.txt
     #   gitpython
-gitpython==3.1.43
+gitpython==3.1.44
     # via -r requirements/edx/doc.txt
 glob2==0.7
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-google-api-core[grpc]==2.19.1
+google-api-core[grpc]==2.24.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -952,12 +962,12 @@ google-api-core[grpc]==2.19.1
     #   google-cloud-core
     #   google-cloud-firestore
     #   google-cloud-storage
-google-api-python-client==2.141.0
+google-api-python-client==2.157.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   firebase-admin
-google-auth==2.34.0
+google-auth==2.37.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -978,17 +988,17 @@ google-cloud-core==2.4.1
     #   -r requirements/edx/testing.txt
     #   google-cloud-firestore
     #   google-cloud-storage
-google-cloud-firestore==2.17.2
+google-cloud-firestore==2.19.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   firebase-admin
-google-cloud-storage==2.18.2
+google-cloud-storage==2.19.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   firebase-admin
-google-crc32c==1.5.0
+google-crc32c==1.6.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -999,23 +1009,23 @@ google-resumable-media==2.7.2
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   google-cloud-storage
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.66.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   google-api-core
     #   grpcio-status
-grimp==3.4.1
+grimp==3.5
     # via
     #   -r requirements/edx/testing.txt
     #   import-linter
-grpcio==1.65.5
+grpcio==1.69.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   google-api-core
     #   grpcio-status
-grpcio-status==1.65.5
+grpcio-status==1.69.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1045,11 +1055,11 @@ httplib2==0.22.0
     #   google-auth-httplib2
 httpretty==1.1.4
     # via -r requirements/edx/testing.txt
-icalendar==5.0.13
+icalendar==6.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-idna==3.7
+idna==3.10
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1062,9 +1072,9 @@ imagesize==1.4.1
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx
-import-linter==2.0
+import-linter==2.1
     # via -r requirements/edx/testing.txt
-importlib-metadata==8.3.0
+importlib-metadata==8.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1087,7 +1097,7 @@ ipaddress==1.0.23
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-isodate==0.6.1
+isodate==0.7.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1096,13 +1106,14 @@ isort==5.13.2
     # via
     #   -r requirements/edx/testing.txt
     #   pylint
-jinja2==3.1.4
+jinja2==3.1.5
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   code-annotations
     #   diff-cover
     #   sphinx
+    #   sphinx-autoapi
 jmespath==1.0.1
     # via
     #   -r requirements/edx/doc.txt
@@ -1114,7 +1125,7 @@ joblib==1.4.2
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   nltk
-jsondiff==2.2.0
+jsondiff==2.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1136,7 +1147,7 @@ jsonschema==4.23.0
     #   drf-spectacular
     #   optimizely-sdk
     #   sphinxcontrib-openapi
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1147,7 +1158,7 @@ jwcrypto==1.5.6
     #   -r requirements/edx/testing.txt
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.4.0
+kombu==5.4.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1166,31 +1177,31 @@ lazy==1.6
     #   xblock
 lazy-object-proxy==1.10.0
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   astroid
 libsass==0.10.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/assets.txt
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
 loremipsum==1.0.5
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   ora2
-lti-consumer-xblock==9.11.3
+lti-consumer-xblock==9.12.1
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-lxml==4.9.4
+lxml[html-clean]==5.3.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-i18n-tools
     #   edxval
     #   lti-consumer-xblock
+    #   lxml-html-clean
     #   olxcleaner
     #   openedx-calc
     #   ora2
@@ -1198,11 +1209,16 @@ lxml==4.9.4
     #   python3-saml
     #   xblock
     #   xmlsec
+lxml-html-clean==0.4.1
+    # via
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
+    #   lxml
 mailsnake==1.6.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-mako==1.3.5
+mako==1.3.8
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1218,7 +1234,7 @@ markdown==3.3.7
     #   openedx-django-wiki
     #   staff-graded-xblock
     #   xblock-poll
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1236,19 +1252,18 @@ mccabe==0.7.0
     # via
     #   -r requirements/edx/testing.txt
     #   pylint
-meilisearch==0.31.4
+meilisearch==0.33.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-mistune==3.0.2
+    #   edx-search
+mistune==3.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx-mdinclude
 mock==5.1.0
-    # via
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-mongoengine==0.28.2
+    # via -r requirements/edx/testing.txt
+mongoengine==0.29.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1258,7 +1273,7 @@ monotonic==1.6
     #   -r requirements/edx/testing.txt
     #   analytics-python
     #   py2neo
-more-itertools==10.4.0
+more-itertools==10.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1268,34 +1283,32 @@ mpmath==1.3.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   sympy
-msgpack==1.0.8
+msgpack==1.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   cachecontrol
-multidict==6.0.5
+multidict==6.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   yarl
-mypy==1.11.1
-    # via
-    #   -r requirements/edx/development.in
-    #   django-stubs
-    #   djangorestframework-stubs
+mypy==1.14.1
+    # via -r requirements/edx/development.in
 mypy-extensions==1.0.0
     # via mypy
-mysqlclient==2.2.4
+mysqlclient==2.2.6
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-newrelic==9.13.0
+    #   openedx-forum
+newrelic==10.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-django-utils
-nh3==0.2.18
+nh3==0.2.20
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1336,20 +1349,22 @@ openai==0.28.1
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-openedx-atlas==0.6.1
+openedx-atlas==0.6.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-calc==3.1.0
+    #   openedx-forum
+openedx-calc==4.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-django-pyfs==3.6.0
+openedx-django-pyfs==3.7.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
     #   xblock
+    #   xblocks-contrib
 openedx-django-require==2.1.0
     # via
     #   -r requirements/edx/doc.txt
@@ -1358,27 +1373,32 @@ openedx-django-wiki==2.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-events==9.12.0
+openedx-events==9.15.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
+    #   edx-name-affirmation
     #   event-tracking
     #   ora2
-openedx-filters==1.9.0
+openedx-filters==1.12.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.11.2
+openedx-forum==0.1.5
+    # via
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-mongodbproxy==0.2.1
+openedx-mongodbproxy==0.2.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1387,11 +1407,11 @@ optimizely-sdk==4.1.1
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-ora2==6.11.2
+ora2==6.14.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-packaging==24.1
+packaging==24.2
     # via
     #   -r requirements/edx/../pip-tools.txt
     #   -r requirements/edx/doc.txt
@@ -1400,20 +1420,19 @@ packaging==24.1
     #   drf-yasg
     #   gunicorn
     #   py2neo
-    #   pydata-sphinx-theme
     #   pyproject-api
     #   pytest
     #   snowflake-connector-python
     #   sphinx
     #   tox
-pact-python==2.2.1
+pact-python==2.3.0
     # via -r requirements/edx/testing.txt
-pansi==2020.7.3
+pansi==2024.11.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   py2neo
-paramiko==3.4.1
+paramiko==3.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1432,11 +1451,7 @@ path-py==12.5.0
     #   edx-enterprise
     #   ora2
     #   staff-graded-xblock
-paver==1.3.4
-    # via
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-pbr==6.0.0
+pbr==6.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1454,16 +1469,17 @@ piexif==1.1.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pillow==10.4.0
+pillow==11.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-organizations
     #   edxval
+    #   pansi
 pip-tools==7.4.1
     # via -r requirements/edx/../pip-tools.txt
-platformdirs==4.2.2
+platformdirs==4.3.6
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1482,18 +1498,24 @@ polib==1.2.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-i18n-tools
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   click-repl
-proto-plus==1.24.0
+propcache==0.2.1
+    # via
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
+    #   aiohttp
+    #   yarl
+proto-plus==1.25.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   google-api-core
     #   google-cloud-firestore
-protobuf==5.27.3
+protobuf==5.29.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1502,7 +1524,7 @@ protobuf==5.27.3
     #   googleapis-common-protos
     #   grpcio-status
     #   proto-plus
-psutil==6.0.0
+psutil==6.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1516,14 +1538,14 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pgpy
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1541,29 +1563,29 @@ pycparser==2.22
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   cffi
-pycryptodomex==3.20.0
+pycryptodomex==3.21.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-pydantic==2.8.2
+pydantic==2.10.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   camel-converter
     #   fastapi
-pydantic-core==2.20.1
+pydantic-core==2.27.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pydantic
-pydata-sphinx-theme==0.15.4
+pydata-sphinx-theme==0.16.1
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx-book-theme
-pygments==2.18.0
+pygments==2.19.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1579,7 +1601,7 @@ pyjwkest==1.4.2
     #   -r requirements/edx/testing.txt
     #   edx-token-utils
     #   lti-consumer-xblock
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1637,6 +1659,7 @@ pymongo==4.4.0
     #   edx-opaque-keys
     #   event-tracking
     #   mongoengine
+    #   openedx-forum
     #   openedx-mongodbproxy
 pynacl==1.5.0
     # via
@@ -1648,29 +1671,29 @@ pynliner==0.8.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pyopenssl==24.2.1
+pyopenssl==24.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   optimizely-sdk
     #   snowflake-connector-python
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   chem
     #   httplib2
     #   openedx-calc
-pyproject-api==1.7.1
+pyproject-api==1.8.0
     # via
     #   -r requirements/edx/testing.txt
     #   tox
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via
     #   -r requirements/edx/../pip-tools.txt
     #   build
     #   pip-tools
-pyquery==2.0.0
+pyquery==2.0.1
     # via -r requirements/edx/testing.txt
 pyrsistent==0.20.0
     # via
@@ -1682,7 +1705,7 @@ pysrt==1.1.2
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edxval
-pytest==8.3.2
+pytest==8.3.4
     # via
     #   -r requirements/edx/testing.txt
     #   pylint-pytest
@@ -1695,9 +1718,9 @@ pytest==8.3.2
     #   pytest-xdist
 pytest-attrib==0.1.3
     # via -r requirements/edx/testing.txt
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r requirements/edx/testing.txt
-pytest-django==4.8.0
+pytest-django==4.9.0
     # via -r requirements/edx/testing.txt
 pytest-json-report==1.5.0
     # via -r requirements/edx/testing.txt
@@ -1705,7 +1728,7 @@ pytest-metadata==1.8.0
     # via
     #   -r requirements/edx/testing.txt
     #   pytest-json-report
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
     # via -r requirements/edx/testing.txt
 pytest-xdist[psutil]==3.6.1
     # via -r requirements/edx/testing.txt
@@ -1730,10 +1753,6 @@ python-ipware==3.0.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-ipware
-python-memcached==1.62
-    # via
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
 python-slugify==8.0.4
     # via
     #   -r requirements/edx/doc.txt
@@ -1753,11 +1772,10 @@ python3-saml==1.16.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pytz==2024.1
+pytz==2024.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   django-ses
     #   djangorestframework
     #   drf-yasg
     #   edx-completion
@@ -1767,7 +1785,6 @@ pytz==2024.1
     #   edx-tincan-py35
     #   event-tracking
     #   fs
-    #   icalendar
     #   interchange
     #   olxcleaner
     #   ora2
@@ -1789,17 +1806,18 @@ pyyaml==6.0.2
     #   edx-django-release-util
     #   edx-i18n-tools
     #   jsondiff
+    #   sphinx-autoapi
     #   sphinxcontrib-openapi
     #   xblock
 random2==1.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-recommender-xblock==2.2.0
+recommender-xblock==3.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-redis==5.0.8
+redis==5.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1810,7 +1828,7 @@ referencing==0.35.1
     #   -r requirements/edx/testing.txt
     #   jsonschema
     #   jsonschema-specifications
-regex==2024.7.24
+regex==2024.11.6
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1834,6 +1852,7 @@ requests==2.32.3
     #   mailsnake
     #   meilisearch
     #   openai
+    #   openedx-forum
     #   optimizely-sdk
     #   pact-python
     #   pyjwkest
@@ -1851,7 +1870,7 @@ requests-oauthlib==2.0.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   social-auth-core
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1862,14 +1881,14 @@ rsa==4.9
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   google-auth
-rules==3.4
+rules==3.5
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
     #   openedx-learning
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1879,7 +1898,7 @@ sailthru-client==2.2.3
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-ace
-scipy==1.14.0
+scipy==1.15.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1904,13 +1923,12 @@ simplejson==3.19.3
     #   xblock-utils
 singledispatch==4.1.0
     # via -r requirements/edx/testing.txt
-six==1.16.0
+six==1.17.0
     # via
     #   -r requirements/edx/assets.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   analytics-python
-    #   bleach
     #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
@@ -1926,12 +1944,9 @@ six==1.16.0
     #   fs-s3fs
     #   html5lib
     #   interchange
-    #   isodate
     #   libsass
     #   optimizely-sdk
     #   pact-python
-    #   pansi
-    #   paver
     #   py2neo
     #   pyjwkest
     #   python-dateutil
@@ -1942,8 +1957,7 @@ slumber==0.7.1
     #   -r requirements/edx/testing.txt
     #   edx-bulk-grades
     #   edx-enterprise
-    #   edx-rest-api-client
-smmap==5.0.1
+smmap==5.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   gitdb
@@ -1955,7 +1969,7 @@ snowballstemmer==2.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx
-snowflake-connector-python==3.12.0
+snowflake-connector-python==3.12.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1972,7 +1986,7 @@ social-auth-core==4.5.4
     #   -r requirements/edx/testing.txt
     #   edx-auth-backends
     #   social-auth-app-django
-sorl-thumbnail==12.10.0
+sorl-thumbnail==12.11.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1987,10 +2001,11 @@ soupsieve==2.6
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   beautifulsoup4
-sphinx==8.0.2
+sphinx==8.1.3
     # via
     #   -r requirements/edx/doc.txt
     #   pydata-sphinx-theme
+    #   sphinx-autoapi
     #   sphinx-book-theme
     #   sphinx-design
     #   sphinx-mdinclude
@@ -1998,6 +2013,8 @@ sphinx==8.0.2
     #   sphinxcontrib-httpdomain
     #   sphinxcontrib-openapi
     #   sphinxext-rediraffe
+sphinx-autoapi==3.4.0
+    # via -r requirements/edx/doc.txt
 sphinx-book-theme==1.1.3
     # via -r requirements/edx/doc.txt
 sphinx-design==0.6.1
@@ -2040,7 +2057,7 @@ sphinxcontrib-serializinghtml==2.0.0
     #   sphinx
 sphinxext-rediraffe==0.2.7
     # via -r requirements/edx/doc.txt
-sqlparse==0.5.1
+sqlparse==0.5.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2050,11 +2067,11 @@ staff-graded-xblock==2.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-starlette==0.38.2
+starlette==0.41.3
     # via
     #   -r requirements/edx/testing.txt
     #   fastapi
-stevedore==5.2.0
+stevedore==5.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2068,7 +2085,7 @@ super-csv==3.2.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-bulk-grades
-sympy==1.13.2
+sympy==1.13.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2083,30 +2100,26 @@ text-unidecode==1.3
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   python-slugify
-tinycss2==1.2.1
+tinycss2==1.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   bleach
-tomli==2.0.1
-    # via django-stubs
 tomlkit==0.13.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pylint
     #   snowflake-connector-python
-tox==4.18.0
+tox==4.23.2
     # via -r requirements/edx/testing.txt
-tqdm==4.66.5
+tqdm==4.67.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   nltk
     #   openai
-types-pytz==2024.1.0.20240417
-    # via django-stubs
-types-pyyaml==6.0.12.20240808
+types-pyyaml==6.0.12.20241230
     # via
     #   django-stubs
     #   djangorestframework-stubs
@@ -2118,11 +2131,13 @@ typing-extensions==4.12.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   anyio
     #   django-countries
     #   django-stubs
     #   django-stubs-ext
     #   djangorestframework-stubs
     #   edx-opaque-keys
+    #   faker
     #   fastapi
     #   grimp
     #   import-linter
@@ -2133,11 +2148,13 @@ typing-extensions==4.12.2
     #   pydata-sphinx-theme
     #   pylti1p3
     #   snowflake-connector-python
-tzdata==2024.1
+tzdata==2024.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   celery
+    #   icalendar
+    #   kombu
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/doc.txt
@@ -2152,9 +2169,9 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.19
+urllib3==2.2.3
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   botocore
@@ -2165,7 +2182,7 @@ user-util==1.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-uvicorn==0.30.6
+uvicorn==0.34.0
     # via
     #   -r requirements/edx/testing.txt
     #   pact-python
@@ -2176,7 +2193,7 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.26.3
+virtualenv==20.28.1
     # via
     #   -r requirements/edx/testing.txt
     #   tox
@@ -2185,18 +2202,15 @@ voluptuous==0.15.2
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   ora2
-vulture==2.11
+vulture==2.14
     # via -r requirements/edx/development.in
 walrus==0.9.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-event-bus-redis
-watchdog==4.0.2
-    # via
-    #   -r requirements/edx/development.in
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
+watchdog==6.0.0
+    # via -r requirements/edx/development.in
 wcwidth==0.2.13
     # via
     #   -r requirements/edx/doc.txt
@@ -2218,16 +2232,19 @@ webencodings==0.5.1
     #   bleach
     #   html5lib
     #   tinycss2
-webob==1.8.8
+webob==1.8.9
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   xblock
-wheel==0.44.0
+wheel==0.45.1
     # via
     #   -r requirements/edx/../pip-tools.txt
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
+    #   django-pipeline
     #   pip-tools
-wrapt==1.16.0
+wrapt==1.17.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2248,6 +2265,7 @@ xblock[django]==5.1.0
     #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-utils
+    #   xblocks-contrib
 xblock-drag-and-drop-v2==4.0.3
     # via
     #   -r requirements/edx/doc.txt
@@ -2266,9 +2284,12 @@ xblock-utils==4.0.0
     #   -r requirements/edx/testing.txt
     #   edx-sga
     #   xblock-poll
-xmlsec==1.3.13
+xblocks-contrib==0.1.0
+    # via
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
+xmlsec==1.3.14
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   python3-saml
@@ -2276,13 +2297,13 @@ xss-utils==0.6.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-yarl==1.9.4
+yarl==1.18.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   pact-python
-zipp==3.20.0
+zipp==3.21.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.in b/requirements/edx/doc.in
index 013bafc42ec0..78afbf9d6bd0 100644
--- a/requirements/edx/doc.in
+++ b/requirements/edx/doc.in
@@ -10,3 +10,4 @@ sphinx-design             # provides various responsive web-components
 sphinxcontrib-openapi[markdown] # Be able to render openapi schema in a sphinx project
 sphinxext-rediraffe       # Quickly and easily redirect when we move pages around.
 sphinx-reredirects        # Redirect from a sphinx project out to other places on the web including other sphinx projects
+sphinx-autoapi
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 38460c744da7..f715e876d7f6 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -8,18 +8,18 @@
     # via -r requirements/edx/base.txt
 accessible-pygments==0.0.5
     # via pydata-sphinx-theme
-acid-xblock==0.3.1
+acid-xblock==0.4.1
     # via -r requirements/edx/base.txt
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.4
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.11
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
     #   openai
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
@@ -29,7 +29,7 @@ algoliasearch==3.0.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-amqp==5.2.0
+amqp==5.3.1
     # via
     #   -r requirements/edx/base.txt
     #   kombu
@@ -57,7 +57,11 @@ asn1crypto==1.5.1
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
-attrs==24.2.0
+astroid==2.13.5
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   sphinx-autoapi
+attrs==24.3.0
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
@@ -78,20 +82,21 @@ backoff==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via
     #   -r requirements/edx/base.txt
     #   paramiko
 beautifulsoup4==4.12.3
     # via
     #   -r requirements/edx/base.txt
+    #   openedx-forum
     #   pydata-sphinx-theme
     #   pynliner
-billiard==4.2.0
+billiard==4.2.1
     # via
     #   -r requirements/edx/base.txt
     #   celery
-bleach[css]==6.1.0
+bleach[css]==6.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -102,20 +107,20 @@ bleach[css]==6.1.0
     #   xblock-poll
 boto==2.49.0
     # via -r requirements/edx/base.txt
-boto3==1.35.1
+boto3==1.35.93
     # via
     #   -r requirements/edx/base.txt
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.35.1
+botocore==1.35.93
     # via
     #   -r requirements/edx/base.txt
     #   boto3
     #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/base.txt
-cachecontrol==0.14.0
+cachecontrol==0.14.1
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
@@ -123,7 +128,7 @@ cachetools==5.5.0
     # via
     #   -r requirements/edx/base.txt
     #   google-auth
-camel-converter[pydantic]==3.1.2
+camel-converter[pydantic]==4.0.1
     # via
     #   -r requirements/edx/base.txt
     #   meilisearch
@@ -137,14 +142,14 @@ celery==5.4.0
     #   edx-enterprise
     #   event-tracking
     #   openedx-learning
-certifi==2024.7.4
+certifi==2024.12.14
     # via
     #   -r requirements/edx/base.txt
     #   elasticsearch
     #   py2neo
     #   requests
     #   snowflake-connector-python
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   -r requirements/edx/base.txt
     #   cryptography
@@ -186,7 +191,7 @@ click-repl==0.3.0
     # via
     #   -r requirements/edx/base.txt
     #   celery
-code-annotations==1.8.0
+code-annotations==2.1.0
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/doc.in
@@ -194,9 +199,9 @@ code-annotations==1.8.0
     #   edx-toggles
 codejail-includes==1.0.0
     # via -r requirements/edx/base.txt
-crowdsourcehinter-xblock==0.7
+crowdsourcehinter-xblock==0.8
     # via -r requirements/edx/base.txt
-cryptography==42.0.8
+cryptography==44.0.0
     # via
     #   -r requirements/edx/base.txt
     #   django-fernet-fields-v2
@@ -213,7 +218,7 @@ cssutils==2.11.1
     # via
     #   -r requirements/edx/base.txt
     #   pynliner
-deepmerge==1.1.1
+deepmerge==2.0
     # via sphinxcontrib-openapi
 defusedxml==0.7.1
     # via
@@ -222,7 +227,7 @@ defusedxml==0.7.1
     #   ora2
     #   python3-openid
     #   social-auth-core
-django==4.2.15
+django==4.2.17
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -288,6 +293,7 @@ django==4.2.15
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   social-auth-app-django
@@ -298,7 +304,7 @@ django-appconf==1.0.6
     # via
     #   -r requirements/edx/base.txt
     #   django-statici18n
-django-cache-memoize==0.2.0
+django-cache-memoize==0.2.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -314,7 +320,7 @@ django-config-models==2.7.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.4.0
+django-cors-headers==4.6.0
     # via -r requirements/edx/base.txt
 django-countries==7.6.1
     # via
@@ -343,13 +349,13 @@ django-ipware==7.0.1
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-django-js-asset==2.2.0
+django-js-asset==3.0.1
     # via
     #   -r requirements/edx/base.txt
     #   django-mptt
 django-method-override==1.0.4
     # via -r requirements/edx/base.txt
-django-model-utils==4.5.1
+django-model-utils==5.0.0
     # via
     #   -r requirements/edx/base.txt
     #   django-user-tasks
@@ -375,18 +381,18 @@ django-multi-email-field==0.7.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-mysql==4.14.0
+django-mysql==4.15.0
     # via -r requirements/edx/base.txt
 django-oauth-toolkit==1.7.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-object-actions==4.2.0
+django-object-actions==4.3.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-pipeline==3.1.0
+django-pipeline==4.0.0
     # via -r requirements/edx/base.txt
 django-push-notifications==3.1.0
     # via
@@ -398,7 +404,7 @@ django-sekizai==4.1.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-django-wiki
-django-ses==4.1.0
+django-ses==4.3.1
     # via -r requirements/edx/base.txt
 django-simple-history==3.4.0
     # via
@@ -409,12 +415,13 @@ django-simple-history==3.4.0
     #   edx-organizations
     #   edx-proctoring
     #   ora2
-django-statici18n==2.5.0
+django-statici18n==2.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
+    #   xblocks-contrib
 django-storages==1.14.3
     # via
     #   -c requirements/edx/../constraints.txt
@@ -422,7 +429,7 @@ django-storages==1.14.3
     #   edxval
 django-user-tasks==3.2.0
     # via -r requirements/edx/base.txt
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -452,6 +459,7 @@ djangorestframework==3.14.0
     #   edx-organizations
     #   edx-proctoring
     #   edx-submissions
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   super-csv
@@ -459,7 +467,7 @@ djangorestframework-xml==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-dnspython==2.6.1
+dnspython==2.7.0
     # via
     #   -r requirements/edx/base.txt
     #   pymongo
@@ -468,26 +476,26 @@ docutils==0.21.2
     #   pydata-sphinx-theme
     #   sphinx
     #   sphinx-mdinclude
-done-xblock==2.3.0
+done-xblock==2.4.0
     # via -r requirements/edx/base.txt
 drf-jwt==1.19.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-drf-extensions
-drf-spectacular==0.27.2
+drf-spectacular==0.28.0
     # via -r requirements/edx/base.txt
-drf-yasg==1.21.7
+drf-yasg==1.21.8
     # via
     #   -r requirements/edx/base.txt
     #   django-user-tasks
     #   edx-api-doc-tools
-edx-ace==1.11.1
+edx-ace==1.11.3
     # via -r requirements/edx/base.txt
-edx-api-doc-tools==1.8.0
+edx-api-doc-tools==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-name-affirmation
-edx-auth-backends==4.3.0
+edx-auth-backends==4.4.0
     # via -r requirements/edx/base.txt
 edx-braze-client==0.2.5
     # via
@@ -497,7 +505,7 @@ edx-bulk-grades==1.1.0
     # via
     #   -r requirements/edx/base.txt
     #   staff-graded-xblock
-edx-ccx-keys==1.3.0
+edx-ccx-keys==2.0.2
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
@@ -507,9 +515,9 @@ edx-celeryutils==1.3.0
     #   -r requirements/edx/base.txt
     #   edx-name-affirmation
     #   super-csv
-edx-codejail==3.4.1
+edx-codejail==3.5.2
     # via -r requirements/edx/base.txt
-edx-completion==4.6.7
+edx-completion==4.7.8
     # via -r requirements/edx/base.txt
 edx-django-release-util==1.4.0
     # via
@@ -518,7 +526,7 @@ edx-django-release-util==1.4.0
     #   edxval
 edx-django-sites-extensions==4.2.0
     # via -r requirements/edx/base.txt
-edx-django-utils==5.15.0
+edx-django-utils==7.1.0
     # via
     #   -r requirements/edx/base.txt
     #   django-config-models
@@ -535,7 +543,7 @@ edx-django-utils==5.15.0
     #   openedx-events
     #   ora2
     #   super-csv
-edx-drf-extensions==10.3.0
+edx-drf-extensions==10.5.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-completion
@@ -547,24 +555,25 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.2
+edx-enterprise==5.5.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-edx-event-bus-kafka==5.8.1
+edx-event-bus-kafka==6.0.0
     # via -r requirements/edx/base.txt
-edx-event-bus-redis==0.5.0
+edx-event-bus-redis==0.5.1
     # via -r requirements/edx/base.txt
 edx-i18n-tools==1.5.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   ora2
+    #   xblocks-contrib
 edx-milestones==0.6.0
     # via -r requirements/edx/base.txt
-edx-name-affirmation==2.3.7
+edx-name-affirmation==3.0.1
     # via -r requirements/edx/base.txt
-edx-opaque-keys[django]==2.10.0
+edx-opaque-keys[django]==2.11.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-bulk-grades
@@ -581,24 +590,26 @@ edx-opaque-keys[django]==2.10.0
     #   ora2
 edx-organizations==6.13.0
     # via -r requirements/edx/base.txt
-edx-proctoring==4.18.1
+edx-proctoring==5.0.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-proctoring-proctortrack
-edx-rbac==1.9.0
+edx-rbac==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-edx-rest-api-client==5.7.1
+edx-rest-api-client==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.0.0
-    # via -r requirements/edx/base.txt
+edx-search==4.1.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   openedx-forum
 edx-sga==0.25.0
     # via -r requirements/edx/base.txt
-edx-submissions==3.7.7
+edx-submissions==3.8.4
     # via
     #   -r requirements/edx/base.txt
     #   ora2
@@ -624,13 +635,15 @@ edx-when==2.5.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-proctoring
-edxval==2.5.0
+edxval==2.8.0
     # via -r requirements/edx/base.txt
-elasticsearch==7.13.4
+elasticsearch==7.9.1
     # via
     #   -c requirements/edx/../common_constraints.txt
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-search
+    #   openedx-forum
 enmerkar==0.7.1
     # via
     #   -r requirements/edx/base.txt
@@ -644,19 +657,19 @@ event-tracking==3.0.0
     #   edx-completion
     #   edx-proctoring
     #   edx-search
-fastavro==1.9.5
+fastavro==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-events
-filelock==3.15.4
+filelock==3.16.1
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
-firebase-admin==6.5.0
+firebase-admin==6.6.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-ace
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
@@ -675,15 +688,15 @@ future==1.0.0
     # via
     #   -r requirements/edx/base.txt
     #   pyjwkest
-geoip2==4.8.0
+geoip2==4.8.1
     # via -r requirements/edx/base.txt
-gitdb==4.0.11
+gitdb==4.0.12
     # via gitpython
-gitpython==3.1.43
+gitpython==3.1.44
     # via -r requirements/edx/doc.in
 glob2==0.7
     # via -r requirements/edx/base.txt
-google-api-core[grpc]==2.19.1
+google-api-core[grpc]==2.24.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
@@ -691,11 +704,11 @@ google-api-core[grpc]==2.19.1
     #   google-cloud-core
     #   google-cloud-firestore
     #   google-cloud-storage
-google-api-python-client==2.141.0
+google-api-python-client==2.157.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
-google-auth==2.34.0
+google-auth==2.37.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
@@ -713,15 +726,15 @@ google-cloud-core==2.4.1
     #   -r requirements/edx/base.txt
     #   google-cloud-firestore
     #   google-cloud-storage
-google-cloud-firestore==2.17.2
+google-cloud-firestore==2.19.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
-google-cloud-storage==2.18.2
+google-cloud-storage==2.19.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
-google-crc32c==1.5.0
+google-crc32c==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   google-cloud-storage
@@ -730,17 +743,17 @@ google-resumable-media==2.7.2
     # via
     #   -r requirements/edx/base.txt
     #   google-cloud-storage
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.66.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
     #   grpcio-status
-grpcio==1.65.5
+grpcio==1.69.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
     #   grpcio-status
-grpcio-status==1.65.5
+grpcio-status==1.69.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
@@ -757,9 +770,9 @@ httplib2==0.22.0
     #   -r requirements/edx/base.txt
     #   google-api-python-client
     #   google-auth-httplib2
-icalendar==5.0.13
+icalendar==6.1.0
     # via -r requirements/edx/base.txt
-idna==3.7
+idna==3.10
     # via
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
@@ -768,7 +781,7 @@ idna==3.7
     #   yarl
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==8.3.0
+importlib-metadata==8.5.0
     # via -r requirements/edx/base.txt
 inflection==0.5.1
     # via
@@ -781,15 +794,16 @@ interchange==2021.0.4
     #   py2neo
 ipaddress==1.0.23
     # via -r requirements/edx/base.txt
-isodate==0.6.1
+isodate==0.7.2
     # via
     #   -r requirements/edx/base.txt
     #   python3-saml
-jinja2==3.1.4
+jinja2==3.1.5
     # via
     #   -r requirements/edx/base.txt
     #   code-annotations
     #   sphinx
+    #   sphinx-autoapi
 jmespath==1.0.1
     # via
     #   -r requirements/edx/base.txt
@@ -799,7 +813,7 @@ joblib==1.4.2
     # via
     #   -r requirements/edx/base.txt
     #   nltk
-jsondiff==2.2.0
+jsondiff==2.2.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -818,7 +832,7 @@ jsonschema==4.23.0
     #   drf-spectacular
     #   optimizely-sdk
     #   sphinxcontrib-openapi
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
@@ -827,7 +841,7 @@ jwcrypto==1.5.6
     #   -r requirements/edx/base.txt
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.4.0
+kombu==5.4.2
     # via
     #   -r requirements/edx/base.txt
     #   celery
@@ -840,32 +854,36 @@ lazy==1.6
     #   lti-consumer-xblock
     #   ora2
     #   xblock
-libsass==0.10.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/base.txt
+lazy-object-proxy==1.10.0
+    # via astroid
 loremipsum==1.0.5
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-lti-consumer-xblock==9.11.3
-    # via -r requirements/edx/base.txt
-lxml==4.9.4
+lti-consumer-xblock==9.12.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
+lxml[html-clean]==5.3.0
+    # via
+    #   -r requirements/edx/base.txt
     #   edx-i18n-tools
     #   edxval
     #   lti-consumer-xblock
+    #   lxml-html-clean
     #   olxcleaner
     #   openedx-calc
     #   ora2
     #   python3-saml
     #   xblock
     #   xmlsec
+lxml-html-clean==0.4.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   lxml
 mailsnake==1.6.4
     # via -r requirements/edx/base.txt
-mako==1.3.5
+mako==1.3.8
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock
@@ -879,7 +897,7 @@ markdown==3.3.7
     #   openedx-django-wiki
     #   staff-graded-xblock
     #   xblock-poll
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   -r requirements/edx/base.txt
     #   chem
@@ -891,20 +909,20 @@ maxminddb==2.6.2
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
-meilisearch==0.31.4
-    # via -r requirements/edx/base.txt
-mistune==3.0.2
+meilisearch==0.33.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   edx-search
+mistune==3.1.0
     # via sphinx-mdinclude
-mock==5.1.0
-    # via -r requirements/edx/base.txt
-mongoengine==0.28.2
+mongoengine==0.29.1
     # via -r requirements/edx/base.txt
 monotonic==1.6
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
     #   py2neo
-more-itertools==10.4.0
+more-itertools==10.5.0
     # via
     #   -r requirements/edx/base.txt
     #   cssutils
@@ -912,22 +930,24 @@ mpmath==1.3.0
     # via
     #   -r requirements/edx/base.txt
     #   sympy
-msgpack==1.0.8
+msgpack==1.1.0
     # via
     #   -r requirements/edx/base.txt
     #   cachecontrol
-multidict==6.0.5
+multidict==6.1.0
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
     #   yarl
-mysqlclient==2.2.4
-    # via -r requirements/edx/base.txt
-newrelic==9.13.0
+mysqlclient==2.2.6
+    # via
+    #   -r requirements/edx/base.txt
+    #   openedx-forum
+newrelic==10.4.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
-nh3==0.2.18
+nh3==0.2.20
     # via -r requirements/edx/base.txt
 nltk==3.9.1
     # via
@@ -957,58 +977,63 @@ openai==0.28.1
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-openedx-atlas==0.6.1
-    # via -r requirements/edx/base.txt
-openedx-calc==3.1.0
+openedx-atlas==0.6.2
+    # via
+    #   -r requirements/edx/base.txt
+    #   openedx-forum
+openedx-calc==4.0.1
     # via -r requirements/edx/base.txt
-openedx-django-pyfs==3.6.0
+openedx-django-pyfs==3.7.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   xblock
+    #   xblocks-contrib
 openedx-django-require==2.1.0
     # via -r requirements/edx/base.txt
 openedx-django-wiki==2.1.0
     # via -r requirements/edx/base.txt
-openedx-events==9.12.0
+openedx-events==9.15.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
+    #   edx-name-affirmation
     #   event-tracking
     #   ora2
-openedx-filters==1.9.0
+openedx-filters==1.12.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.11.2
+openedx-forum==0.1.5
+    # via -r requirements/edx/base.txt
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-openedx-mongodbproxy==0.2.1
+openedx-mongodbproxy==0.2.2
     # via -r requirements/edx/base.txt
 optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-ora2==6.11.2
+ora2==6.14.3
     # via -r requirements/edx/base.txt
-packaging==24.1
+packaging==24.2
     # via
     #   -r requirements/edx/base.txt
     #   drf-yasg
     #   gunicorn
     #   py2neo
-    #   pydata-sphinx-theme
     #   snowflake-connector-python
     #   sphinx
-pansi==2020.7.3
+pansi==2024.11.0
     # via
     #   -r requirements/edx/base.txt
     #   py2neo
-paramiko==3.4.1
+paramiko==3.5.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1024,9 +1049,7 @@ path-py==12.5.0
     #   edx-enterprise
     #   ora2
     #   staff-graded-xblock
-paver==1.3.4
-    # via -r requirements/edx/base.txt
-pbr==6.0.0
+pbr==6.1.0
     # via
     #   -r requirements/edx/base.txt
     #   stevedore
@@ -1038,13 +1061,14 @@ picobox==4.0.0
     # via sphinxcontrib-openapi
 piexif==1.1.3
     # via -r requirements/edx/base.txt
-pillow==10.4.0
+pillow==11.1.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-organizations
     #   edxval
-platformdirs==4.2.2
+    #   pansi
+platformdirs==4.3.6
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
@@ -1052,16 +1076,21 @@ polib==1.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-i18n-tools
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via
     #   -r requirements/edx/base.txt
     #   click-repl
-proto-plus==1.24.0
+propcache==0.2.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   aiohttp
+    #   yarl
+proto-plus==1.25.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
     #   google-cloud-firestore
-protobuf==5.27.3
+protobuf==5.29.2
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
@@ -1069,7 +1098,7 @@ protobuf==5.27.3
     #   googleapis-common-protos
     #   grpcio-status
     #   proto-plus
-psutil==6.0.0
+psutil==6.1.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -1077,13 +1106,13 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   -r requirements/edx/base.txt
     #   pgpy
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via
     #   -r requirements/edx/base.txt
     #   google-auth
@@ -1093,23 +1122,23 @@ pycparser==2.22
     # via
     #   -r requirements/edx/base.txt
     #   cffi
-pycryptodomex==3.20.0
+pycryptodomex==3.21.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-pydantic==2.8.2
+pydantic==2.10.4
     # via
     #   -r requirements/edx/base.txt
     #   camel-converter
-pydantic-core==2.20.1
+pydantic-core==2.27.2
     # via
     #   -r requirements/edx/base.txt
     #   pydantic
-pydata-sphinx-theme==0.15.4
+pydata-sphinx-theme==0.16.1
     # via sphinx-book-theme
-pygments==2.18.0
+pygments==2.19.1
     # via
     #   -r requirements/edx/base.txt
     #   accessible-pygments
@@ -1122,7 +1151,7 @@ pyjwkest==1.4.2
     #   -r requirements/edx/base.txt
     #   edx-token-utils
     #   lti-consumer-xblock
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.1
     # via
     #   -r requirements/edx/base.txt
     #   drf-jwt
@@ -1149,6 +1178,7 @@ pymongo==4.4.0
     #   edx-opaque-keys
     #   event-tracking
     #   mongoengine
+    #   openedx-forum
     #   openedx-mongodbproxy
 pynacl==1.5.0
     # via
@@ -1157,12 +1187,12 @@ pynacl==1.5.0
     #   paramiko
 pynliner==0.8.0
     # via -r requirements/edx/base.txt
-pyopenssl==24.2.1
+pyopenssl==24.3.0
     # via
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
     #   snowflake-connector-python
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via
     #   -r requirements/edx/base.txt
     #   chem
@@ -1193,8 +1223,6 @@ python-ipware==3.0.0
     # via
     #   -r requirements/edx/base.txt
     #   django-ipware
-python-memcached==1.62
-    # via -r requirements/edx/base.txt
 python-slugify==8.0.4
     # via
     #   -r requirements/edx/base.txt
@@ -1209,10 +1237,9 @@ python3-openid==3.2.0 ; python_version >= "3"
     #   social-auth-core
 python3-saml==1.16.0
     # via -r requirements/edx/base.txt
-pytz==2024.1
+pytz==2024.2
     # via
     #   -r requirements/edx/base.txt
-    #   django-ses
     #   djangorestframework
     #   drf-yasg
     #   edx-completion
@@ -1222,7 +1249,6 @@ pytz==2024.1
     #   edx-tincan-py35
     #   event-tracking
     #   fs
-    #   icalendar
     #   interchange
     #   olxcleaner
     #   ora2
@@ -1239,13 +1265,14 @@ pyyaml==6.0.2
     #   edx-django-release-util
     #   edx-i18n-tools
     #   jsondiff
+    #   sphinx-autoapi
     #   sphinxcontrib-openapi
     #   xblock
 random2==1.0.2
     # via -r requirements/edx/base.txt
-recommender-xblock==2.2.0
+recommender-xblock==3.0.0
     # via -r requirements/edx/base.txt
-redis==5.0.8
+redis==5.2.1
     # via
     #   -r requirements/edx/base.txt
     #   walrus
@@ -1254,7 +1281,7 @@ referencing==0.35.1
     #   -r requirements/edx/base.txt
     #   jsonschema
     #   jsonschema-specifications
-regex==2024.7.24
+regex==2024.11.6
     # via
     #   -r requirements/edx/base.txt
     #   nltk
@@ -1275,6 +1302,7 @@ requests==2.32.3
     #   mailsnake
     #   meilisearch
     #   openai
+    #   openedx-forum
     #   optimizely-sdk
     #   pyjwkest
     #   pylti1p3
@@ -1290,7 +1318,7 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   social-auth-core
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
@@ -1299,13 +1327,13 @@ rsa==4.9
     # via
     #   -r requirements/edx/base.txt
     #   google-auth
-rules==3.4
+rules==3.5
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
     #   openedx-learning
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via
     #   -r requirements/edx/base.txt
     #   boto3
@@ -1313,7 +1341,7 @@ sailthru-client==2.2.3
     # via
     #   -r requirements/edx/base.txt
     #   edx-ace
-scipy==1.14.0
+scipy==1.15.0
     # via
     #   -r requirements/edx/base.txt
     #   chem
@@ -1331,11 +1359,10 @@ simplejson==3.19.3
     #   super-csv
     #   xblock
     #   xblock-utils
-six==1.16.0
+six==1.17.0
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
-    #   bleach
     #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
@@ -1350,11 +1377,7 @@ six==1.16.0
     #   fs-s3fs
     #   html5lib
     #   interchange
-    #   isodate
-    #   libsass
     #   optimizely-sdk
-    #   pansi
-    #   paver
     #   py2neo
     #   pyjwkest
     #   python-dateutil
@@ -1364,12 +1387,11 @@ slumber==0.7.1
     #   -r requirements/edx/base.txt
     #   edx-bulk-grades
     #   edx-enterprise
-    #   edx-rest-api-client
-smmap==5.0.1
+smmap==5.0.2
     # via gitdb
 snowballstemmer==2.2.0
     # via sphinx
-snowflake-connector-python==3.12.0
+snowflake-connector-python==3.12.4
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1383,7 +1405,7 @@ social-auth-core==4.5.4
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
     #   social-auth-app-django
-sorl-thumbnail==12.10.0
+sorl-thumbnail==12.11.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-django-wiki
@@ -1395,10 +1417,11 @@ soupsieve==2.6
     # via
     #   -r requirements/edx/base.txt
     #   beautifulsoup4
-sphinx==8.0.2
+sphinx==8.1.3
     # via
     #   -r requirements/edx/doc.in
     #   pydata-sphinx-theme
+    #   sphinx-autoapi
     #   sphinx-book-theme
     #   sphinx-design
     #   sphinx-mdinclude
@@ -1406,6 +1429,8 @@ sphinx==8.0.2
     #   sphinxcontrib-httpdomain
     #   sphinxcontrib-openapi
     #   sphinxext-rediraffe
+sphinx-autoapi==3.4.0
+    # via -r requirements/edx/doc.in
 sphinx-book-theme==1.1.3
     # via -r requirements/edx/doc.in
 sphinx-design==0.6.1
@@ -1432,13 +1457,13 @@ sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 sphinxext-rediraffe==0.2.7
     # via -r requirements/edx/doc.in
-sqlparse==0.5.1
+sqlparse==0.5.3
     # via
     #   -r requirements/edx/base.txt
     #   django
 staff-graded-xblock==2.3.0
     # via -r requirements/edx/base.txt
-stevedore==5.2.0
+stevedore==5.4.0
     # via
     #   -r requirements/edx/base.txt
     #   code-annotations
@@ -1450,7 +1475,7 @@ super-csv==3.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-bulk-grades
-sympy==1.13.2
+sympy==1.13.3
     # via
     #   -r requirements/edx/base.txt
     #   openedx-calc
@@ -1462,7 +1487,7 @@ text-unidecode==1.3
     # via
     #   -r requirements/edx/base.txt
     #   python-slugify
-tinycss2==1.2.1
+tinycss2==1.4.0
     # via
     #   -r requirements/edx/base.txt
     #   bleach
@@ -1470,7 +1495,7 @@ tomlkit==0.13.2
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
-tqdm==4.66.5
+tqdm==4.67.1
     # via
     #   -r requirements/edx/base.txt
     #   nltk
@@ -1486,10 +1511,12 @@ typing-extensions==4.12.2
     #   pydata-sphinx-theme
     #   pylti1p3
     #   snowflake-connector-python
-tzdata==2024.1
+tzdata==2024.2
     # via
     #   -r requirements/edx/base.txt
     #   celery
+    #   icalendar
+    #   kombu
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/base.txt
@@ -1500,9 +1527,9 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.19
+urllib3==2.2.3
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   botocore
     #   elasticsearch
@@ -1524,8 +1551,6 @@ walrus==0.9.4
     # via
     #   -r requirements/edx/base.txt
     #   edx-event-bus-redis
-watchdog==4.0.2
-    # via -r requirements/edx/base.txt
 wcwidth==0.2.13
     # via
     #   -r requirements/edx/base.txt
@@ -1544,12 +1569,18 @@ webencodings==0.5.1
     #   bleach
     #   html5lib
     #   tinycss2
-webob==1.8.8
+webob==1.8.9
     # via
     #   -r requirements/edx/base.txt
     #   xblock
-wrapt==1.16.0
-    # via -r requirements/edx/base.txt
+wheel==0.45.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   django-pipeline
+wrapt==1.17.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   astroid
 xblock[django]==5.1.0
     # via
     #   -r requirements/edx/base.txt
@@ -1565,6 +1596,7 @@ xblock[django]==5.1.0
     #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-utils
+    #   xblocks-contrib
 xblock-drag-and-drop-v2==4.0.3
     # via -r requirements/edx/base.txt
 xblock-google-drive==0.7.0
@@ -1576,18 +1608,19 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xmlsec==1.3.13
+xblocks-contrib==0.1.0
+    # via -r requirements/edx/base.txt
+xmlsec==1.3.14
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   python3-saml
 xss-utils==0.6.0
     # via -r requirements/edx/base.txt
-yarl==1.9.4
+yarl==1.18.3
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
-zipp==3.20.0
+zipp==3.21.0
     # via
     #   -r requirements/edx/base.txt
     #   importlib-metadata
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index a5b510742ac7..d2ec04314801 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -3,7 +3,6 @@
 -c ../constraints.txt
 
 -r github.in              # Forks and other dependencies not yet on PyPI
--r paver.txt              # Requirements for running paver commands
 
 # DON'T JUST ADD NEW DEPENDENCIES!!!
 # Please follow these guidelines whenever you change this file:
@@ -103,7 +102,7 @@ importlib_metadata                  # Used to access entry_points in i18n_api pl
 jsonfield                           # Django model field for validated JSON; used in several apps
 laboratory                          # Library for testing that code refactors/infrastructure changes produce identical results
 importlib_metadata                  # Used to access entry_points in i18n_api plugin
-lxml                                # XML parser
+lxml[html_clean]                    # XML parser
 lti-consumer-xblock>=7.3.0
 mako                                # Primary template language used for server-side page rendering
 Markdown                            # Convert text markup to HTML; used in capa problems, forums, and course wikis
@@ -119,12 +118,14 @@ openedx-calc                        # Library supporting mathematical calculatio
 openedx-django-require
 openedx-events                      # Open edX Events from Hooks Extension Framework (OEP-50)
 openedx-filters                     # Open edX Filters from Hooks Extension Framework (OEP-50)
+openedx-forum                       # Open edX forum v2 application
 openedx-learning                    # Open edX Learning core (experimental)
 openedx-mongodbproxy
 openedx-django-wiki
 path
 piexif                              # Exif image metadata manipulation, used in the profile_images app
 Pillow                              # Image manipulation library; used for course assets, profile images, invoice PDFs, etc.
+psutil                              # Library for retrieving information on running processes and system utilization
 pycountry
 pycryptodomex
 pyjwkest
@@ -132,6 +133,7 @@ pyjwkest
 # PyJWT 1.6.3 contains PyJWTError, which is required by Apple auth in social-auth-core
 PyJWT>=1.6.3
 pylti1p3                            # Required by content_libraries core library to support LTI 1.3 launches
+pymemcache                          # Python interface to the memcached memory cache daemon
 pymongo                             # MongoDB driver
 pynliner                            # Inlines CSS styles into HTML for email notifications
 python-dateutil
@@ -158,5 +160,6 @@ unicodecsv                          # Easier support for CSV files with unicode
 user-util                           # Functionality for retiring users (GDPR compliance)
 webob
 web-fragments                       # Provides the ability to render fragments of web pages
+wrapt                               # Better functools.wrapped. TODO: functools has since improved, maybe we can switch?
 XBlock[django]                      # Courseware component architecture
 xss-utils                           # https://github.com/openedx/edx-platform/pull/20633 Fix XSS via Translations
diff --git a/requirements/edx/paver.in b/requirements/edx/paver.in
deleted file mode 100644
index 6987ede82275..000000000000
--- a/requirements/edx/paver.in
+++ /dev/null
@@ -1,27 +0,0 @@
-# Requirements to run and test Paver
-#
-# DON'T JUST ADD NEW DEPENDENCIES!!!
-#
-# If you open a pull request that adds a new dependency, you should:
-#   * verify that the dependency has a license compatible with AGPLv3
-#   * confirm that it has no system requirements beyond what we already install
-#   * run "make upgrade" to update the detailed requirements files
-#
-
--c ../constraints.txt
-
-edx-opaque-keys                     # Create and introspect course and xblock identities
-lazy                                # Lazily-evaluated attributes for Python objects
-libsass                             # Python bindings for the LibSass CSS compiler
-markupsafe                          # XML/HTML/XHTML Markup safe strings
-mock                                # Stub out code with mock objects and make assertions about how they have been used
-path                                # Easier manipulation of filesystem paths
-paver                               # Build, distribution and deployment scripting tool
-psutil                              # Library for retrieving information on running processes and system utilization
-pymongo                             # via edx-opaque-keys
-python-memcached                    # Python interface to the memcached memory cache daemon
-pymemcache                          # Python interface to the memcached memory cache daemon
-requests                            # Simple interface for making HTTP requests
-stevedore                           # Support for runtime plugins, used for XBlocks and edx-platform Django app plugins
-watchdog                            # Used in paver watch_assets
-wrapt                               # Decorator utilities used in the @timed paver task decorator
diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt
deleted file mode 100644
index faa0085f1631..000000000000
--- a/requirements/edx/paver.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
-#
-#    make upgrade
-#
-certifi==2024.7.4
-    # via requests
-charset-normalizer==2.0.12
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   requests
-dnspython==2.6.1
-    # via pymongo
-edx-opaque-keys==2.10.0
-    # via -r requirements/edx/paver.in
-idna==3.7
-    # via requests
-lazy==1.6
-    # via -r requirements/edx/paver.in
-libsass==0.10.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/paver.in
-markupsafe==2.1.5
-    # via -r requirements/edx/paver.in
-mock==5.1.0
-    # via -r requirements/edx/paver.in
-path==16.11.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/paver.in
-paver==1.3.4
-    # via -r requirements/edx/paver.in
-pbr==6.0.0
-    # via stevedore
-psutil==6.0.0
-    # via -r requirements/edx/paver.in
-pymemcache==4.0.0
-    # via -r requirements/edx/paver.in
-pymongo==4.4.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/paver.in
-    #   edx-opaque-keys
-python-memcached==1.62
-    # via -r requirements/edx/paver.in
-requests==2.32.3
-    # via -r requirements/edx/paver.in
-six==1.16.0
-    # via
-    #   libsass
-    #   paver
-stevedore==5.2.0
-    # via
-    #   -r requirements/edx/paver.in
-    #   edx-opaque-keys
-typing-extensions==4.12.2
-    # via edx-opaque-keys
-urllib3==1.26.19
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   requests
-watchdog==4.0.2
-    # via -r requirements/edx/paver.in
-wrapt==1.16.0
-    # via -r requirements/edx/paver.in
diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt
index 292f1319048d..d7386250db56 100644
--- a/requirements/edx/semgrep.txt
+++ b/requirements/edx/semgrep.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-attrs==24.2.0
+attrs==24.3.0
     # via
     #   glom
     #   jsonschema
@@ -15,9 +15,9 @@ boltons==21.0.0
     #   face
     #   glom
     #   semgrep
-bracex==2.5
+bracex==2.5.post1
     # via wcmatch
-certifi==2024.7.4
+certifi==2024.12.14
     # via requests
 charset-normalizer==2.0.12
     # via
@@ -34,52 +34,109 @@ colorama==0.4.6
     # via semgrep
 defusedxml==0.7.1
     # via semgrep
-face==22.0.0
+deprecated==1.2.15
+    # via
+    #   opentelemetry-api
+    #   opentelemetry-exporter-otlp-proto-http
+exceptiongroup==1.2.2
+    # via semgrep
+face==24.0.0
     # via glom
 glom==22.1.0
     # via semgrep
-idna==3.7
+googleapis-common-protos==1.66.0
+    # via opentelemetry-exporter-otlp-proto-http
+idna==3.10
     # via requests
+importlib-metadata==7.1.0
+    # via opentelemetry-api
 jsonschema==4.23.0
     # via semgrep
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via jsonschema
 markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-packaging==24.1
+opentelemetry-api==1.25.0
+    # via
+    #   opentelemetry-exporter-otlp-proto-http
+    #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-requests
+    #   opentelemetry-sdk
+    #   opentelemetry-semantic-conventions
+    #   semgrep
+opentelemetry-exporter-otlp-proto-common==1.25.0
+    # via opentelemetry-exporter-otlp-proto-http
+opentelemetry-exporter-otlp-proto-http==1.25.0
+    # via semgrep
+opentelemetry-instrumentation==0.46b0
+    # via opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-requests==0.46b0
+    # via semgrep
+opentelemetry-proto==1.25.0
+    # via
+    #   opentelemetry-exporter-otlp-proto-common
+    #   opentelemetry-exporter-otlp-proto-http
+opentelemetry-sdk==1.25.0
+    # via
+    #   opentelemetry-exporter-otlp-proto-http
+    #   semgrep
+opentelemetry-semantic-conventions==0.46b0
+    # via
+    #   opentelemetry-instrumentation-requests
+    #   opentelemetry-sdk
+opentelemetry-util-http==0.46b0
+    # via opentelemetry-instrumentation-requests
+packaging==24.2
     # via semgrep
-peewee==3.17.6
+peewee==3.17.8
     # via semgrep
-pygments==2.18.0
+protobuf==4.25.5
+    # via
+    #   googleapis-common-protos
+    #   opentelemetry-proto
+pygments==2.19.1
     # via rich
 referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
 requests==2.32.3
+    # via
+    #   opentelemetry-exporter-otlp-proto-http
+    #   semgrep
+rich==13.5.3
     # via semgrep
-rich==13.7.1
-    # via semgrep
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.17.40
+ruamel-yaml==0.18.10
     # via semgrep
-ruamel-yaml-clib==0.2.8
+ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
-semgrep==1.52.0
+semgrep==1.101.0
     # via -r requirements/edx/semgrep.in
-tomli==2.0.1
+tomli==2.0.2
     # via semgrep
 typing-extensions==4.12.2
-    # via semgrep
-urllib3==1.26.19
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   opentelemetry-sdk
+    #   semgrep
+urllib3==2.2.3
+    # via
+    #   -c requirements/edx/../common_constraints.txt
     #   requests
     #   semgrep
 wcmatch==8.5.2
     # via semgrep
+wrapt==1.17.0
+    # via
+    #   deprecated
+    #   opentelemetry-instrumentation
+zipp==3.21.0
+    # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
index b903768f4de6..cf57aeb0fc46 100644
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -28,6 +28,7 @@ freezegun                 # Allows tests to mock the output of assorted datetime
 httpretty                 # Library for mocking HTTP requests, used in many tests
 import-linter             # Tool for making assertions about which modules can import which others
 isort                     # For checking and fixing the order of imports
+mock                      # Deprecated alias to standard library `unittest.mock`
 pycodestyle               # Checker for compliance with the Python style guide (PEP 8)
 polib                     # Library for manipulating gettext translation files, used to test paver i18n commands
 pyquery                   # jQuery-like API for retrieving fragments of HTML and XML files in tests
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 0d02245b4006..f6ad62bf0d5d 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -6,18 +6,18 @@
 #
 -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack
     # via -r requirements/edx/base.txt
-acid-xblock==0.3.1
+acid-xblock==0.4.1
     # via -r requirements/edx/base.txt
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.4
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.11
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
     #   openai
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
@@ -25,7 +25,7 @@ algoliasearch==3.0.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-amqp==5.2.0
+amqp==5.3.1
     # via
     #   -r requirements/edx/base.txt
     #   kombu
@@ -39,7 +39,7 @@ annotated-types==0.7.0
     # via
     #   -r requirements/edx/base.txt
     #   pydantic
-anyio==4.4.0
+anyio==4.8.0
     # via starlette
 appdirs==1.4.4
     # via
@@ -57,9 +57,10 @@ asn1crypto==1.5.1
     #   snowflake-connector-python
 astroid==2.13.5
     # via
+    #   -c requirements/edx/../constraints.txt
     #   pylint
     #   pylint-celery
-attrs==24.2.0
+attrs==24.3.0
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
@@ -78,7 +79,7 @@ backoff==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via
     #   -r requirements/edx/base.txt
     #   paramiko
@@ -86,12 +87,13 @@ beautifulsoup4==4.12.3
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
+    #   openedx-forum
     #   pynliner
-billiard==4.2.0
+billiard==4.2.1
     # via
     #   -r requirements/edx/base.txt
     #   celery
-bleach[css]==6.1.0
+bleach[css]==6.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -102,20 +104,20 @@ bleach[css]==6.1.0
     #   xblock-poll
 boto==2.49.0
     # via -r requirements/edx/base.txt
-boto3==1.35.1
+boto3==1.35.93
     # via
     #   -r requirements/edx/base.txt
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.35.1
+botocore==1.35.93
     # via
     #   -r requirements/edx/base.txt
     #   boto3
     #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/base.txt
-cachecontrol==0.14.0
+cachecontrol==0.14.1
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
@@ -124,7 +126,7 @@ cachetools==5.5.0
     #   -r requirements/edx/base.txt
     #   google-auth
     #   tox
-camel-converter[pydantic]==3.1.2
+camel-converter[pydantic]==4.0.1
     # via
     #   -r requirements/edx/base.txt
     #   meilisearch
@@ -138,14 +140,14 @@ celery==5.4.0
     #   edx-enterprise
     #   event-tracking
     #   openedx-learning
-certifi==2024.7.4
+certifi==2024.12.14
     # via
     #   -r requirements/edx/base.txt
     #   elasticsearch
     #   py2neo
     #   requests
     #   snowflake-connector-python
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   -r requirements/edx/base.txt
     #   cryptography
@@ -198,7 +200,7 @@ click-repl==0.3.0
     # via
     #   -r requirements/edx/base.txt
     #   celery
-code-annotations==1.8.0
+code-annotations==2.1.0
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
@@ -209,13 +211,13 @@ codejail-includes==1.0.0
     # via -r requirements/edx/base.txt
 colorama==0.4.6
     # via tox
-coverage[toml]==7.6.1
+coverage[toml]==7.6.10
     # via
     #   -r requirements/edx/coverage.txt
     #   pytest-cov
-crowdsourcehinter-xblock==0.7
+crowdsourcehinter-xblock==0.8
     # via -r requirements/edx/base.txt
-cryptography==42.0.8
+cryptography==44.0.0
     # via
     #   -r requirements/edx/base.txt
     #   django-fernet-fields-v2
@@ -245,13 +247,13 @@ defusedxml==0.7.1
     #   ora2
     #   python3-openid
     #   social-auth-core
-diff-cover==9.1.1
+diff-cover==9.2.1
     # via -r requirements/edx/coverage.txt
-dill==0.3.8
+dill==0.3.9
     # via pylint
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
-django==4.2.15
+django==4.2.17
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -317,6 +319,7 @@ django==4.2.15
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   social-auth-app-django
@@ -327,7 +330,7 @@ django-appconf==1.0.6
     # via
     #   -r requirements/edx/base.txt
     #   django-statici18n
-django-cache-memoize==0.2.0
+django-cache-memoize==0.2.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -343,7 +346,7 @@ django-config-models==2.7.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.4.0
+django-cors-headers==4.6.0
     # via -r requirements/edx/base.txt
 django-countries==7.6.1
     # via
@@ -372,13 +375,13 @@ django-ipware==7.0.1
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-django-js-asset==2.2.0
+django-js-asset==3.0.1
     # via
     #   -r requirements/edx/base.txt
     #   django-mptt
 django-method-override==1.0.4
     # via -r requirements/edx/base.txt
-django-model-utils==4.5.1
+django-model-utils==5.0.0
     # via
     #   -r requirements/edx/base.txt
     #   django-user-tasks
@@ -404,18 +407,18 @@ django-multi-email-field==0.7.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-mysql==4.14.0
+django-mysql==4.15.0
     # via -r requirements/edx/base.txt
 django-oauth-toolkit==1.7.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-object-actions==4.2.0
+django-object-actions==4.3.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-pipeline==3.1.0
+django-pipeline==4.0.0
     # via -r requirements/edx/base.txt
 django-push-notifications==3.1.0
     # via
@@ -427,7 +430,7 @@ django-sekizai==4.1.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-django-wiki
-django-ses==4.1.0
+django-ses==4.3.1
     # via -r requirements/edx/base.txt
 django-simple-history==3.4.0
     # via
@@ -438,12 +441,13 @@ django-simple-history==3.4.0
     #   edx-organizations
     #   edx-proctoring
     #   ora2
-django-statici18n==2.5.0
+django-statici18n==2.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   xblock-drag-and-drop-v2
     #   xblock-poll
+    #   xblocks-contrib
 django-storages==1.14.3
     # via
     #   -c requirements/edx/../constraints.txt
@@ -451,7 +455,7 @@ django-storages==1.14.3
     #   edxval
 django-user-tasks==3.2.0
     # via -r requirements/edx/base.txt
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -481,6 +485,7 @@ djangorestframework==3.14.0
     #   edx-organizations
     #   edx-proctoring
     #   edx-submissions
+    #   openedx-forum
     #   openedx-learning
     #   ora2
     #   super-csv
@@ -488,30 +493,30 @@ djangorestframework-xml==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-dnspython==2.6.1
+dnspython==2.7.0
     # via
     #   -r requirements/edx/base.txt
     #   pymongo
-done-xblock==2.3.0
+done-xblock==2.4.0
     # via -r requirements/edx/base.txt
 drf-jwt==1.19.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-drf-extensions
-drf-spectacular==0.27.2
+drf-spectacular==0.28.0
     # via -r requirements/edx/base.txt
-drf-yasg==1.21.7
+drf-yasg==1.21.8
     # via
     #   -r requirements/edx/base.txt
     #   django-user-tasks
     #   edx-api-doc-tools
-edx-ace==1.11.1
+edx-ace==1.11.3
     # via -r requirements/edx/base.txt
-edx-api-doc-tools==1.8.0
+edx-api-doc-tools==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-name-affirmation
-edx-auth-backends==4.3.0
+edx-auth-backends==4.4.0
     # via -r requirements/edx/base.txt
 edx-braze-client==0.2.5
     # via
@@ -521,7 +526,7 @@ edx-bulk-grades==1.1.0
     # via
     #   -r requirements/edx/base.txt
     #   staff-graded-xblock
-edx-ccx-keys==1.3.0
+edx-ccx-keys==2.0.2
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
@@ -531,9 +536,9 @@ edx-celeryutils==1.3.0
     #   -r requirements/edx/base.txt
     #   edx-name-affirmation
     #   super-csv
-edx-codejail==3.4.1
+edx-codejail==3.5.2
     # via -r requirements/edx/base.txt
-edx-completion==4.6.7
+edx-completion==4.7.8
     # via -r requirements/edx/base.txt
 edx-django-release-util==1.4.0
     # via
@@ -542,7 +547,7 @@ edx-django-release-util==1.4.0
     #   edxval
 edx-django-sites-extensions==4.2.0
     # via -r requirements/edx/base.txt
-edx-django-utils==5.15.0
+edx-django-utils==7.1.0
     # via
     #   -r requirements/edx/base.txt
     #   django-config-models
@@ -559,7 +564,7 @@ edx-django-utils==5.15.0
     #   openedx-events
     #   ora2
     #   super-csv
-edx-drf-extensions==10.3.0
+edx-drf-extensions==10.5.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-completion
@@ -571,26 +576,27 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.2
+edx-enterprise==5.5.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-edx-event-bus-kafka==5.8.1
+edx-event-bus-kafka==6.0.0
     # via -r requirements/edx/base.txt
-edx-event-bus-redis==0.5.0
+edx-event-bus-redis==0.5.1
     # via -r requirements/edx/base.txt
 edx-i18n-tools==1.5.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   ora2
-edx-lint==5.3.7
+    #   xblocks-contrib
+edx-lint==5.4.1
     # via -r requirements/edx/testing.in
 edx-milestones==0.6.0
     # via -r requirements/edx/base.txt
-edx-name-affirmation==2.3.7
+edx-name-affirmation==3.0.1
     # via -r requirements/edx/base.txt
-edx-opaque-keys[django]==2.10.0
+edx-opaque-keys[django]==2.11.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-bulk-grades
@@ -607,24 +613,26 @@ edx-opaque-keys[django]==2.10.0
     #   ora2
 edx-organizations==6.13.0
     # via -r requirements/edx/base.txt
-edx-proctoring==4.18.1
+edx-proctoring==5.0.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-proctoring-proctortrack
-edx-rbac==1.9.0
+edx-rbac==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-edx-rest-api-client==5.7.1
+edx-rest-api-client==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.0.0
-    # via -r requirements/edx/base.txt
+edx-search==4.1.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   openedx-forum
 edx-sga==0.25.0
     # via -r requirements/edx/base.txt
-edx-submissions==3.7.7
+edx-submissions==3.8.4
     # via
     #   -r requirements/edx/base.txt
     #   ora2
@@ -650,13 +658,15 @@ edx-when==2.5.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-proctoring
-edxval==2.5.0
+edxval==2.8.0
     # via -r requirements/edx/base.txt
-elasticsearch==7.13.4
+elasticsearch==7.9.1
     # via
     #   -c requirements/edx/../common_constraints.txt
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-search
+    #   openedx-forum
 enmerkar==0.7.1
     # via
     #   -r requirements/edx/base.txt
@@ -674,27 +684,27 @@ execnet==2.1.1
     # via pytest-xdist
 factory-boy==3.3.1
     # via -r requirements/edx/testing.in
-faker==27.0.0
+faker==33.3.0
     # via factory-boy
-fastapi==0.112.1
+fastapi==0.115.6
     # via pact-python
-fastavro==1.9.5
+fastavro==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-events
-filelock==3.15.4
+filelock==3.16.1
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
     #   tox
     #   virtualenv
-firebase-admin==6.5.0
+firebase-admin==6.6.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-ace
 freezegun==1.5.1
     # via -r requirements/edx/testing.in
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
@@ -713,11 +723,11 @@ future==1.0.0
     # via
     #   -r requirements/edx/base.txt
     #   pyjwkest
-geoip2==4.8.0
+geoip2==4.8.1
     # via -r requirements/edx/base.txt
 glob2==0.7
     # via -r requirements/edx/base.txt
-google-api-core[grpc]==2.19.1
+google-api-core[grpc]==2.24.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
@@ -725,11 +735,11 @@ google-api-core[grpc]==2.19.1
     #   google-cloud-core
     #   google-cloud-firestore
     #   google-cloud-storage
-google-api-python-client==2.141.0
+google-api-python-client==2.157.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
-google-auth==2.34.0
+google-auth==2.37.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
@@ -747,15 +757,15 @@ google-cloud-core==2.4.1
     #   -r requirements/edx/base.txt
     #   google-cloud-firestore
     #   google-cloud-storage
-google-cloud-firestore==2.17.2
+google-cloud-firestore==2.19.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
-google-cloud-storage==2.18.2
+google-cloud-storage==2.19.0
     # via
     #   -r requirements/edx/base.txt
     #   firebase-admin
-google-crc32c==1.5.0
+google-crc32c==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   google-cloud-storage
@@ -764,19 +774,19 @@ google-resumable-media==2.7.2
     # via
     #   -r requirements/edx/base.txt
     #   google-cloud-storage
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.66.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
     #   grpcio-status
-grimp==3.4.1
+grimp==3.5
     # via import-linter
-grpcio==1.65.5
+grpcio==1.69.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
     #   grpcio-status
-grpcio-status==1.65.5
+grpcio-status==1.69.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
@@ -797,9 +807,9 @@ httplib2==0.22.0
     #   google-auth-httplib2
 httpretty==1.1.4
     # via -r requirements/edx/testing.in
-icalendar==5.0.13
+icalendar==6.1.0
     # via -r requirements/edx/base.txt
-idna==3.7
+idna==3.10
     # via
     #   -r requirements/edx/base.txt
     #   anyio
@@ -807,9 +817,9 @@ idna==3.7
     #   requests
     #   snowflake-connector-python
     #   yarl
-import-linter==2.0
+import-linter==2.1
     # via -r requirements/edx/testing.in
-importlib-metadata==8.3.0
+importlib-metadata==8.5.0
     # via -r requirements/edx/base.txt
 inflection==0.5.1
     # via
@@ -824,7 +834,7 @@ interchange==2021.0.4
     #   py2neo
 ipaddress==1.0.23
     # via -r requirements/edx/base.txt
-isodate==0.6.1
+isodate==0.7.2
     # via
     #   -r requirements/edx/base.txt
     #   python3-saml
@@ -832,7 +842,7 @@ isort==5.13.2
     # via
     #   -r requirements/edx/testing.in
     #   pylint
-jinja2==3.1.4
+jinja2==3.1.5
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/coverage.txt
@@ -847,7 +857,7 @@ joblib==1.4.2
     # via
     #   -r requirements/edx/base.txt
     #   nltk
-jsondiff==2.2.0
+jsondiff==2.2.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -865,7 +875,7 @@ jsonschema==4.23.0
     #   -r requirements/edx/base.txt
     #   drf-spectacular
     #   optimizely-sdk
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
@@ -874,7 +884,7 @@ jwcrypto==1.5.6
     #   -r requirements/edx/base.txt
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.4.0
+kombu==5.4.2
     # via
     #   -r requirements/edx/base.txt
     #   celery
@@ -889,23 +899,21 @@ lazy==1.6
     #   xblock
 lazy-object-proxy==1.10.0
     # via astroid
-libsass==0.10.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/base.txt
 loremipsum==1.0.5
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-lti-consumer-xblock==9.11.3
-    # via -r requirements/edx/base.txt
-lxml==4.9.4
+lti-consumer-xblock==9.12.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
+lxml[html-clean]==5.3.0
+    # via
+    #   -r requirements/edx/base.txt
     #   edx-i18n-tools
     #   edxval
     #   lti-consumer-xblock
+    #   lxml-html-clean
     #   olxcleaner
     #   openedx-calc
     #   ora2
@@ -913,9 +921,13 @@ lxml==4.9.4
     #   python3-saml
     #   xblock
     #   xmlsec
+lxml-html-clean==0.4.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   lxml
 mailsnake==1.6.4
     # via -r requirements/edx/base.txt
-mako==1.3.5
+mako==1.3.8
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock
@@ -929,7 +941,7 @@ markdown==3.3.7
     #   openedx-django-wiki
     #   staff-graded-xblock
     #   xblock-poll
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/coverage.txt
@@ -944,18 +956,20 @@ maxminddb==2.6.2
     #   geoip2
 mccabe==0.7.0
     # via pylint
-meilisearch==0.31.4
-    # via -r requirements/edx/base.txt
+meilisearch==0.33.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   edx-search
 mock==5.1.0
-    # via -r requirements/edx/base.txt
-mongoengine==0.28.2
+    # via -r requirements/edx/testing.in
+mongoengine==0.29.1
     # via -r requirements/edx/base.txt
 monotonic==1.6
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
     #   py2neo
-more-itertools==10.4.0
+more-itertools==10.5.0
     # via
     #   -r requirements/edx/base.txt
     #   cssutils
@@ -963,22 +977,24 @@ mpmath==1.3.0
     # via
     #   -r requirements/edx/base.txt
     #   sympy
-msgpack==1.0.8
+msgpack==1.1.0
     # via
     #   -r requirements/edx/base.txt
     #   cachecontrol
-multidict==6.0.5
+multidict==6.1.0
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
     #   yarl
-mysqlclient==2.2.4
-    # via -r requirements/edx/base.txt
-newrelic==9.13.0
+mysqlclient==2.2.6
+    # via
+    #   -r requirements/edx/base.txt
+    #   openedx-forum
+newrelic==10.4.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
-nh3==0.2.18
+nh3==0.2.20
     # via -r requirements/edx/base.txt
 nltk==3.9.1
     # via
@@ -1008,45 +1024,51 @@ openai==0.28.1
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-openedx-atlas==0.6.1
-    # via -r requirements/edx/base.txt
-openedx-calc==3.1.0
+openedx-atlas==0.6.2
+    # via
+    #   -r requirements/edx/base.txt
+    #   openedx-forum
+openedx-calc==4.0.1
     # via -r requirements/edx/base.txt
-openedx-django-pyfs==3.6.0
+openedx-django-pyfs==3.7.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   xblock
+    #   xblocks-contrib
 openedx-django-require==2.1.0
     # via -r requirements/edx/base.txt
 openedx-django-wiki==2.1.0
     # via -r requirements/edx/base.txt
-openedx-events==9.12.0
+openedx-events==9.15.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
+    #   edx-name-affirmation
     #   event-tracking
     #   ora2
-openedx-filters==1.9.0
+openedx-filters==1.12.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.11.2
+openedx-forum==0.1.5
+    # via -r requirements/edx/base.txt
+openedx-learning==0.18.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-openedx-mongodbproxy==0.2.1
+openedx-mongodbproxy==0.2.2
     # via -r requirements/edx/base.txt
 optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-ora2==6.11.2
+ora2==6.14.3
     # via -r requirements/edx/base.txt
-packaging==24.1
+packaging==24.2
     # via
     #   -r requirements/edx/base.txt
     #   drf-yasg
@@ -1056,13 +1078,13 @@ packaging==24.1
     #   pytest
     #   snowflake-connector-python
     #   tox
-pact-python==2.2.1
+pact-python==2.3.0
     # via -r requirements/edx/testing.in
-pansi==2020.7.3
+pansi==2024.11.0
     # via
     #   -r requirements/edx/base.txt
     #   py2neo
-paramiko==3.4.1
+paramiko==3.5.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1078,9 +1100,7 @@ path-py==12.5.0
     #   edx-enterprise
     #   ora2
     #   staff-graded-xblock
-paver==1.3.4
-    # via -r requirements/edx/base.txt
-pbr==6.0.0
+pbr==6.1.0
     # via
     #   -r requirements/edx/base.txt
     #   stevedore
@@ -1090,13 +1110,14 @@ pgpy==0.6.0
     #   edx-enterprise
 piexif==1.1.3
     # via -r requirements/edx/base.txt
-pillow==10.4.0
+pillow==11.1.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-organizations
     #   edxval
-platformdirs==4.2.2
+    #   pansi
+platformdirs==4.3.6
     # via
     #   -r requirements/edx/base.txt
     #   pylint
@@ -1114,16 +1135,21 @@ polib==1.2.0
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
     #   edx-i18n-tools
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via
     #   -r requirements/edx/base.txt
     #   click-repl
-proto-plus==1.24.0
+propcache==0.2.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   aiohttp
+    #   yarl
+proto-plus==1.25.0
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
     #   google-cloud-firestore
-protobuf==5.27.3
+protobuf==5.29.2
     # via
     #   -r requirements/edx/base.txt
     #   google-api-core
@@ -1131,7 +1157,7 @@ protobuf==5.27.3
     #   googleapis-common-protos
     #   grpcio-status
     #   proto-plus
-psutil==6.0.0
+psutil==6.1.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -1143,13 +1169,13 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   -r requirements/edx/base.txt
     #   pgpy
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via
     #   -r requirements/edx/base.txt
     #   google-auth
@@ -1163,22 +1189,22 @@ pycparser==2.22
     # via
     #   -r requirements/edx/base.txt
     #   cffi
-pycryptodomex==3.20.0
+pycryptodomex==3.21.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-pydantic==2.8.2
+pydantic==2.10.4
     # via
     #   -r requirements/edx/base.txt
     #   camel-converter
     #   fastapi
-pydantic-core==2.20.1
+pydantic-core==2.27.2
     # via
     #   -r requirements/edx/base.txt
     #   pydantic
-pygments==2.18.0
+pygments==2.19.1
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/coverage.txt
@@ -1189,7 +1215,7 @@ pyjwkest==1.4.2
     #   -r requirements/edx/base.txt
     #   edx-token-utils
     #   lti-consumer-xblock
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.1
     # via
     #   -r requirements/edx/base.txt
     #   drf-jwt
@@ -1234,6 +1260,7 @@ pymongo==4.4.0
     #   edx-opaque-keys
     #   event-tracking
     #   mongoengine
+    #   openedx-forum
     #   openedx-mongodbproxy
 pynacl==1.5.0
     # via
@@ -1242,20 +1269,20 @@ pynacl==1.5.0
     #   paramiko
 pynliner==0.8.0
     # via -r requirements/edx/base.txt
-pyopenssl==24.2.1
+pyopenssl==24.3.0
     # via
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
     #   snowflake-connector-python
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via
     #   -r requirements/edx/base.txt
     #   chem
     #   httplib2
     #   openedx-calc
-pyproject-api==1.7.1
+pyproject-api==1.8.0
     # via tox
-pyquery==2.0.0
+pyquery==2.0.1
     # via -r requirements/edx/testing.in
 pyrsistent==0.20.0
     # via
@@ -1265,7 +1292,7 @@ pysrt==1.1.2
     # via
     #   -r requirements/edx/base.txt
     #   edxval
-pytest==8.3.2
+pytest==8.3.4
     # via
     #   -r requirements/edx/testing.in
     #   pylint-pytest
@@ -1278,9 +1305,9 @@ pytest==8.3.2
     #   pytest-xdist
 pytest-attrib==0.1.3
     # via -r requirements/edx/testing.in
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r requirements/edx/testing.in
-pytest-django==4.8.0
+pytest-django==4.9.0
     # via -r requirements/edx/testing.in
 pytest-json-report==1.5.0
     # via -r requirements/edx/testing.in
@@ -1288,7 +1315,7 @@ pytest-metadata==1.8.0
     # via
     #   -r requirements/edx/testing.in
     #   pytest-json-report
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
     # via -r requirements/edx/testing.in
 pytest-xdist[psutil]==3.6.1
     # via -r requirements/edx/testing.in
@@ -1311,8 +1338,6 @@ python-ipware==3.0.0
     # via
     #   -r requirements/edx/base.txt
     #   django-ipware
-python-memcached==1.62
-    # via -r requirements/edx/base.txt
 python-slugify==8.0.4
     # via
     #   -r requirements/edx/base.txt
@@ -1327,10 +1352,9 @@ python3-openid==3.2.0 ; python_version >= "3"
     #   social-auth-core
 python3-saml==1.16.0
     # via -r requirements/edx/base.txt
-pytz==2024.1
+pytz==2024.2
     # via
     #   -r requirements/edx/base.txt
-    #   django-ses
     #   djangorestframework
     #   drf-yasg
     #   edx-completion
@@ -1340,7 +1364,6 @@ pytz==2024.1
     #   edx-tincan-py35
     #   event-tracking
     #   fs
-    #   icalendar
     #   interchange
     #   olxcleaner
     #   ora2
@@ -1360,9 +1383,9 @@ pyyaml==6.0.2
     #   xblock
 random2==1.0.2
     # via -r requirements/edx/base.txt
-recommender-xblock==2.2.0
+recommender-xblock==3.0.0
     # via -r requirements/edx/base.txt
-redis==5.0.8
+redis==5.2.1
     # via
     #   -r requirements/edx/base.txt
     #   walrus
@@ -1371,7 +1394,7 @@ referencing==0.35.1
     #   -r requirements/edx/base.txt
     #   jsonschema
     #   jsonschema-specifications
-regex==2024.7.24
+regex==2024.11.6
     # via
     #   -r requirements/edx/base.txt
     #   nltk
@@ -1392,6 +1415,7 @@ requests==2.32.3
     #   mailsnake
     #   meilisearch
     #   openai
+    #   openedx-forum
     #   optimizely-sdk
     #   pact-python
     #   pyjwkest
@@ -1407,7 +1431,7 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   social-auth-core
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
@@ -1416,13 +1440,13 @@ rsa==4.9
     # via
     #   -r requirements/edx/base.txt
     #   google-auth
-rules==3.4
+rules==3.5
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
     #   openedx-learning
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via
     #   -r requirements/edx/base.txt
     #   boto3
@@ -1430,7 +1454,7 @@ sailthru-client==2.2.3
     # via
     #   -r requirements/edx/base.txt
     #   edx-ace
-scipy==1.14.0
+scipy==1.15.0
     # via
     #   -r requirements/edx/base.txt
     #   chem
@@ -1450,11 +1474,10 @@ simplejson==3.19.3
     #   xblock-utils
 singledispatch==4.1.0
     # via -r requirements/edx/testing.in
-six==1.16.0
+six==1.17.0
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
-    #   bleach
     #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
@@ -1470,12 +1493,8 @@ six==1.16.0
     #   fs-s3fs
     #   html5lib
     #   interchange
-    #   isodate
-    #   libsass
     #   optimizely-sdk
     #   pact-python
-    #   pansi
-    #   paver
     #   py2neo
     #   pyjwkest
     #   python-dateutil
@@ -1484,10 +1503,9 @@ slumber==0.7.1
     #   -r requirements/edx/base.txt
     #   edx-bulk-grades
     #   edx-enterprise
-    #   edx-rest-api-client
 sniffio==1.3.1
     # via anyio
-snowflake-connector-python==3.12.0
+snowflake-connector-python==3.12.4
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1501,7 +1519,7 @@ social-auth-core==4.5.4
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
     #   social-auth-app-django
-sorl-thumbnail==12.10.0
+sorl-thumbnail==12.11.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-django-wiki
@@ -1513,15 +1531,15 @@ soupsieve==2.6
     # via
     #   -r requirements/edx/base.txt
     #   beautifulsoup4
-sqlparse==0.5.1
+sqlparse==0.5.3
     # via
     #   -r requirements/edx/base.txt
     #   django
 staff-graded-xblock==2.3.0
     # via -r requirements/edx/base.txt
-starlette==0.38.2
+starlette==0.41.3
     # via fastapi
-stevedore==5.2.0
+stevedore==5.4.0
     # via
     #   -r requirements/edx/base.txt
     #   code-annotations
@@ -1533,7 +1551,7 @@ super-csv==3.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-bulk-grades
-sympy==1.13.2
+sympy==1.13.3
     # via
     #   -r requirements/edx/base.txt
     #   openedx-calc
@@ -1546,7 +1564,7 @@ text-unidecode==1.3
     # via
     #   -r requirements/edx/base.txt
     #   python-slugify
-tinycss2==1.2.1
+tinycss2==1.4.0
     # via
     #   -r requirements/edx/base.txt
     #   bleach
@@ -1555,9 +1573,9 @@ tomlkit==0.13.2
     #   -r requirements/edx/base.txt
     #   pylint
     #   snowflake-connector-python
-tox==4.18.0
+tox==4.23.2
     # via -r requirements/edx/testing.in
-tqdm==4.66.5
+tqdm==4.67.1
     # via
     #   -r requirements/edx/base.txt
     #   nltk
@@ -1565,8 +1583,10 @@ tqdm==4.66.5
 typing-extensions==4.12.2
     # via
     #   -r requirements/edx/base.txt
+    #   anyio
     #   django-countries
     #   edx-opaque-keys
+    #   faker
     #   fastapi
     #   grimp
     #   import-linter
@@ -1575,10 +1595,12 @@ typing-extensions==4.12.2
     #   pydantic-core
     #   pylti1p3
     #   snowflake-connector-python
-tzdata==2024.1
+tzdata==2024.2
     # via
     #   -r requirements/edx/base.txt
     #   celery
+    #   icalendar
+    #   kombu
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/base.txt
@@ -1591,9 +1613,9 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.19
+urllib3==2.2.3
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   botocore
     #   elasticsearch
@@ -1601,7 +1623,7 @@ urllib3==1.26.19
     #   requests
 user-util==1.1.0
     # via -r requirements/edx/base.txt
-uvicorn==0.30.6
+uvicorn==0.34.0
     # via pact-python
 vine==5.1.0
     # via
@@ -1609,7 +1631,7 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.26.3
+virtualenv==20.28.1
     # via tox
 voluptuous==0.15.2
     # via
@@ -1619,8 +1641,6 @@ walrus==0.9.4
     # via
     #   -r requirements/edx/base.txt
     #   edx-event-bus-redis
-watchdog==4.0.2
-    # via -r requirements/edx/base.txt
 wcwidth==0.2.13
     # via
     #   -r requirements/edx/base.txt
@@ -1639,11 +1659,15 @@ webencodings==0.5.1
     #   bleach
     #   html5lib
     #   tinycss2
-webob==1.8.8
+webob==1.8.9
     # via
     #   -r requirements/edx/base.txt
     #   xblock
-wrapt==1.16.0
+wheel==0.45.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   django-pipeline
+wrapt==1.17.0
     # via
     #   -r requirements/edx/base.txt
     #   astroid
@@ -1662,6 +1686,7 @@ xblock[django]==5.1.0
     #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-utils
+    #   xblocks-contrib
 xblock-drag-and-drop-v2==4.0.3
     # via -r requirements/edx/base.txt
 xblock-google-drive==0.7.0
@@ -1673,19 +1698,20 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xmlsec==1.3.13
+xblocks-contrib==0.1.0
+    # via -r requirements/edx/base.txt
+xmlsec==1.3.14
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   python3-saml
 xss-utils==0.6.0
     # via -r requirements/edx/base.txt
-yarl==1.9.4
+yarl==1.18.3
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
     #   pact-python
-zipp==3.20.0
+zipp==3.21.0
     # via
     #   -r requirements/edx/base.txt
     #   importlib-metadata
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
index f7b35489c353..c5a5c5b6fea5 100644
--- a/requirements/pip-tools.txt
+++ b/requirements/pip-tools.txt
@@ -4,21 +4,21 @@
 #
 #    make upgrade
 #
-build==1.2.1
+build==1.2.2.post1
     # via pip-tools
 click==8.1.6
     # via
     #   -c requirements/constraints.txt
     #   pip-tools
-packaging==24.1
+packaging==24.2
     # via build
 pip-tools==7.4.1
     # via -r requirements/pip-tools.in
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
-wheel==0.44.0
+wheel==0.45.1
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/pip.txt b/requirements/pip.txt
index f0cf3d109992..ea16b6b4de8b 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -4,11 +4,13 @@
 #
 #    make upgrade
 #
-wheel==0.44.0
+wheel==0.45.1
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
-    # via -r requirements/pip.in
-setuptools==73.0.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   -r requirements/pip.in
+setuptools==75.7.0
     # via -r requirements/pip.in
diff --git a/scripts/compile_sass.py b/scripts/compile_sass.py
index ec1efee24d2b..14b84d003af6 100755
--- a/scripts/compile_sass.py
+++ b/scripts/compile_sass.py
@@ -352,18 +352,6 @@ def compile_sass_dir(
                     repo / "lms" / "static" / "sass",
                 ],
             )
-            compile_sass_dir(
-                "Compiling built-in XBlock Sass for default LMS",
-                repo / "xmodule" / "assets",
-                repo / "lms" / "static" / "css",
-                includes=[
-                    *common_includes,
-                    repo / "lms" / "static" / "sass" / "partials",
-                    repo / "cms" / "static" / "sass" / "partials",
-                    repo / "lms" / "static" / "sass",
-                    repo / "cms" / "static" / "sass",
-                ],
-            )
         if not skip_cms:
             compile_sass_dir(
                 "Compiling default CMS Sass",
@@ -376,18 +364,6 @@ def compile_sass_dir(
                     repo / "cms" / "static" / "sass",
                 ],
             )
-            compile_sass_dir(
-                "Compiling built-in XBlock Sass for default CMS",
-                repo / "xmodule" / "assets",
-                repo / "cms" / "static" / "css",
-                includes=[
-                    *common_includes,
-                    repo / "lms" / "static" / "sass" / "partials",
-                    repo / "cms" / "static" / "sass" / "partials",
-                    repo / "lms" / "static" / "sass",
-                    repo / "cms" / "static" / "sass",
-                ],
-            )
         click.secho(f"Done compiling default Sass!", fg="cyan", bold=True)
         click.echo()
 
@@ -429,20 +405,6 @@ def compile_sass_dir(
                 ],
                 tolerate_missing=True,
             )
-            compile_sass_dir(
-                "Compiling built-in XBlock Sass for themed LMS",
-                repo / "xmodule" / "assets",
-                theme / "lms" / "static" / "css",
-                includes=[
-                    *common_includes,
-                    theme / "lms" / "static" / "sass" / "partials",
-                    theme / "cms" / "static" / "sass" / "partials",
-                    repo / "lms" / "static" / "sass" / "partials",
-                    repo / "cms" / "static" / "sass" / "partials",
-                    repo / "lms" / "static" / "sass",
-                    repo / "cms" / "static" / "sass",
-                ],
-            )
         if not skip_cms:
             compile_sass_dir(
                 "Compiling default CMS Sass with themed partials",
@@ -470,20 +432,6 @@ def compile_sass_dir(
                 ],
                 tolerate_missing=True,
             )
-            compile_sass_dir(
-                "Compiling built-in XBlock Sass for themed CMS",
-                repo / "xmodule" / "assets",
-                theme / "cms" / "static" / "css",
-                includes=[
-                    *common_includes,
-                    theme / "lms" / "static" / "sass" / "partials",
-                    theme / "cms" / "static" / "sass" / "partials",
-                    repo / "lms" / "static" / "sass" / "partials",
-                    repo / "cms" / "static" / "sass" / "partials",
-                    repo / "lms" / "static" / "sass",
-                    repo / "cms" / "static" / "sass",
-                ],
-            )
         click.secho(f"Done compiling Sass for theme at {theme}!", fg="cyan", bold=True)
         click.echo()
 
diff --git a/scripts/eslint.py b/scripts/eslint.py
new file mode 100644
index 000000000000..ad5fbf3f3f1b
--- /dev/null
+++ b/scripts/eslint.py
@@ -0,0 +1,78 @@
+"""  # pylint: disable=django-not-configured
+Check code quality using eslint.
+"""
+
+import re
+import subprocess
+import shlex
+import sys
+
+
+class BuildFailure(Exception):
+    pass
+
+
+def fail_quality(message):
+    """
+    Fail the specified quality check.
+    """
+
+    raise BuildFailure(message)
+
+
+def run_eslint():
+    """
+    Runs eslint on static asset directories.
+    If limit option is passed, fails build if more violations than the limit are found.
+    """
+    violations_limit = 734
+
+    command = [
+        "node",
+        "--max_old_space_size=4096",
+        "node_modules/.bin/eslint",
+        "--ext", ".js",
+        "--ext", ".jsx",
+        "--format=compact",
+        "lms",
+        "cms",
+        "common",
+        "openedx",
+        "xmodule",
+    ]
+    print("Running command:", shlex.join(command))
+    result = subprocess.run(
+        command,
+        text=True,
+        check=False,
+        capture_output=True
+    )
+
+    print(result.stdout)
+    if result.returncode == 0:
+        fail_quality("No eslint violations found. This is unexpected... are you sure eslint is running correctly?")
+    elif result.returncode == 1:
+        last_line = result.stdout.strip().splitlines()[-1] if result.stdout.strip().splitlines() else ""
+        regex = r'^\d+'
+        try:
+            num_violations = int(re.search(regex, last_line).group(0)) if last_line else 0
+            # Fail if number of violations is greater than the limit
+            if num_violations > violations_limit:
+                fail_quality("FAILURE: Too many eslint violations ({count}).\nThe limit is {violations_limit}.".format(count=num_violations, violations_limit=violations_limit))
+            else:
+                print(f"successfully run eslint with '{num_violations}' violations")
+
+        # An AttributeError will occur if the regex finds no matches.
+        except (AttributeError, ValueError):
+            fail_quality(f"FAILURE: Number of eslint violations could not be found in '{last_line}'")
+    else:
+        print(f"Unexpected ESLint failure with exit code {result.returncode}.")
+        fail_quality(f"Unexpected error: {result.stderr.strip()}")
+
+
+if __name__ == "__main__":
+    try:
+        run_eslint()
+    except BuildFailure as e:
+        print(e)
+        sys.exit(1)
diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh
deleted file mode 100755
index 54b9cbb9d500..000000000000
--- a/scripts/generic-ci-tests.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-###############################################################################
-#
-#   generic-ci-tests.sh
-#
-#   Execute some tests for edx-platform.
-#   (Most other tests are run by invoking `pytest`, `pylint`, etc. directly)
-#
-#   This script can be called from CI jobs that define
-#   these environment variables:
-#
-#   `TEST_SUITE` defines which kind of test to run.
-#   Possible values are:
-#
-#       - "quality": Run the quality (pycodestyle/pylint) checks
-#       - "js-unit": Run the JavaScript tests
-#       - "pavelib-js-unit": Run the JavaScript tests and the Python unit
-#           tests from the pavelib/lib directory
-#
-###############################################################################
-
-# Clean up previous builds
-git clean -qxfd
-
-function emptyxunit {
-
-    cat > "reports/$1.xml" <<END
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="$1" tests="1" errors="0" failures="0" skip="0">
-<testcase classname="pavelib.quality" name="$1" time="0.604"></testcase>
-</testsuite>
-END
-
-}
-
-# if specified tox environment is supported, prepend paver commands
-# with tox env invocation
-if [ -z ${TOX_ENV+x} ] || [[ ${TOX_ENV} == 'null' ]]; then
-    echo "TOX_ENV: ${TOX_ENV}"
-    TOX=""
-elif tox -l |grep -q "${TOX_ENV}"; then
-    if [[ "${TOX_ENV}" == 'quality' ]]; then
-        TOX=""
-    else
-        TOX="tox -r -e ${TOX_ENV} --"
-    fi
-else
-    echo "${TOX_ENV} is not currently supported. Please review the"
-    echo "tox.ini file to see which environments are supported"
-    exit 1
-fi
-
-PAVER_ARGS="-v"
-export SUBSET_JOB=$JOB_NAME
-
-function run_paver_quality {
-    QUALITY_TASK=$1
-    shift
-    mkdir -p test_root/log/
-    LOG_PREFIX="test_root/log/$QUALITY_TASK"
-    $TOX paver "$QUALITY_TASK" "$@" 2> "$LOG_PREFIX.err.log" > "$LOG_PREFIX.out.log" || {
-        echo "STDOUT (last 100 lines of $LOG_PREFIX.out.log):";
-        tail -n 100 "$LOG_PREFIX.out.log"
-        echo "STDERR (last 100 lines of $LOG_PREFIX.err.log):";
-        tail -n 100 "$LOG_PREFIX.err.log"
-        return 1;
-    }
-    return 0;
-}
-
-case "$TEST_SUITE" in
-
-    "quality")
-        EXIT=0
-
-        mkdir -p reports
-
-        echo "Finding pycodestyle violations and storing report..."
-        run_paver_quality run_pep8 || { EXIT=1; }
-        echo "Finding ESLint violations and storing report..."
-        run_paver_quality run_eslint -l "$ESLINT_THRESHOLD" || { EXIT=1; }
-        echo "Finding Stylelint violations and storing report..."
-        run_paver_quality run_stylelint || { EXIT=1; }
-        echo "Running xss linter report."
-        run_paver_quality run_xsslint -t "$XSSLINT_THRESHOLDS" || { EXIT=1; }
-        echo "Running PII checker on all Django models..."
-        run_paver_quality run_pii_check || { EXIT=1; }
-        echo "Running reserved keyword checker on all Django models..."
-        run_paver_quality check_keywords || { EXIT=1; }
-
-        # Need to create an empty test result so the post-build
-        # action doesn't fail the build.
-        emptyxunit "stub"
-        exit "$EXIT"
-        ;;
-
-    "js-unit")
-        $TOX paver test_js --coverage
-        $TOX paver diff_coverage
-        ;;
-
-    "pavelib-js-unit")
-        EXIT=0
-        $TOX paver test_js --coverage --skip-clean || { EXIT=1; }
-        paver test_lib --skip-clean $PAVER_ARGS || { EXIT=1; }
-
-        # This is to ensure that the build status of the shard is properly set.
-        # Because we are running two paver commands in a row, we need to capture
-        # their return codes in order to exit with a non-zero code if either of
-        # them fail. We put the || clause there because otherwise, when a paver
-        # command fails, this entire script will exit, and not run the second
-        # paver command in this case statement. So instead of exiting, the value
-        # of a variable named EXIT will be set to 1 if either of the paver
-        # commands fail. We then use this variable's value as our exit code.
-        # Note that by default the value of this variable EXIT is not set, so if
-        # neither command fails then the exit command resolves to simply exit
-        # which is considered successful.
-        exit "$EXIT"
-        ;;
-esac
diff --git a/scripts/gha-shards-readme.md b/scripts/gha-shards-readme.md
index 9996a1f3b241..d7a1bd9ef7ab 100644
--- a/scripts/gha-shards-readme.md
+++ b/scripts/gha-shards-readme.md
@@ -32,4 +32,4 @@ You'd have to update the `unit-test-shards.json` file manually to fix this.
 ```
 pytest --collect-only --ds=cms.envs.test cms/
 ```
-For more details on how this check collects and compares the unit tests count please take a look at [verify unit tests count](../.github/workflows/verify-gha-unit-tests-count.yml)
+For more details on how this check collects and compares the unit tests count please take a look at [verify unit tests count](../.github/workflows/unit-tests.yml)
diff --git a/scripts/paver_autocomplete.sh b/scripts/paver_autocomplete.sh
deleted file mode 100644
index 8b4e8111411c..000000000000
--- a/scripts/paver_autocomplete.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-# shellcheck disable=all
-# ^ Paver in edx-platform is on the way out
-#   (https://github.com/openedx/edx-platform/issues/31798)
-#   so we're not going to bother fixing these shellcheck
-#   violations.
-
-# Courtesy of Gregory Nicholas
-
-_subcommand_opts()
-{
-    local awkfile command cur usage
-    command=$1
-    cur=${COMP_WORDS[COMP_CWORD]}
-    awkfile=/tmp/paver-option-awkscript-$$.awk
-    echo '
-BEGIN {
-    opts = "";
-}
-
-{
-    for (i = 1; i <= NF; i = i + 1) {
-        # Match short options (-a, -S, -3)
-        # or long options (--long-option, --another_option)
-        # in output from paver help [subcommand]
-        if ($i ~ /^(-[A-Za-z0-9]|--[A-Za-z][A-Za-z0-9_-]*)/) {
-            opt = $i;
-            # remove trailing , and = characters.
-            match(opt, "[,=]");
-            if (RSTART > 0) {
-                opt = substr(opt, 0, RSTART);
-            }
-            opts = opts " " opt;
-        }
-    }
-}
-
-END {
-    print opts
-}' > $awkfile
-
-    usage=`paver help $command`
-    options=`echo "$usage"|awk -f $awkfile`
-
-    COMPREPLY=( $(compgen -W "$options" -- "$cur") )
-}
-
-
-_paver()
-{
-    local cur prev
-    COMPREPLY=()
-    # Variable to hold the current word
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD - 1]}"
-
-    # Build a list of the available tasks from: `paver --help --quiet`
-    local cmds=$(paver -hq | awk '/^  ([a-zA-Z][a-zA-Z0-9_]+)/ {print $1}')
-
-    subcmd="${COMP_WORDS[1]}"
-    # Generate possible matches and store them in the
-    # array variable COMPREPLY
-
-    if [[ -n $subcmd ]]
-    then
-
-        if [[ ${#COMP_WORDS[*]} == 3 ]]
-        then
-                _subcommand_opts $subcmd
-                return 0
-        else
-            if [[ "$cur" == -* ]]
-            then
-                _subcommand_opts $subcmd
-                return 0
-            else
-                COMPREPLY=( $(compgen -o nospace -- "$cur") )
-            fi
-        fi
-    fi
-
-    if [[ ${#COMP_WORDS[*]} == 2 ]]
-    then
-        COMPREPLY=( $(compgen -W "${cmds}" -- "$cur") )
-    fi
-}
-
-# Assign the auto-completion function for our command.
-
-complete -F _paver -o default paver
diff --git a/scripts/structures_pruning/README.rst b/scripts/structures_pruning/README.rst
index c16a837a93af..77bc6bfbf0c8 100644
--- a/scripts/structures_pruning/README.rst
+++ b/scripts/structures_pruning/README.rst
@@ -29,11 +29,11 @@ To download the scripts, you can perform a partial clone of the edx-platform rep
 Create Python Virtual Environment
 ---------------------------------
 
-Create a Python virtual environment using Python 3.8:
+Create a Python virtual environment using Python 3.11:
 
 .. code-block:: bash
 
-    python3.8 -m venv ../venv
+    python3.11 -m venv ../venv
     source ../venv/bin/activate
 
 Install Pip Packages
diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt
index 828a81a8d4ed..b15cb81f29ee 100644
--- a/scripts/structures_pruning/requirements/base.txt
+++ b/scripts/structures_pruning/requirements/base.txt
@@ -11,18 +11,18 @@ click==8.1.6
     #   click-log
 click-log==0.4.0
     # via -r scripts/structures_pruning/requirements/base.in
-dnspython==2.6.1
+dnspython==2.7.0
     # via pymongo
-edx-opaque-keys==2.10.0
+edx-opaque-keys==2.11.0
     # via -r scripts/structures_pruning/requirements/base.in
-pbr==6.0.0
+pbr==6.1.0
     # via stevedore
 pymongo==4.4.0
     # via
     #   -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt
     #   -r scripts/structures_pruning/requirements/base.in
     #   edx-opaque-keys
-stevedore==5.2.0
+stevedore==5.4.0
     # via edx-opaque-keys
 typing-extensions==4.12.2
     # via edx-opaque-keys
diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt
index 47648d50fddb..e121a05143fa 100644
--- a/scripts/structures_pruning/requirements/testing.txt
+++ b/scripts/structures_pruning/requirements/testing.txt
@@ -12,17 +12,17 @@ click-log==0.4.0
     # via -r scripts/structures_pruning/requirements/base.txt
 ddt==1.7.2
     # via -r scripts/structures_pruning/requirements/testing.in
-dnspython==2.6.1
+dnspython==2.7.0
     # via
     #   -r scripts/structures_pruning/requirements/base.txt
     #   pymongo
-edx-opaque-keys==2.10.0
+edx-opaque-keys==2.11.0
     # via -r scripts/structures_pruning/requirements/base.txt
 iniconfig==2.0.0
     # via pytest
-packaging==24.1
+packaging==24.2
     # via pytest
-pbr==6.0.0
+pbr==6.1.0
     # via
     #   -r scripts/structures_pruning/requirements/base.txt
     #   stevedore
@@ -32,9 +32,9 @@ pymongo==4.4.0
     # via
     #   -r scripts/structures_pruning/requirements/base.txt
     #   edx-opaque-keys
-pytest==8.3.2
+pytest==8.3.4
     # via -r scripts/structures_pruning/requirements/testing.in
-stevedore==5.2.0
+stevedore==5.4.0
     # via
     #   -r scripts/structures_pruning/requirements/base.txt
     #   edx-opaque-keys
diff --git a/scripts/user_retirement/README.rst b/scripts/user_retirement/README.rst
index d5417f7f7e75..380a2489108b 100644
--- a/scripts/user_retirement/README.rst
+++ b/scripts/user_retirement/README.rst
@@ -28,11 +28,11 @@ To download the scripts, you can perform a partial clone of the edx-platform rep
 Create Python Virtual Environment
 ---------------------------------
 
-Create a Python virtual environment using Python 3.8:
+Create a Python virtual environment using Python 3.11:
 
 .. code-block:: bash
 
-    python3.8 -m venv ../venv
+    python3.11 -m venv ../venv
     source ../venv/bin/activate
 
 Install Pip Packages
diff --git a/scripts/user_retirement/requirements/base.in b/scripts/user_retirement/requirements/base.in
index d0bdab9082a5..eabc9393ea15 100644
--- a/scripts/user_retirement/requirements/base.in
+++ b/scripts/user_retirement/requirements/base.in
@@ -11,3 +11,7 @@ unicodecsv
 simplejson
 simple-salesforce
 google-api-python-client
+
+# urllib3 is needed for the user_retirement scripts 
+# constraint will be investigated and removed in a separate issue
+urllib3<2.0.0
diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt
index 3e5ed4738070..56fe29b90dc3 100644
--- a/scripts/user_retirement/requirements/base.txt
+++ b/scripts/user_retirement/requirements/base.txt
@@ -6,21 +6,21 @@
 #
 asgiref==3.8.1
     # via django
-attrs==24.2.0
+attrs==24.3.0
     # via zeep
 backoff==2.2.1
     # via -r scripts/user_retirement/requirements/base.in
-boto3==1.35.1
+boto3==1.35.93
     # via -r scripts/user_retirement/requirements/base.in
-botocore==1.35.1
+botocore==1.35.93
     # via
     #   boto3
     #   s3transfer
 cachetools==5.5.0
     # via google-auth
-certifi==2024.7.4
+certifi==2024.12.14
     # via requests
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
@@ -33,9 +33,9 @@ click==8.1.6
     #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
     #   -r scripts/user_retirement/requirements/base.in
     #   edx-django-utils
-cryptography==43.0.0
+cryptography==44.0.0
     # via pyjwt
-django==4.2.15
+django==4.2.17
     # via
     #   -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
     #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
@@ -44,32 +44,32 @@ django==4.2.15
     #   edx-django-utils
 django-crum==0.7.9
     # via edx-django-utils
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via edx-django-utils
-edx-django-utils==5.15.0
+edx-django-utils==7.1.0
     # via edx-rest-api-client
-edx-rest-api-client==5.7.1
+edx-rest-api-client==6.0.0
     # via -r scripts/user_retirement/requirements/base.in
-google-api-core==2.19.1
+google-api-core==2.24.0
     # via google-api-python-client
-google-api-python-client==2.141.0
+google-api-python-client==2.157.0
     # via -r scripts/user_retirement/requirements/base.in
-google-auth==2.34.0
+google-auth==2.37.0
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
 google-auth-httplib2==0.2.0
     # via google-api-python-client
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.66.0
     # via google-api-core
 httplib2==0.22.0
     # via
     #   google-api-python-client
     #   google-auth-httplib2
-idna==3.7
+idna==3.10
     # via requests
-isodate==0.6.1
+isodate==0.7.2
     # via zeep
 jenkinsapi==0.3.13
     # via -r scripts/user_retirement/requirements/base.in
@@ -77,46 +77,44 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-lxml==4.9.4
-    # via
-    #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
-    #   zeep
-more-itertools==10.4.0
+lxml==5.3.0
+    # via zeep
+more-itertools==10.5.0
     # via simple-salesforce
-newrelic==9.13.0
+newrelic==10.4.0
     # via edx-django-utils
-pbr==6.0.0
+pbr==6.1.0
     # via stevedore
-platformdirs==4.2.2
+platformdirs==4.3.6
     # via zeep
-proto-plus==1.24.0
+proto-plus==1.25.0
     # via google-api-core
-protobuf==5.27.3
+protobuf==5.29.2
     # via
     #   google-api-core
     #   googleapis-common-protos
     #   proto-plus
-psutil==6.0.0
+psutil==6.1.1
     # via edx-django-utils
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via google-auth
 pycparser==2.22
     # via cffi
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.1
     # via
     #   edx-rest-api-client
     #   simple-salesforce
 pynacl==1.5.0
     # via edx-django-utils
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via httplib2
 python-dateutil==2.9.0.post0
     # via botocore
-pytz==2024.1
+pytz==2024.2
     # via
     #   jenkinsapi
     #   zeep
@@ -131,7 +129,6 @@ requests==2.32.3
     #   requests-file
     #   requests-toolbelt
     #   simple-salesforce
-    #   slumber
     #   zeep
 requests-file==2.1.0
     # via zeep
@@ -139,22 +136,19 @@ requests-toolbelt==1.0.0
     # via zeep
 rsa==4.9
     # via google-auth
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via boto3
 simple-salesforce==1.12.6
     # via -r scripts/user_retirement/requirements/base.in
 simplejson==3.19.3
     # via -r scripts/user_retirement/requirements/base.in
-six==1.16.0
+six==1.17.0
     # via
-    #   isodate
     #   jenkinsapi
     #   python-dateutil
-slumber==0.7.1
-    # via edx-rest-api-client
-sqlparse==0.5.1
+sqlparse==0.5.3
     # via django
-stevedore==5.2.0
+stevedore==5.4.0
     # via edx-django-utils
 typing-extensions==4.12.2
     # via simple-salesforce
@@ -162,10 +156,11 @@ unicodecsv==0.14.1
     # via -r scripts/user_retirement/requirements/base.in
 uritemplate==4.1.1
     # via google-api-python-client
-urllib3==1.26.19
+urllib3==1.26.20
     # via
-    #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
+    #   -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
+    #   -r scripts/user_retirement/requirements/base.in
     #   botocore
     #   requests
-zeep==4.2.1
+zeep==4.3.1
     # via simple-salesforce
diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt
index f7464dfa0602..e63881b77cac 100644
--- a/scripts/user_retirement/requirements/testing.txt
+++ b/scripts/user_retirement/requirements/testing.txt
@@ -8,17 +8,17 @@ asgiref==3.8.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   django
-attrs==24.2.0
+attrs==24.3.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   zeep
 backoff==2.2.1
     # via -r scripts/user_retirement/requirements/base.txt
-boto3==1.35.1
+boto3==1.35.93
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   moto
-botocore==1.35.1
+botocore==1.35.93
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   boto3
@@ -28,11 +28,11 @@ cachetools==5.5.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-auth
-certifi==2024.7.4
+certifi==2024.12.14
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   requests
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   cryptography
@@ -45,14 +45,14 @@ click==8.1.6
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-cryptography==43.0.0
+cryptography==44.0.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   moto
     #   pyjwt
 ddt==1.7.2
     # via -r scripts/user_retirement/requirements/testing.in
-django==4.2.15
+django==4.2.17
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   django-crum
@@ -62,23 +62,23 @@ django-crum==0.7.9
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-edx-django-utils==5.15.0
+edx-django-utils==7.1.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-rest-api-client
-edx-rest-api-client==5.7.1
+edx-rest-api-client==6.0.0
     # via -r scripts/user_retirement/requirements/base.txt
-google-api-core==2.19.1
+google-api-core==2.24.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-python-client
-google-api-python-client==2.141.0
+google-api-python-client==2.157.0
     # via -r scripts/user_retirement/requirements/base.txt
-google-auth==2.34.0
+google-auth==2.37.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-core
@@ -88,7 +88,7 @@ google-auth-httplib2==0.2.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-python-client
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.66.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-core
@@ -97,77 +97,77 @@ httplib2==0.22.0
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-python-client
     #   google-auth-httplib2
-idna==3.7
+idna==3.10
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   requests
 iniconfig==2.0.0
     # via pytest
-isodate==0.6.1
+isodate==0.7.2
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   zeep
 jenkinsapi==0.3.13
     # via -r scripts/user_retirement/requirements/base.txt
-jinja2==3.1.4
+jinja2==3.1.5
     # via moto
 jmespath==1.0.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   boto3
     #   botocore
-lxml==4.9.4
+lxml==5.3.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   zeep
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   jinja2
     #   werkzeug
 mock==5.1.0
     # via -r scripts/user_retirement/requirements/testing.in
-more-itertools==10.4.0
+more-itertools==10.5.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   simple-salesforce
 moto==4.2.14
     # via -r scripts/user_retirement/requirements/testing.in
-newrelic==9.13.0
+newrelic==10.4.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-packaging==24.1
+packaging==24.2
     # via pytest
-pbr==6.0.0
+pbr==6.1.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   stevedore
-platformdirs==4.2.2
+platformdirs==4.3.6
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   zeep
 pluggy==1.5.0
     # via pytest
-proto-plus==1.24.0
+proto-plus==1.25.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-core
-protobuf==5.27.3
+protobuf==5.29.2
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-core
     #   googleapis-common-protos
     #   proto-plus
-psutil==6.0.0
+psutil==6.1.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-auth
@@ -175,7 +175,7 @@ pycparser==2.22
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   cffi
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-rest-api-client
@@ -184,18 +184,18 @@ pynacl==1.5.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-pyparsing==3.1.2
+pyparsing==3.2.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   httplib2
-pytest==8.3.2
+pytest==8.3.4
     # via -r scripts/user_retirement/requirements/testing.in
 python-dateutil==2.9.0.post0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   botocore
     #   moto
-pytz==2024.1
+pytz==2024.2
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   jenkinsapi
@@ -216,7 +216,6 @@ requests==2.32.3
     #   requests-toolbelt
     #   responses
     #   simple-salesforce
-    #   slumber
     #   zeep
 requests-file==2.1.0
     # via
@@ -236,7 +235,7 @@ rsa==4.9
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-auth
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   boto3
@@ -244,21 +243,16 @@ simple-salesforce==1.12.6
     # via -r scripts/user_retirement/requirements/base.txt
 simplejson==3.19.3
     # via -r scripts/user_retirement/requirements/base.txt
-six==1.16.0
+six==1.17.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
-    #   isodate
     #   jenkinsapi
     #   python-dateutil
-slumber==0.7.1
-    # via
-    #   -r scripts/user_retirement/requirements/base.txt
-    #   edx-rest-api-client
-sqlparse==0.5.1
+sqlparse==0.5.3
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   django
-stevedore==5.2.0
+stevedore==5.4.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
@@ -272,17 +266,17 @@ uritemplate==4.1.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   google-api-python-client
-urllib3==1.26.19
+urllib3==1.26.20
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   botocore
     #   requests
     #   responses
-werkzeug==3.0.3
+werkzeug==3.1.3
     # via moto
-xmltodict==0.13.0
+xmltodict==0.14.2
     # via moto
-zeep==4.2.1
+zeep==4.3.1
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   simple-salesforce
diff --git a/scripts/user_retirement/utils/helpers.py b/scripts/user_retirement/utils/helpers.py
index 1bcbadb4b3c4..804852833436 100644
--- a/scripts/user_retirement/utils/helpers.py
+++ b/scripts/user_retirement/utils/helpers.py
@@ -43,12 +43,11 @@ def _fail(kind, code, message):
     """
     _log(kind, message)
 
-    # Try to get a traceback, if there is one. On Python 3.4 this raises an AttributeError
-    # if there is no current exception, so we eat that here.
-    try:
-        _log(kind, traceback.format_exc())
-    except AttributeError:
-        pass
+    # Log the traceback if an exception is currently being handled
+    exc_type, exc_value, exc_traceback = sys.exc_info()
+    if exc_type is not None:
+        traceback_str = traceback.format_exception(exc_type, exc_value, exc_traceback)
+        _log(kind, ''.join(traceback_str))
 
     sys.exit(code)
 
@@ -66,16 +65,12 @@ def _get_error_str_from_exception(exc):
     """
     Return a string from an exception that may or may not have a .content (Slumber)
     """
-    exc_msg = text_type(exc)
+    exc_msg = str(exc)
 
     if hasattr(exc, 'content'):
-        # Slumber inconveniently discards the decoded .text attribute from the Response object,
-        # and instead gives us the raw encoded .content attribute, so we need to decode it first.
-        # Python 2 needs the decode, Py3 does not have it.
-        try:
-            exc_msg += '\n' + str(exc.content).decode('utf-8')
-        except AttributeError:
-            exc_msg += '\n' + str(exc.content)
+        # Attempt to decode `exc.content` if it's in bytes, otherwise just convert to str
+        exc_content = exc.content.decode('utf-8') if isinstance(exc.content, bytes) else str(exc.content)
+        exc_msg += '\n' + exc_content
 
     return exc_msg
 
diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt
index 5b7f07242e6d..9af137853dc5 100644
--- a/scripts/xblock/requirements.txt
+++ b/scripts/xblock/requirements.txt
@@ -4,17 +4,17 @@
 #
 #    make upgrade
 #
-certifi==2024.7.4
+certifi==2024.12.14
     # via requests
 charset-normalizer==2.0.12
     # via
     #   -c scripts/xblock/../../requirements/constraints.txt
     #   requests
-idna==3.7
+idna==3.10
     # via requests
 requests==2.32.3
     # via -r scripts/xblock/requirements.in
-urllib3==1.26.19
+urllib3==2.2.3
     # via
-    #   -c scripts/xblock/../../requirements/constraints.txt
+    #   -c scripts/xblock/../../requirements/common_constraints.txt
     #   requests
diff --git a/scripts/xsslint/xss_linter.py b/scripts/xsslint/xss_linter.py
index a35038c3de6d..b32c54aa5cd7 100755
--- a/scripts/xsslint/xss_linter.py
+++ b/scripts/xsslint/xss_linter.py
@@ -4,6 +4,316 @@
 """
 
 
+import argparse
+import importlib
+import json
+import os
+import re
+import sys
+
+from functools import reduce
+from io import StringIO
+from xsslint.reporting import SummaryResults
+from xsslint.rules import RuleSet
+from xsslint.utils import is_skip_dir
+
+
+class BuildFailure(Exception):
+    pass
+
+
+def fail_quality(message):
+    """
+    Fail the specified quality check.
+    """
+
+    raise BuildFailure(message)
+
+
+def _load_config_module(module_path):
+    cwd = os.getcwd()
+    if cwd not in sys.path:
+        # Enable config module to be imported relative to wherever the script was run from.
+        sys.path.append(cwd)
+    return importlib.import_module(module_path)
+
+
+def _build_ruleset(template_linters):
+    """
+    Combines the RuleSets from the provided template_linters into a single, aggregate RuleSet.
+
+    Arguments:
+        template_linters: A list of linting objects.
+
+    Returns:
+        The combined RuleSet.
+    """
+    return reduce(
+        lambda combined, current: combined + current.ruleset,
+        template_linters,
+        RuleSet()
+    )
+
+
+def _process_file(full_path, template_linters, options, summary_results, out):
+    """
+    For each linter, lints the provided file.  This means finding and printing
+    violations.
+
+    Arguments:
+        full_path: The full path of the file to lint.
+        template_linters: A list of linting objects.
+        options: A list of the options.
+        summary_results: A SummaryResults with a summary of the violations.
+        out: output file
+
+    """
+    num_violations = 0
+    directory = os.path.dirname(full_path)
+    file_name = os.path.basename(full_path)
+    try:
+        for template_linter in template_linters:
+            results = template_linter.process_file(directory, file_name)
+            results.print_results(options, summary_results, out)
+    except BaseException as e:
+        raise Exception(f"Failed to process path: {full_path}") from e
+
+
+def _process_os_dir(directory, files, template_linters, options, summary_results, out):
+    """
+    Calls out to lint each file in the passed list of files.
+
+    Arguments:
+        directory: Directory being linted.
+        files: All files in the directory to be linted.
+        template_linters: A list of linting objects.
+        options: A list of the options.
+        summary_results: A SummaryResults with a summary of the violations.
+        out: output file
+
+    """
+    for current_file in sorted(files, key=lambda s: s.lower()):
+        full_path = os.path.join(directory, current_file)
+        _process_file(full_path, template_linters, options, summary_results, out)
+
+
+def _process_os_dirs(starting_dir, template_linters, options, summary_results, out):
+    """
+    For each linter, lints all the directories in the starting directory.
+
+    Arguments:
+        starting_dir: The initial directory to begin the walk.
+        template_linters: A list of linting objects.
+        options: A list of the options.
+        summary_results: A SummaryResults with a summary of the violations.
+        out: output file
+
+    """
+    skip_dirs = options.get('skip_dirs', ())
+    for root, dirs, files in os.walk(starting_dir):
+        if is_skip_dir(skip_dirs, root):
+            del dirs
+            continue
+        dirs.sort(key=lambda s: s.lower())
+        _process_os_dir(root, files, template_linters, options, summary_results, out)
+
+
+def _get_xsslint_counts(result_contents):
+    """
+    This returns a dict of violations from the xsslint report.
+
+    Arguments:
+        filename: The name of the xsslint report.
+
+    Returns:
+        A dict containing the following:
+            rules: A dict containing the count for each rule as follows:
+                violation-rule-id: N, where N is the number of violations
+            total: M, where M is the number of total violations
+
+    """
+
+    rule_count_regex = re.compile(r"^(?P<rule_id>[a-z-]+):\s+(?P<count>\d+) violations", re.MULTILINE)
+    total_count_regex = re.compile(r"^(?P<count>\d+) violations total", re.MULTILINE)
+    violations = {'rules': {}}
+    for violation_match in rule_count_regex.finditer(result_contents):
+        try:
+            violations['rules'][violation_match.group('rule_id')] = int(violation_match.group('count'))
+        except ValueError:
+            violations['rules'][violation_match.group('rule_id')] = None
+    try:
+        violations['total'] = int(total_count_regex.search(result_contents).group('count'))
+    # An AttributeError will occur if the regex finds no matches.
+    # A ValueError will occur if the returned regex cannot be cast as a float.
+    except (AttributeError, ValueError):
+        violations['total'] = None
+    return violations
+
+
+def _check_violations(options, results):
+    xsslint_script = "xss_linter.py"
+    try:
+        thresholds_option = options['thresholds']
+        # Read the JSON file
+        with open(thresholds_option, 'r') as file:
+            violation_thresholds = json.load(file)
+
+    except ValueError:
+        violation_thresholds = None
+    if isinstance(violation_thresholds, dict) is False or \
+            any(key not in ("total", "rules") for key in violation_thresholds.keys()):
+        print('xsslint')
+        fail_quality("""FAILURE: Thresholds option "{thresholds_option}" was not supplied using proper format.\n"""
+                     """Here is a properly formatted example, '{{"total":100,"rules":{{"javascript-escape":0}}}}' """
+                     """with property names in double-quotes.""".format(thresholds_option=thresholds_option))
+
+    try:
+        metrics_str = "Number of {xsslint_script} violations: {num_violations}\n".format(
+            xsslint_script=xsslint_script, num_violations=int(results['total'])
+        )
+        if 'rules' in results and any(results['rules']):
+            metrics_str += "\n"
+            rule_keys = sorted(results['rules'].keys())
+            for rule in rule_keys:
+                metrics_str += "{rule} violations: {count}\n".format(
+                    rule=rule,
+                    count=int(results['rules'][rule])
+                )
+    except TypeError:
+        print('xsslint')
+        fail_quality("FAILURE: Number of {xsslint_script} violations could not be found".format(
+            xsslint_script=xsslint_script
+        ))
+
+    error_message = ""
+    # Test total violations against threshold.
+    if 'total' in list(violation_thresholds.keys()):
+        if violation_thresholds['total'] < results['total']:
+            error_message = "Too many violations total ({count}).\nThe limit is {violations_limit}.".format(
+                count=results['total'], violations_limit=violation_thresholds['total']
+            )
+
+    # Test rule violations against thresholds.
+    if 'rules' in violation_thresholds:
+        threshold_keys = sorted(violation_thresholds['rules'].keys())
+        for threshold_key in threshold_keys:
+            if threshold_key not in results['rules']:
+                error_message += (
+                    "\nNumber of {xsslint_script} violations for {rule} could not be found"
+                ).format(
+                    xsslint_script=xsslint_script, rule=threshold_key
+                )
+            elif violation_thresholds['rules'][threshold_key] < results['rules'][threshold_key]:
+                error_message += \
+                    "\nToo many {rule} violations ({count}).\nThe {rule} limit is {violations_limit}.".format(
+                        rule=threshold_key, count=results['rules'][threshold_key],
+                        violations_limit=violation_thresholds['rules'][threshold_key],
+                    )
+
+    if error_message:
+        print('xsslint')
+        fail_quality("FAILURE: XSSLinter Failed.\n{error_message}\n"
+                     "run the following command to hone in on the problem:\n"
+                     "./scripts/xss-commit-linter.sh -h".format(error_message=error_message))
+    else:
+        print("successfully run xsslint")
+
+
+def _lint(file_or_dir, template_linters, options, summary_results, out):
+    """
+    For each linter, lints the provided file or directory.
+
+    Arguments:
+        file_or_dir: The file or initial directory to lint.
+        template_linters: A list of linting objects.
+        options: A list of the options.
+        summary_results: A SummaryResults with a summary of the violations.
+        out: output file
+
+    """
+
+    if file_or_dir is not None and os.path.isfile(file_or_dir):
+        _process_file(file_or_dir, template_linters, options, summary_results, out)
+    else:
+        directory = "."
+        if file_or_dir is not None:
+            if os.path.exists(file_or_dir):
+                directory = file_or_dir
+            else:
+                raise ValueError(f"Path [{file_or_dir}] is not a valid file or directory.")
+        _process_os_dirs(directory, template_linters, options, summary_results, out)
+
+    summary_results.print_results(options, out)
+    result_output = _get_xsslint_counts(out.getvalue())
+    _check_violations(options, result_output)
+
+
+def main():
+    """
+    Used to execute the linter. Use --help option for help.
+
+    Prints all violations.
+    """
+    epilog = "For more help using the xss linter, including details on how to\n"
+    epilog += "understand and fix any violations, read the docs here:\n"
+    epilog += "\n"
+    # pylint: disable=line-too-long
+    epilog += "  https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/conventions/preventing_xss.html#xss-linter\n"
+
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description='Checks that templates are safe.',
+        epilog=epilog,
+    )
+    parser.add_argument(
+        '--list-files', dest='list_files', action='store_true',
+        help='Only display the filenames that contain violations.'
+    )
+    parser.add_argument(
+        '--rule-totals', dest='rule_totals', action='store_true',
+        help='Display the totals for each rule.'
+    )
+    parser.add_argument(
+        '--summary-format', dest='summary_format',
+        choices=['eslint', 'json'], default='eslint',
+        help='Choose the display format for the summary.'
+    )
+    parser.add_argument(
+        '--verbose', dest='verbose', action='store_true',
+        help='Print multiple lines where possible for additional context of violations.'
+    )
+    parser.add_argument(
+        '--config', dest='config', action='store', default='xsslint.default_config',
+        help='Specifies the config module to use. The config module should be in Python package syntax.'
+    )
+    parser.add_argument(
+        '--thresholds', dest='thresholds', action='store',
+        help='Specifies the config module to use. The config module should be in Python package syntax.'
+    )
+    parser.add_argument('path', nargs="?", default=None, help='A file to lint or directory to recursively lint.')
+
+    args = parser.parse_args()
+    config = _load_config_module(args.config)
+    options = {
+        'list_files': args.list_files,
+        'rule_totals': args.rule_totals,
+        'summary_format': args.summary_format,
+        'verbose': args.verbose,
+        'skip_dirs': getattr(config, 'SKIP_DIRS', ()),
+        'thresholds': args.thresholds
+    }
+    template_linters = getattr(config, 'LINTERS', ())
+    if not template_linters:
+        raise ValueError(f"LINTERS is empty or undefined in the config module ({args.config}).")
+
+    ruleset = _build_ruleset(template_linters)
+    summary_results = SummaryResults(ruleset)
+    _lint(args.path, template_linters, options, summary_results, out=StringIO())
+
+
 if __name__ == "__main__":
-    from xsslint.main import main
-    main()
+    try:
+        main()
+    except BuildFailure as e:
+        print(e)
+        sys.exit(1)
diff --git a/scripts/xsslint/xsslint/main.py b/scripts/xsslint/xsslint/main.py
deleted file mode 100644
index f8f8672b74b3..000000000000
--- a/scripts/xsslint/xsslint/main.py
+++ /dev/null
@@ -1,187 +0,0 @@
-"""
-The main function for the XSS linter.
-"""
-
-
-import argparse
-import importlib
-import os
-import sys
-from functools import reduce
-
-from xsslint.reporting import SummaryResults
-from xsslint.rules import RuleSet
-from xsslint.utils import is_skip_dir
-
-
-def _load_config_module(module_path):
-    cwd = os.getcwd()
-    if cwd not in sys.path:
-        # Enable config module to be imported relative to wherever the script was run from.
-        sys.path.append(cwd)
-    return importlib.import_module(module_path)
-
-
-def _build_ruleset(template_linters):
-    """
-    Combines the RuleSets from the provided template_linters into a single, aggregate RuleSet.
-
-    Arguments:
-        template_linters: A list of linting objects.
-
-    Returns:
-        The combined RuleSet.
-    """
-    return reduce(
-        lambda combined, current: combined + current.ruleset,
-        template_linters,
-        RuleSet()
-    )
-
-
-def _process_file(full_path, template_linters, options, summary_results, out):
-    """
-    For each linter, lints the provided file.  This means finding and printing
-    violations.
-
-    Arguments:
-        full_path: The full path of the file to lint.
-        template_linters: A list of linting objects.
-        options: A list of the options.
-        summary_results: A SummaryResults with a summary of the violations.
-        out: output file
-
-    """
-    num_violations = 0
-    directory = os.path.dirname(full_path)
-    file_name = os.path.basename(full_path)
-    try:
-        for template_linter in template_linters:
-            results = template_linter.process_file(directory, file_name)
-            results.print_results(options, summary_results, out)
-    except BaseException as e:
-        raise Exception(f"Failed to process path: {full_path}") from e
-
-
-def _process_os_dir(directory, files, template_linters, options, summary_results, out):
-    """
-    Calls out to lint each file in the passed list of files.
-
-    Arguments:
-        directory: Directory being linted.
-        files: All files in the directory to be linted.
-        template_linters: A list of linting objects.
-        options: A list of the options.
-        summary_results: A SummaryResults with a summary of the violations.
-        out: output file
-
-    """
-    for current_file in sorted(files, key=lambda s: s.lower()):
-        full_path = os.path.join(directory, current_file)
-        _process_file(full_path, template_linters, options, summary_results, out)
-
-
-def _process_os_dirs(starting_dir, template_linters, options, summary_results, out):
-    """
-    For each linter, lints all the directories in the starting directory.
-
-    Arguments:
-        starting_dir: The initial directory to begin the walk.
-        template_linters: A list of linting objects.
-        options: A list of the options.
-        summary_results: A SummaryResults with a summary of the violations.
-        out: output file
-
-    """
-    skip_dirs = options.get('skip_dirs', ())
-    for root, dirs, files in os.walk(starting_dir):
-        if is_skip_dir(skip_dirs, root):
-            del dirs
-            continue
-        dirs.sort(key=lambda s: s.lower())
-        _process_os_dir(root, files, template_linters, options, summary_results, out)
-
-
-def _lint(file_or_dir, template_linters, options, summary_results, out):
-    """
-    For each linter, lints the provided file or directory.
-
-    Arguments:
-        file_or_dir: The file or initial directory to lint.
-        template_linters: A list of linting objects.
-        options: A list of the options.
-        summary_results: A SummaryResults with a summary of the violations.
-        out: output file
-
-    """
-
-    if file_or_dir is not None and os.path.isfile(file_or_dir):
-        _process_file(file_or_dir, template_linters, options, summary_results, out)
-    else:
-        directory = "."
-        if file_or_dir is not None:
-            if os.path.exists(file_or_dir):
-                directory = file_or_dir
-            else:
-                raise ValueError(f"Path [{file_or_dir}] is not a valid file or directory.")
-        _process_os_dirs(directory, template_linters, options, summary_results, out)
-
-    summary_results.print_results(options, out)
-
-
-def main():
-    """
-    Used to execute the linter. Use --help option for help.
-
-    Prints all violations.
-    """
-    epilog = "For more help using the xss linter, including details on how to\n"
-    epilog += "understand and fix any violations, read the docs here:\n"
-    epilog += "\n"
-    # pylint: disable=line-too-long
-    epilog += "  https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/conventions/preventing_xss.html#xss-linter\n"
-
-    parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        description='Checks that templates are safe.',
-        epilog=epilog,
-    )
-    parser.add_argument(
-        '--list-files', dest='list_files', action='store_true',
-        help='Only display the filenames that contain violations.'
-    )
-    parser.add_argument(
-        '--rule-totals', dest='rule_totals', action='store_true',
-        help='Display the totals for each rule.'
-    )
-    parser.add_argument(
-        '--summary-format', dest='summary_format',
-        choices=['eslint', 'json'], default='eslint',
-        help='Choose the display format for the summary.'
-    )
-    parser.add_argument(
-        '--verbose', dest='verbose', action='store_true',
-        help='Print multiple lines where possible for additional context of violations.'
-    )
-    parser.add_argument(
-        '--config', dest='config', action='store', default='xsslint.default_config',
-        help='Specifies the config module to use. The config module should be in Python package syntax.'
-    )
-    parser.add_argument('path', nargs="?", default=None, help='A file to lint or directory to recursively lint.')
-
-    args = parser.parse_args()
-    config = _load_config_module(args.config)
-    options = {
-        'list_files': args.list_files,
-        'rule_totals': args.rule_totals,
-        'summary_format': args.summary_format,
-        'verbose': args.verbose,
-        'skip_dirs': getattr(config, 'SKIP_DIRS', ())
-    }
-    template_linters = getattr(config, 'LINTERS', ())
-    if not template_linters:
-        raise ValueError(f"LINTERS is empty or undefined in the config module ({args.config}).")
-
-    ruleset = _build_ruleset(template_linters)
-    summary_results = SummaryResults(ruleset)
-    _lint(args.path, template_linters, options, summary_results, out=sys.stdout)
diff --git a/setup.cfg b/setup.cfg
index f36e0f8b0203..987f4474531f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -183,9 +183,10 @@ isolated_apps =
     openedx.core.djangoapps.xblock
     openedx.core.lib.xblock_serializer
 allowed_modules =
-    # Only imports from api.py are allowed elsewhere in the code
+    # Only imports from api.py and data.py are allowed elsewhere in the code
     # See https://open-edx-proposals.readthedocs.io/en/latest/best-practices/oep-0049-django-app-patterns.html#api-py
     api
+    data
 
 [importlinter:contract:3]
 name = Do not import apps from openedx-learning (only import from openedx_learning.api.* and openedx_learning.lib.*).
diff --git a/setup.py b/setup.py
index bf662b563c7f..3ccfe7734e33 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,10 @@
     "error = xmodule.error_block:ErrorBlock",
     "hidden = xmodule.hidden_block:HiddenBlock",
     "html = xmodule.html_block:HtmlBlock",
+    "itembank = xmodule.item_bank_block:ItemBankBlock",
     "image = xmodule.template_block:TranslateCustomTagBlock",
     "library = xmodule.library_root_xblock:LibraryRoot",
-    "library_content = xmodule.library_content_block:LibraryContentBlock",
+    "library_content = xmodule.library_content_block:LegacyLibraryContentBlock",
     "lti = xmodule.lti_block:LTIBlock",
     "poll_question = xmodule.poll_block:PollBlock",
     "problem = xmodule.capa_block:ProblemBlock",
@@ -129,14 +130,14 @@
             'discussions_link = openedx.core.djangoapps.discussions.transformers:DiscussionsTopicLinkTransformer',
         ],
         "openedx.ace.policy": [
-            "bulk_email_optout = lms.djangoapps.bulk_email.policies:CourseEmailOptout"
+            "bulk_email_optout = lms.djangoapps.bulk_email.policies:CourseEmailOptout",
+            "course_push_notification_optout = openedx.core.djangoapps.notifications.policies:CoursePushNotificationOptout",  # lint-amnesty, pylint: disable=line-too-long
         ],
         "openedx.call_to_action": [
             "personalized_learner_schedules = openedx.features.personalized_learner_schedules.call_to_action:PersonalizedLearnerScheduleCallToAction"  # lint-amnesty, pylint: disable=line-too-long
         ],
         "lms.djangoapp": [
             "ace_common = openedx.core.djangoapps.ace_common.apps:AceCommonConfig",
-            "announcements = openedx.features.announcements.apps:AnnouncementsConfig",
             "content_libraries = openedx.core.djangoapps.content_libraries.apps:ContentLibrariesConfig",
             "course_apps = openedx.core.djangoapps.course_apps.apps:CourseAppsConfig",
             "course_live = openedx.core.djangoapps.course_live.apps:CourseLiveConfig",
@@ -155,7 +156,6 @@
             "program_enrollments = lms.djangoapps.program_enrollments.apps:ProgramEnrollmentsConfig",
         ],
         "cms.djangoapp": [
-            "announcements = openedx.features.announcements.apps:AnnouncementsConfig",
             "ace_common = openedx.core.djangoapps.ace_common.apps:AceCommonConfig",
             "bookmarks = openedx.core.djangoapps.bookmarks.apps:BookmarksConfig",
             "course_live = openedx.core.djangoapps.course_live.apps:CourseLiveConfig",
diff --git a/stylelint.config.js b/stylelint.config.js
deleted file mode 100644
index bd7769911708..000000000000
--- a/stylelint.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-    extends: '@edx/stylelint-config-edx'
-};
diff --git a/tox.ini b/tox.ini
index 1b4252fd1905..e5df7f0fbd2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{38,311} quality
+envlist = py{311} quality
 
 # This is needed to prevent the lms, cms, and openedx packages inside the "Open
 # edX" package (defined in setup.py) from getting installed into site-packages
diff --git a/webpack.builtinblocks.config.js b/webpack.builtinblocks.config.js
index d86f891dc6ce..1c5a9b1e0e9d 100644
--- a/webpack.builtinblocks.config.js
+++ b/webpack.builtinblocks.config.js
@@ -38,6 +38,10 @@ module.exports = {
             './xmodule/js/src/xmodule.js',
             './xmodule/js/src/html/edit.js'
         ],
+        LibraryContentBlockEditor: [
+            './xmodule/js/src/xmodule.js',
+            './xmodule/js/src/vertical/edit.js'
+        ],
         LTIBlockDisplay: [
             './xmodule/js/src/xmodule.js',
             './xmodule/js/src/lti/lti.js'
@@ -46,11 +50,6 @@ module.exports = {
             './xmodule/js/src/xmodule.js',
             './xmodule/js/src/raw/edit/metadata-only.js'
         ],
-        LibraryContentBlockDisplay: './xmodule/js/src/xmodule.js',
-        LibraryContentBlockEditor: [
-            './xmodule/js/src/xmodule.js',
-            './xmodule/js/src/vertical/edit.js'
-        ],
         PollBlockDisplay: [
             './xmodule/js/src/xmodule.js',
             './xmodule/js/src/javascript_loader.js',
diff --git a/webpack.common.config.js b/webpack.common.config.js
index 322e252c6ae2..c9b69eef4292 100644
--- a/webpack.common.config.js
+++ b/webpack.common.config.js
@@ -26,6 +26,27 @@ var defineFooter = new RegExp('(' + defineCallFooter.source + ')|('
 var staticRootLms = process.env.STATIC_ROOT_LMS || './test_root/staticfiles';
 var staticRootCms = process.env.STATIC_ROOT_CMS || (staticRootLms + '/studio');
 
+class DieHardPlugin {
+  /* A small plugin which ensures that if Webpack fails, it causes the surrounding process to fail
+   * as well. This helps us prevent JavaScript CI from "false passing" upon build failures--that is,
+   * we want to avoid having another situation where the Webpack build breaks under Karma (our
+   * test runner) but Karma just lets it slide and moves on to the next test suite.
+   *
+   * One would imagine that this would be Webpack's default behavior (and maybe it is?) but,
+   * regardless, karma-webpack does not seem to consider Webpack build failures to be fatal errors
+   * without this plugin. We don't fully understand it, but this is good enough given that we plan
+   * to remove all JS in this repo soon (https://github.com/openedx/edx-platform/issues/31620).
+   *
+   * Inpsired by: https://github.com/codymikol/karma-webpack/issues/49#issuecomment-842682050
+   */
+  apply(compiler) {
+    compiler.hooks.failed.tap('DieHardPlugin', (error) => {
+      console.error(error);
+      process.exit(1);
+    });
+  }
+}
+
 var workerConfig = function() {
     try {
         return {
@@ -112,7 +133,6 @@ module.exports = Merge.smart({
             CourseSock: './openedx/features/course_experience/static/course_experience/js/CourseSock.js',
             Currency: './openedx/features/course_experience/static/course_experience/js/currency.js',
 
-            AnnouncementsView: './openedx/features/announcements/static/announcements/jsx/Announcements.jsx',
             CookiePolicyBanner: './common/static/js/src/CookiePolicyBanner.jsx',
 
             // Common
@@ -154,6 +174,7 @@ module.exports = Merge.smart({
                 // any other way to declare that dependency.
                 $script: 'scriptjs'
             }),
+            new DieHardPlugin(),
         ],
 
         module: {
@@ -172,19 +193,19 @@ module.exports = Merge.smart({
                         multiple: [
                             { search: defineHeader, replace: '' },
                             { search: defineFooter, replace: '' },
-                            { 
+                            {
                                 search: /(\/\* RequireJS) \*\//g,
                                 replace(match, p1, offset, string) {
                                     return p1;
                                 }
                             },
-                            { 
+                            {
                                 search: /\/\* Webpack/g,
                                 replace(match, p1, offset, string) {
                                     return match + ' */';
                                 }
                             },
-                            { 
+                            {
                                 search: /text!(.*?\.underscore)/g,
                                 replace(match, p1, offset, string) {
                                     return p1;
@@ -635,13 +656,13 @@ module.exports = Merge.smart({
             // We used to have node: { fs: 'empty' } in this file,
             // that is no longer supported. Adding this based on the recommendation in
             // https://stackoverflow.com/questions/64361940/webpack-error-configuration-node-has-an-unknown-property-fs
-            // 
+            //
             // With this uncommented tests fail
             // Tests failed in the following suites:
             // * lms javascript
             // * xmodule-webpack javascript
             // Error: define cannot be used indirect
-            // 
+            //
             // fallback: {
             //     fs: false
             // }
diff --git a/xmodule/annotatable_block.py b/xmodule/annotatable_block.py
index e41e2b17a52f..dbcf0123c59a 100644
--- a/xmodule/annotatable_block.py
+++ b/xmodule/annotatable_block.py
@@ -3,22 +3,24 @@
 import logging
 import textwrap
 
+from django.conf import settings
 from lxml import etree
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.fields import Scope, String
+from xblocks_contrib.annotatable import AnnotatableBlock as _ExtractedAnnotatableBlock
 
 from openedx.core.djangolib.markup import HTML, Text
 from xmodule.editing_block import EditingMixin
 from xmodule.raw_block import RawMixin
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
-from xmodule.xml_block import XmlMixin
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
     XModuleMixin,
     XModuleToXBlockMixin,
 )
+from xmodule.xml_block import XmlMixin
 
 log = logging.getLogger(__name__)
 
@@ -28,7 +30,7 @@
 
 
 @XBlock.needs('mako')
-class AnnotatableBlock(
+class _BuiltInAnnotatableBlock(
     RawMixin,
     XmlMixin,
     EditingMixin,
@@ -40,6 +42,8 @@ class AnnotatableBlock(
     Annotatable XBlock.
     """
 
+    is_extracted = False
+
     data = String(
         help=_("XML data for the annotation"),
         scope=Scope.content,
@@ -180,7 +184,7 @@ def student_view(self, context):  # lint-amnesty, pylint: disable=unused-argumen
         """
         fragment = Fragment()
         fragment.add_content(self.get_html())
-        add_sass_to_fragment(fragment, 'AnnotatableBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'AnnotatableBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'AnnotatableBlockDisplay')
         shim_xmodule_js(fragment, 'Annotatable')
 
@@ -193,7 +197,14 @@ def studio_view(self, _context):
         fragment = Fragment(
             self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
         )
-        add_sass_to_fragment(fragment, 'AnnotatableBlockEditor.scss')
+        add_css_to_fragment(fragment, 'AnnotatableBlockEditor.css')
         add_webpack_js_to_fragment(fragment, 'AnnotatableBlockEditor')
         shim_xmodule_js(fragment, self.studio_js_module_name)
         return fragment
+
+
+AnnotatableBlock = (
+    _ExtractedAnnotatableBlock if settings.USE_EXTRACTED_ANNOTATABLE_BLOCK
+    else _BuiltInAnnotatableBlock
+)
+AnnotatableBlock.__name__ = "AnnotatableBlock"
diff --git a/xmodule/assets/AnnotatableBlockDisplay.scss b/xmodule/assets/AnnotatableBlockDisplay.scss
deleted file mode 100644
index 66e1e756f3da..000000000000
--- a/xmodule/assets/AnnotatableBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_AnnotatableBlock {
-  @import "annotatable/display.scss";
-}
diff --git a/xmodule/assets/AnnotatableBlockEditor.scss b/xmodule/assets/AnnotatableBlockEditor.scss
deleted file mode 100644
index 8f2852422d7d..000000000000
--- a/xmodule/assets/AnnotatableBlockEditor.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_edit.xmodule_AnnotatableBlock {
-  @import "codemirror/codemirror.scss";
-}
diff --git a/xmodule/assets/CustomTagBlockEditor.scss b/xmodule/assets/CustomTagBlockEditor.scss
deleted file mode 100644
index 3abd162c808d..000000000000
--- a/xmodule/assets/CustomTagBlockEditor.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_edit.xmodule_CustomTagBlock {
-  @import "codemirror/codemirror.scss";
-}
diff --git a/xmodule/assets/HtmlBlockDisplay.scss b/xmodule/assets/HtmlBlockDisplay.scss
deleted file mode 100644
index 0bc49706cfff..000000000000
--- a/xmodule/assets/HtmlBlockDisplay.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.xmodule_display.xmodule_AboutBlock,
-.xmodule_display.xmodule_CourseInfoBlock,
-.xmodule_display.xmodule_HtmlBlock,
-.xmodule_display.xmodule_StaticTabBlock {
-  @import "html/display.scss";
-}
diff --git a/xmodule/assets/HtmlBlockEditor.scss b/xmodule/assets/HtmlBlockEditor.scss
deleted file mode 100644
index 15d60863e28e..000000000000
--- a/xmodule/assets/HtmlBlockEditor.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.xmodule_edit.xmodule_AboutBlock,
-.xmodule_edit.xmodule_CourseInfoBlock,
-.xmodule_edit.xmodule_HtmlBlock,
-.xmodule_edit.xmodule_StaticTabBlock {
-  @import "editor/edit.scss";
-  @import "html/edit.scss";
-}
diff --git a/xmodule/assets/LTIBlockDisplay.scss b/xmodule/assets/LTIBlockDisplay.scss
deleted file mode 100644
index ea92202df2ad..000000000000
--- a/xmodule/assets/LTIBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_LTIBlock {
-  @import "lti/lti.scss";
-}
diff --git a/xmodule/assets/PollBlockDisplay.scss b/xmodule/assets/PollBlockDisplay.scss
deleted file mode 100644
index 85110778c742..000000000000
--- a/xmodule/assets/PollBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_PollBlock {
-  @import "poll/display.scss";
-}
diff --git a/xmodule/assets/ProblemBlockDisplay.scss b/xmodule/assets/ProblemBlockDisplay.scss
deleted file mode 100644
index 5175529246b0..000000000000
--- a/xmodule/assets/ProblemBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_ProblemBlock {
-  @import "capa/display.scss";
-}
diff --git a/xmodule/assets/ProblemBlockEditor.scss b/xmodule/assets/ProblemBlockEditor.scss
deleted file mode 100644
index 03d3cf1e2a98..000000000000
--- a/xmodule/assets/ProblemBlockEditor.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.xmodule_edit.xmodule_ProblemBlock {
-  @import "editor/edit.scss";
-  @import "problem/edit.scss";
-}
diff --git a/xmodule/assets/README.rst b/xmodule/assets/README.rst
index a697915db835..feb72168f9de 100644
--- a/xmodule/assets/README.rst
+++ b/xmodule/assets/README.rst
@@ -27,25 +27,15 @@ However, we are proactively working towards a system where:
 Themable Sass (.scss)
 *********************
 
-XBlock CSS for ``student_view``, ``author_view``, and ``public_view`` is compiled from the various ``./<ClassName>BlockDisplay.scss`` modules, such as `AnnotatableBlockDisplay.scss`_.
-
-XBlock CSS for ``studio_view`` is compiled from the various ``./<ClassName>BlockEditor.scss`` modules, such as `AnnotatableBlockEditor.scss`_.
-
-Those Sass modules are mostly thin wrappers around the underscore-prefixed Sass
-modules within block-type-subdirectories, such as `annotatable/_display.css`. In the
-future, we may `simplify things`_ by collapsing the top-level Sass modules and
-just directly compiling the block-type-subdirectories' Sass.
-
-The CSS is compiled into the static folders of both LMS and CMS, as well as into
-the corresponding folders in any enabled themes, as part of the edx-platform build.
-It is collected into the static root, and then linked to from XBlock fragments by the
-``add_sass_to_fragment`` function in `builtin_assets.py`_.
-
-.. _AnnotatableBlockDisplay.scss: https://github.com/openedx/edx-platform/tree/master/xmodule/assets/AnnotatableBlockDisplay.scss
-.. _AnnotatableBlockEditor.scss: https://github.com/openedx/edx-platform/tree/master/xmodule/assets/AnnotatableBlockEditor.scss
-.. _annotatable/_display.scss: https://github.com/openedx/edx-platform/tree/master/xmodule/assets/annotatable/_display.scss
-.. _simplify things: https://github.com/openedx/edx-platform/issues/32621
-
+Formerly, built-in XBlock CSS for ``student_view``, ``author_view``, and
+``public_view`` was compiled from the various
+``./<ClassName>BlockDisplay.scss`` modules, and ``studio_view`` CSS was
+compiled from the various ``./<ClassName>BlockEditor.scss`` modules.
+
+As of November 2024, all that built-in XBlock Sass was been permanently
+compiled into CSS, stored at ``../static/css-builtin-blocks/``.
+The theme-overridable Sass variables are injected into CSS variables via
+``../../common/static/sass/_builtin-block-variables.scss``.
 
 JavaScript (.js)
 ****************
diff --git a/xmodule/assets/SequenceBlockDisplay.scss b/xmodule/assets/SequenceBlockDisplay.scss
deleted file mode 100644
index 0c5aa3c82c49..000000000000
--- a/xmodule/assets/SequenceBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_SequenceBlock {
-  @import "sequence/display.scss";
-}
diff --git a/xmodule/assets/VideoBlockDisplay.scss b/xmodule/assets/VideoBlockDisplay.scss
deleted file mode 100644
index ccd9a3ed1326..000000000000
--- a/xmodule/assets/VideoBlockDisplay.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.xmodule_display.xmodule_VideoBlock {
-  @import "video/display.scss";
-  @import "video/accessible_menu.scss";
-}
diff --git a/xmodule/assets/VideoBlockEditor.scss b/xmodule/assets/VideoBlockEditor.scss
deleted file mode 100644
index eb966091ce46..000000000000
--- a/xmodule/assets/VideoBlockEditor.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_edit.xmodule_VideoBlock {
-  @import "tabs/tabs.scss";
-}
diff --git a/xmodule/assets/WordCloudBlockDisplay.scss b/xmodule/assets/WordCloudBlockDisplay.scss
deleted file mode 100644
index 884112a4804c..000000000000
--- a/xmodule/assets/WordCloudBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_WordCloudBlock {
-  @import "word_cloud/display.scss";
-}
diff --git a/xmodule/assets/annotatable/_display.scss b/xmodule/assets/annotatable/_display.scss
deleted file mode 100644
index 9aaa8649c6c5..000000000000
--- a/xmodule/assets/annotatable/_display.scss
+++ /dev/null
@@ -1,197 +0,0 @@
-/* TODO: move top-level variables to a common _variables.scss.
- * NOTE: These variables were only added here because when this was integrated with the CMS,
- * SASS compilation errors were triggered because the CMS didn't have the same variables defined
- * that the LMS did, so the quick fix was to localize the LMS variables not shared by the CMS.
- * -Abarrett and Vshnayder
- */
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-
-$annotatable--border-color: var(--gray-l3);
-$annotatable--body-font-size: em(14);
-
-.annotatable-wrapper {
-  position: relative;
-}
-
-.annotatable-header {
-  margin-bottom: 0.5em;
-}
-
-.annotatable-section {
-  position: relative;
-  padding: 0.5em 1em;
-  border: 1px solid $annotatable--border-color;
-  border-radius: 0.5em;
-  margin-bottom: 0.5em;
-
-  &.shaded { background-color: #ededed; }
-
-  .annotatable-section-title {
-    font-weight: bold;
-    a { font-weight: normal; }
-  }
-
-  .annotatable-section-body {
-    border-top: 1px solid $annotatable--border-color;
-    margin-top: 0.5em;
-    padding-top: 0.5em;
-
-    @include clearfix();
-  }
-
-  ul.instructions-template {
-    list-style: disc;
-    margin-left: 4em;
-    b { font-weight: bold; }
-    i { font-style: italic; }
-
-    code {
-      display: inline;
-      white-space: pre;
-      font-family: Courier New, monospace;
-    }
-  }
-}
-
-.annotatable-toggle {
-  position: absolute;
-  right: 0;
-  margin: 2px 1em 2px 0;
-  &.expanded::after { content: " \2191"; }
-  &.collapsed::after { content: " \2193"; }
-}
-
-.annotatable-span {
-  @extend %ui-fake-link;
-
-  display: inline;
-
-  $highlight_index: 0;
-
-  @each $highlight in (
-    (yellow rgba(255, 255,10, 0.3) rgba(255, 255,10, 0.9)),
-    (red rgba(178,19,16,0.3) rgba(178,19,16,0.9)),
-    (orange rgba(255,165,0, 0.3) rgba(255,165,0, 0.9)),
-    (green rgba(25,255,132,0.3) rgba(25,255,132,0.9)),
-    (blue rgba(35,163,255,0.3) rgba(35,163,255,0.9)),
-    (purple rgba(115,9,178,0.3) rgba(115,9,178,0.9))) {
-
-    $highlight_index: $highlight_index + 1;
-    $marker: nth($highlight, 1);
-    $color: nth($highlight, 2);
-    $selected_color: nth($highlight, 3);
-
-    @if $highlight_index == 1 {
-      &.highlight {
-        background-color: $color;
-        &.selected { background-color: $selected_color; }
-      }
-    }
-
-    &.highlight-#{$marker} {
-      background-color: $color;
-      &.selected { background-color: $selected_color; }
-    }
-  }
-
-  &.hide {
-    cursor: none;
-    background-color: inherit;
-
-    .annotatable-icon {
-      display: none;
-    }
-  }
-
-  .annotatable-comment {
-    display: none;
-  }
-}
-
-.ui-tooltip.qtip.ui-tooltip {
-  font-size: $annotatable--body-font-size;
-  border: 1px solid #333;
-  border-radius: 1em;
-  background-color: rgba(0, 0, 0, 0.85);
-  color: var(--white);
-  -webkit-font-smoothing: antialiased;
-
-  .ui-tooltip-titlebar {
-    font-size: em(16);
-    color: inherit;
-    background-color: transparent;
-    padding: calc((var(--baseline)/4)) calc((var(--baseline)/2));
-    border: none;
-
-    .ui-tooltip-title {
-      padding: calc((var(--baseline)/4)) 0;
-      border-bottom: 2px solid #333;
-      font-weight: bold;
-    }
-
-    .ui-tooltip-icon {
-      right: 10px;
-      background: #333;
-    }
-
-    .ui-state-hover {
-      color: inherit;
-      border: 1px solid var(--gray-l3);
-    }
-  }
-
-  .ui-tooltip-content {
-    color: inherit;
-    font-size: em(14);
-    text-align: left;
-    font-weight: 400;
-    padding: 0 calc((var(--baseline)/2)) calc((var(--baseline)/2)) calc((var(--baseline)/2));
-    background-color: transparent;
-    border-color: transparent;
-  }
-
-  p {
-    color: inherit;
-    line-height: normal;
-  }
-}
-
-.ui-tooltip.qtip.ui-tooltip-annotatable {
-  max-width: 375px;
-
-  .ui-tooltip-content {
-    padding: 0 calc((var(--baseline)/2));
-
-    .annotatable-comment {
-      display: block;
-      margin: 0 0 calc((var(--baseline)/2)) 0;
-      max-height: 225px;
-      overflow: auto;
-      line-height: normal;
-    }
-
-    .annotatable-reply {
-      display: block;
-      border-top: 2px solid #333;
-      padding: calc((var(--baseline)/4)) 0;
-      margin: 0;
-      text-align: center;
-    }
-  }
-
-  &::after {
-    content: '';
-    display: inline-block;
-    position: absolute;
-    bottom: -20px;
-    left: 50%;
-    height: 0;
-    width: 0;
-    margin-left: calc(-1 * (var(--baseline) / 4));
-    border: 10px solid transparent;
-    border-top-color: rgba(0, 0, 0, 0.85);
-  }
-}
diff --git a/xmodule/assets/capa/_display.scss b/xmodule/assets/capa/_display.scss
deleted file mode 100644
index 15571b65dc30..000000000000
--- a/xmodule/assets/capa/_display.scss
+++ /dev/null
@@ -1,1747 +0,0 @@
-// capa - styling
-// ====================
-
-// Table of Contents
-// * +Variables - Capa
-// * +Extends - Capa
-// * +Mixins - Status Icon - Capa
-// * +Resets - Deprecate Please
-// * +Problem - Base
-// * +Problem - Choice Group
-// * +Problem - Misc, Unclassified Mess
-// * +Problem - Text Input, Numerical Input
-// * +Problem - Option Input (Dropdown)
-// * +Problem - CodeMirror
-// * +Problem - Misc, Unclassified Mess Part 2
-// * +Problem - Rubric
-// * +Problem - Annotation
-// * +Problem - Choice Text Group
-// * +Problem - Image Input Overrides
-// * +Problem - Annotation Problem Overrides
-@import 'vendor/bi-app/bi-app-ltr';
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-
-// +Variables - Capa
-// ====================
-$annotation-yellow: rgba(255, 255, 10, 0.3);
-$color-copy-tip: rgb(100, 100, 100);
-
-// FontAwesome Icon code
-// ====================
-$checkmark-icon: '\f00c'; // .fa-check
-$cross-icon: '\f00d'; // .fa-close
-$asterisk-icon: '\f069'; // .fa-asterisk
-
-
-@import '../../../../../static/sass/edx-pattern-library-shims/base/variables';
-
-// +Extends - Capa
-// ====================
-// Duplicated from _mixins.scss due to xmodule compilation, inheritance issues
-%use-font-awesome {
-  font-family: FontAwesome;
-  -webkit-font-smoothing: antialiased;
-  display: inline-block;
-  speak: none;
-}
-
-// +Mixins - Status Icon - Capa
-// ====================
-@mixin status-icon($color: $gray, $fontAwesomeIcon: "\f00d") {
-  .status-icon {
-    &::after {
-      @extend %use-font-awesome;
-
-      color: $color;
-      font-size: 1.2em;
-      content: $fontAwesomeIcon;
-    }
-  }
-}
-
-// +Resets - Deprecate Please
-// ====================
-h2 {
-  margin-top: 0;
-  margin-bottom: ($baseline*0.75);
-
-  &.problem-header {
-    display: inline-block;
-
-    section.staff {
-      margin-top: ($baseline*1.5);
-      font-size: 80%;
-    }
-  }
-
-  @media print {
-    display: block;
-    width: auto;
-    border-right: 0;
-  }
-}
-
-.explanation-title {
-  font-weight: bold;
-}
-
-%feedback-hint {
-  margin-top: ($baseline / 4);
-
-  .icon {
-    @include margin-right($baseline / 4);
-  }
-}
-
-.feedback-hint-incorrect {
-  @extend %feedback-hint;
-
-  .icon {
-    color: $incorrect;
-  }
-}
-
-.feedback-hint-partially-correct,
-.feedback-hint-correct {
-  @extend %feedback-hint;
-
-  .icon {
-    color: $correct;
-  }
-}
-
-.feedback-hint-text {
-  color: $color-copy-tip;
-}
-
-.problem-hint {
-  margin-bottom: 20px;
-  width: 100%;
-}
-
-.hint-label {
-  display: inline-block;
-  padding-right: 0.5em;
-}
-
-.hint-text {
-  display: inline-block;
-}
-
-.feedback-hint-multi .hint-text {
-  display: block;
-}
-
-iframe[seamless] {
-  overflow: hidden;
-  padding: 0;
-  border: 0 none transparent;
-  background-color: transparent;
-}
-
-.inline-error {
-  color: darken($error-color, 11%);
-}
-
-div.problem-progress {
-  display: inline-block;
-  color: $gray-d1;
-  font-size: em(14);
-}
-
-// +Problem - Base
-// ====================
-div.problem {
-  padding-top: $baseline;
-
-  @media print {
-    display: block;
-    padding: 0;
-    width: auto;
-
-    canvas,
-    img {
-      page-break-inside: avoid;
-    }
-  }
-
-  input.math {
-    direction: ltr; // Equations are always English
-  }
-
-  .inline {
-    display: inline;
-
-    + p {
-      margin-top: $baseline;
-    }
-  }
-
-  .question-description {
-    color: $gray-d1;
-    font-size: $small-font-size;
-  }
-
-  form > label, .problem-group-label {
-    display: block;
-    margin-bottom: $baseline;
-    font: inherit;
-    color: inherit;
-    -webkit-font-smoothing: initial;
-  }
-
-  .problem-group-label + .question-description {
-    margin-top: -$baseline;
-  }
-
-}
-
-// CAPA gap spacing between problem parts
-// can not use the & + & since .problem is nested deeply in .xmodule_display.xmodule_CapaModule
-.wrapper-problem-response + .wrapper-problem-response,
-.wrapper-problem-response + p {
-  margin-top: ($baseline * 1.5);
-}
-
-// Choice Group - silent class
-%choicegroup-base {
-  @include clearfix();
-
-  min-width: 100px;
-  width: auto !important;
-  width: 100px;
-
-  label {
-    box-sizing: border-box;
-
-    display: inline-block;
-    clear: both;
-    margin-bottom: ($baseline/2);
-    border: 2px solid $gray-l4;
-    border-radius: 3px;
-    padding: ($baseline/2);
-    width: 100%;
-
-    &::after {
-      @include margin-left($baseline*0.75);
-    }
-  }
-
-  .indicator-container {
-    min-height: 1px;
-    width: 25px;
-    display: inline-block;
-  }
-
-  fieldset {
-    box-sizing: border-box;
-  }
-
-  input[type="radio"],
-  input[type="checkbox"] {
-    @include margin($baseline/4);
-    @include margin-right($baseline/2);
-  }
-
-  input {
-    &:focus,
-    &:hover {
-      & + label {
-        border: 2px solid $blue;
-      }
-    }
-
-    &,
-    &:focus,
-    &:hover {
-      & + label.choicegroup_correct {
-        @include status-icon($correct, $checkmark-icon);
-
-        border: 2px solid $correct;
-      }
-
-      & + label.choicegroup_partially-correct {
-        @include status-icon($partially-correct, $asterisk-icon);
-
-        border: 2px solid $partially-correct;
-      }
-
-      & + label.choicegroup_incorrect {
-        @include status-icon($incorrect, $cross-icon);
-
-        border: 2px solid $incorrect;
-      }
-
-      & + label.choicegroup_submitted {
-        border: 2px solid $submitted;
-      }
-    }
-  }
-}
-
-// +Problem - Choice Group
-// ====================
-div.problem {
-  .choicegroup {
-    @extend %choicegroup-base;
-
-    .field {
-      position: relative;
-    }
-
-    label {
-      @include padding($baseline/2);
-      @include padding-left($baseline*2.3);
-
-      position: relative;
-      font-size: $base-font-size;
-      line-height: normal;
-      cursor: pointer;
-    }
-
-    input[type="radio"],
-    input[type="checkbox"] {
-      @include left(em(9));
-
-      position: absolute;
-      top: 0.35em;
-      width: $baseline*1.1;
-      height: $baseline*1.1;
-      z-index: 1;
-    }
-
-    legend {
-      margin-bottom: $baseline;
-      max-width: 100%;
-      white-space: normal;
-    }
-
-    legend + .question-description {
-      margin-top: -$baseline;
-      max-width: 100%;
-      white-space: normal;
-    }
-  }
-}
-
-// +Problem - Status Indicators
-// ====================
-// Summary status indicators shown after the input area
-div.problem {
-  .indicator-container {
-    @include margin-left($baseline*0.75);
-
-    .status {
-      width: $baseline;
-
-      // CASE: correct answer
-      &.correct {
-        @include status-icon($correct, $checkmark-icon);
-      }
-
-      // CASE: partially correct answer
-      &.partially-correct {
-        @include status-icon($partially-correct, $asterisk-icon);
-      }
-
-      // CASE: incorrect answer
-      &.incorrect {
-        @include status-icon($incorrect, $cross-icon);
-      }
-
-      &.submitted,
-      &.unsubmitted,
-      &.unanswered {
-        .status-icon {
-          content: '';
-        }
-      }
-    }
-  }
-}
-
-// +Problem - Misc, Unclassified Mess
-// ====================
-div.problem {
-  ol.enumerate {
-    li {
-      &::before {
-        display: block;
-        visibility: hidden;
-        height: 0;
-        content: " ";
-      }
-    }
-  }
-
-  .solution-span {
-    > span {
-      margin: $baseline 0;
-      display: block;
-      position: relative;
-
-      &:empty {
-        display: none;
-      }
-    }
-  }
-
-  .targeted-feedback-span {
-    > span {
-      display: block;
-      position: relative;
-
-      &:empty {
-        display: none;
-      }
-    }
-  }
-
-  // known classes using this div: .indicator-container, moved to section above
-  div {
-
-    // TO-DO: Styling used by advanced capa problem types. Should be synced up to use .status class
-    p {
-      &.answer {
-        margin-top: -2px;
-      }
-
-      span.clarification i {
-        font-style: normal;
-
-        &:hover {
-          color: $blue;
-        }
-      }
-    }
-
-    &.correct, &.ui-icon-check {
-      input {
-        border-color: $correct;
-      }
-    }
-
-    &.partially-correct, &.ui-icon-check {
-      input {
-        border-color: $partially-correct;
-      }
-    }
-
-    &.processing {
-      input {
-        border-color: #aaa;
-      }
-    }
-
-    &.ui-icon-close {
-      input {
-        border-color: $incorrect;
-      }
-    }
-
-    &.incorrect, &.incomplete {
-      input {
-        border-color: $incorrect;
-      }
-    }
-
-    &.submitted, &.ui-icon-check {
-      input {
-        border-color: $submitted;
-      }
-    }
-
-    p.answer {
-      display: inline-block;
-      margin-top: ($baseline / 2);
-      margin-bottom: 0;
-
-      &::before {
-        @extend %t-strong;
-
-        display: inline;
-        content: "Answer: ";
-
-      }
-
-      &:empty {
-        &::before {
-          display: none;
-        }
-      }
-    }
-
-    div.equation {
-      clear: both;
-      margin-top: 3px;
-
-      .MathJax_Display {
-        width: auto;
-      }
-
-      img.loading {
-        @include padding-left($baseline/2);
-
-        display: inline-block;
-      }
-
-      span {
-        margin-bottom: 0;
-        display: inline-block;
-
-        &.MathJax_CHTML, &.MathJax, &.MathJax_SVG {
-          padding: 6px;
-          min-width: 30px;
-          border: 1px solid #e3e3e3;
-          border-radius: 4px;
-          background: #f1f1f1;
-        }
-      }
-    }
-
-    // Hides equation previews in symbolic response problems when printing
-    [id^='display'].equation {
-      @media print {
-        display: none;
-      }
-    }
-
-    //TO-DO: review and deprecate all these styles within span {}
-    span {
-      &.ui-icon-bullet {
-        display: inline-block;
-        position: relative;
-        top: 4px;
-        width: 14px;
-        height: 14px;
-        background: url('#{$static-path}/images/unanswered-icon.png') center center no-repeat;
-      }
-
-      &.processing, &.ui-icon-processing {
-        display: inline-block;
-        position: relative;
-        top: 6px;
-        width: 25px;
-        height: 20px;
-        background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
-      }
-
-      &.ui-icon-check {
-        display: inline-block;
-        position: relative;
-        top: 3px;
-        width: 25px;
-        height: 20px;
-        background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
-      }
-
-      &.incomplete, &.ui-icon-close {
-        display: inline-block;
-        position: relative;
-        top: 3px;
-        width: 20px;
-        height: 20px;
-        background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
-      }
-    }
-
-    .reload {
-      @include float(right);
-
-      margin: ($baseline/2);
-    }
-
-
-    .grader-status {
-      @include clearfix();
-
-      margin: $baseline/2 0;
-      padding: $baseline/2;
-      border-radius: 5px;
-      background: $gray-l6;
-
-      span {
-        display: block;
-        float: left;
-        overflow: hidden;
-        margin: -7px 7px 0 0;
-        text-indent: -9999px;
-      }
-
-      .grading {
-        margin: 0px 7px 0 0;
-        padding-left: 25px;
-        background: url('#{$static-path}/images/info-icon.png') left center no-repeat;
-        text-indent: 0px;
-      }
-
-      p {
-        float: left;
-        margin-bottom: 0;
-        text-transform: capitalize;
-        line-height: 20px;
-      }
-
-      &.file {
-        margin-top: $baseline;
-        padding: $baseline 0 0 0;
-        border: 0;
-        border-top: 1px solid #eee;
-        background: $white;
-
-        p.debug {
-          display: none;
-        }
-
-        input {
-          float: left;
-        }
-      }
-
-    }
-
-    .evaluation {
-      p {
-        margin-bottom: ($baseline/5);
-      }
-    }
-
-
-    .feedback-on-feedback {
-      margin-right: $baseline;
-      height: 100px;
-    }
-
-    .evaluation-response {
-      header {
-        text-align: right;
-
-        a {
-          font-size: .85em;
-        }
-      }
-    }
-
-    .evaluation-scoring {
-      .scoring-list {
-        margin-left: 3px;
-        list-style-type: none;
-
-        li {
-          display:inline;
-          margin-left: 50px;
-
-          &:first-child {
-            margin-left: 0;
-          }
-
-          label {
-            font-size: .9em;
-          }
-        }
-      }
-    }
-
-    .submit-message-container {
-      margin: $baseline 0px ;
-    }
-  }
-
-  div.inline {
-    > span {
-      display: inline;
-    }
-  }
-
-  ul {
-    margin-bottom: lh();
-    margin-left: .75em;
-    margin-left: .75rem;
-    list-style: disc outside none;
-  }
-
-  ol {
-    margin-bottom: lh();
-    margin-left: .75em;
-    margin-left: .75rem;
-    list-style: decimal outside none;
-  }
-
-  dl {
-    line-height: 1.4em;
-  }
-
-  dl dt {
-    @extend %t-strong;
-
-  }
-
-  dl dd {
-    margin-bottom: 0;
-  }
-
-  dd {
-    margin-left: .5em;
-    margin-left: .5rem;
-  }
-
-  li {
-    margin-bottom: lh(0.5);
-    line-height: 1.4em;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  p {
-    margin-bottom: lh();
-  }
-
-  table {
-    margin: lh() 0;
-    border-collapse: collapse;
-    table-layout: auto;
-
-    td, th {
-      &.cont-justified-left {
-        text-align: left !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
-      }
-
-      &.cont-justified-right {
-        text-align: right !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
-      }
-
-      &.cont-justified-center {
-        text-align: center !important; // nasty, but needed to override the bad specificity of the xmodule css selectorsstyles
-      }
-    }
-
-    th {
-      @extend %t-strong;
-
-      text-align: left;
-    }
-
-    td {
-      text-align: left;
-    }
-
-    caption, th, td {
-      padding: .25em .75em .25em 0;
-      padding: .25rem .75rem .25rem 0;
-    }
-
-    caption {
-      margin-bottom: .75em;
-      margin-bottom: .75rem;
-      padding: .75em 0;
-      padding: .75rem 0;
-      background: #f1f1f1;
-    }
-
-    tr, td, th {
-      vertical-align: middle;
-    }
-  }
-
-  code {
-    margin: 0 2px;
-    padding: 0px 5px;
-    border: 1px solid #eaeaea;
-    border-radius: 3px;
-    background-color: $gray-l6;
-    white-space: nowrap;
-    font-size: .9em;
-  }
-
-  pre {
-    overflow: auto;
-    padding: 6px $baseline/2;
-    border: 1px solid $gray-l3;
-    border-radius: 3px;
-    background-color: $gray-l6;
-    font-size: .9em;
-    line-height: 1.4;
-
-    > code {
-      margin: 0;
-      padding: 0;
-      border: none;
-      background: transparent;
-      white-space: pre;
-    }
-  }
-}
-
-// +Problem - Text Input, Numerical Input
-// ====================
-.problem {
-  .capa_inputtype.textline, .inputtype.formulaequationinput {
-    input {
-      box-sizing: border-box;
-
-      border: 2px solid $gray-l4;
-      border-radius: 3px;
-      min-width: 160px;
-      height: 46px;
-    }
-
-    .status {
-      display: inline-block;
-      margin-top: ($baseline/2);
-      background: none;
-    }
-
-    // CASE: incorrect answer
-    > .incorrect {
-      input {
-        border: 2px solid $incorrect;
-      }
-
-      .status {
-        @include status-icon($incorrect, $cross-icon);
-      }
-    }
-
-    // CASE: partially correct answer
-    > .partially-correct {
-      input {
-        border: 2px solid $partially-correct;
-      }
-
-      .status {
-        @include status-icon($partially-correct, $asterisk-icon);
-      }
-    }
-
-    // CASE: correct answer
-    > .correct {
-      input {
-        border: 2px solid $correct;
-      }
-
-      .status {
-        @include status-icon($correct, $checkmark-icon);
-      }
-    }
-
-    // CASE: submitted, correctness withheld
-    > .submitted {
-      input {
-        border: 2px solid $submitted;
-      }
-
-      .status {
-        content: '';
-      }
-    }
-
-    // CASE: unanswered and unsubmitted
-    > .unanswered, > .unsubmitted {
-      input {
-        border: 2px solid $gray-l4;
-      }
-
-      .status {
-        .status-icon {
-          &::after {
-            content: '';
-            display: inline-block;
-          }
-        }
-      }
-    }
-
-  }
-
-  .inputtype.formulaequationinput {
-    > div {
-      input {
-        direction: ltr;
-        @include text-align(left);
-      }
-    }
-  }
-
-  .trailing_text {
-    @include margin-right($baseline/2);
-
-    display: inline-block;
-  }
-}
-
-
-// +Problem - Option Input (Dropdown)
-// ====================
-.problem {
-  .inputtype.option-input {
-    margin: 0 0 0 0 !important;
-
-    .indicator-container {
-      display: inline-block;
-
-      .status.correct::after,
-      .status.partially-correct::after,
-      .status.incorrect::after,
-      .status.submitted::after,
-      .status.unanswered::after {
-        @include margin-left(0);
-      }
-    }
-  }
-}
-
-// +Problem - CodeMirror
-// ====================
-div.problem {
-  .CodeMirror {
-    border: 1px solid black;
-    font-size: 14px;
-    line-height: 18px;
-    resize: none;
-
-    .cm-tab {
-      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
-      background-position: right;
-      background-repeat: no-repeat;
-    }
-
-    pre {
-      overflow: hidden;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-      border-radius: 0;
-      background: transparent;
-      white-space: pre;
-      word-wrap: normal;
-      font-size: inherit;
-      font-family: inherit;
-      resize: none;
-
-      &.CodeMirror-cursor {
-        @extend %ui-depth1;
-
-        position: absolute;
-        visibility: hidden;
-        width: 0;
-        border-right: none;
-        border-left: 1px solid $black;
-      }
-    }
-  }
-
-  .CodeMirror-focused pre.CodeMirror-cursor {
-    visibility: visible;
-  }
-
-  .CodeMirror-code pre {
-    width: -webkit-fit-content;
-    width: -moz-fit-content;
-    width: fit-content;
-  }
-
-  .CodeMirror-scroll {
-    margin-right: 0px;
-  }
-}
-
-.capa-message {
-  display: inline-block;
-  color: $gray-d1;
-  -webkit-font-smoothing: antialiased;
-}
-
-// +Problem - Actions
-// ====================
-div.problem .action {
-  min-height: $baseline;
-  width: 100%;
-  display: flex;
-  display: -ms-flexbox;
-  -ms-flex-align: start;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-
-  .problem-action-buttons-wrapper {
-      display: inline-flex;
-      justify-content: flex-end;
-      width: 100%;
-      padding-bottom: $baseline;
-  }
-
-  .problem-action-button-wrapper {
-    @include border-right(1px solid $gray-300);
-    @include padding(0, 13px); // to create a 26px gap, which is an a11y recommendation
-
-    display: inline-block;
-
-    &:last-child {
-      border: none;
-      padding-right: 0;
-    }
-  }
-
-  .problem-action-btn {
-    border: none;
-    max-width: 110px;
-
-    &:hover,
-    &:focus,
-    &:active {
-      color: $primary !important;
-    }
-
-    .icon {
-      margin-bottom: $baseline / 10;
-      display: block;
-    }
-
-    @media print {
-      display: none;
-    }
-  }
-
-  .submit-attempt-container {
-    padding-bottom: $baseline;
-    flex-grow: 1;
-    display: flex;
-    align-items: center;
-
-    @media (max-width: $bp-screen-lg) {
-      max-width: 100%;
-      padding-bottom: $baseline;
-    }
-
-    .submit {
-      @include margin-right($baseline / 2);
-      @include float(left);
-
-      white-space: nowrap;
-    }
-
-    .submit-cta-description {
-        color: $primary;
-        font-size: small;
-        padding-right: $baseline / 2;
-    }
-    .submit-cta-link-button {
-        color: $primary;
-        padding-right: $baseline / 4;
-    }
-  }
-
-  .submission-feedback {
-    @include margin-right($baseline / 2);
-
-    margin-top: $baseline / 2;
-    display: inline-block;
-    color: $gray-d1;
-    font-size: $medium-font-size;
-    -webkit-font-smoothing: antialiased;
-    vertical-align: middle;
-
-    &.cta-enabled {
-      margin-top: 0;
-    }
-  }
-}
-
-
-// +Problem - Misc, Unclassified Mess Part 2
-// ====================
-div.problem {
-  hr {
-    float: none;
-    clear: both;
-    margin: 0 0 .75rem;
-    width: 100%;
-    height: 1px;
-    border: none;
-    background: #ddd;
-    color: #ddd;
-  }
-
-  .hidden {
-    display: none;
-    visibility: hidden;
-  }
-
-  #{$all-text-inputs} {
-    display: inline;
-    width: auto;
-  }
-
-  // this supports a deprecated element and should be removed once the center tag is removed
-  center {
-    display: block;
-    margin: lh() 0;
-    padding: lh();
-    border: 1px solid $gray-l3;
-  }
-
-  .message {
-    font-size: inherit;
-  }
-
-  .detailed-solution > p {
-    margin: 0;
-
-    &:first-child {
-      @extend %t-strong;
-
-      margin-bottom: 0;
-    }
-
-  }
-
-  .detailed-targeted-feedback,
-  .detailed-targeted-feedback-partially-correct,
-  .detailed-targeted-feedback-correct {
-    > p {
-      margin: 0;
-      font-weight: normal;
-
-      &:first-child {
-        @extend %t-strong;
-      }
-    }
-  }
-
-  div.capa_alert {
-    margin-top: $baseline;
-    padding: 8px 12px;
-    border: 1px solid $warning-color;
-    border-radius: 3px;
-    background: $warning-color-accent;
-    font-size: 0.9em;
-  }
-
-  .notification {
-    @include float(left);
-
-    margin-top: $baseline / 2;
-    padding: ($baseline / 2.5) ($baseline / 2) ($baseline / 5) ($baseline / 2);
-    line-height: $base-line-height;
-
-    &.success {
-      @include notification-by-type($success);
-    }
-
-    &.error {
-      @include notification-by-type($danger);
-    }
-
-    &.warning {
-      @include notification-by-type($warning);
-    }
-
-    &.general {
-      @include notification-by-type($general-color-accent);
-    }
-
-    &.problem-hint {
-      border: 1px solid $uxpl-gray-background;
-      border-radius: 6px;
-
-      .icon {
-        @include margin-right(3 * $baseline / 4);
-
-        color: $uxpl-gray-dark;
-      }
-
-      li {
-        color: $uxpl-gray-base;
-
-        strong {
-          color: $uxpl-gray-dark;
-        }
-      }
-    }
-
-    .icon {
-      @include float(left);
-
-      position: relative;
-      top: $baseline / 5;
-    }
-
-    .notification-message {
-      display: inline-block;
-      width: flex-grid(7,10);
-      // Make notification tall enough that when the "Review" button is displayed,
-      // the notification does not grow in height.
-      margin-bottom: 8px;
-
-      ol {
-        list-style: none outside none;
-        padding: 0;
-        margin: 0;
-
-        li:not(:last-child) {
-          margin-bottom: $baseline / 4;
-        }
-      }
-    }
-
-    .notification-btn-wrapper {
-      @include float(right);
-    }
-
-  }
-
-  .notification-btn {
-    @include float(right);
-
-    padding: ($baseline / 10) ($baseline / 4);
-    min-width: ($baseline * 3);
-    display: block;
-    clear: both;
-
-    &:first-child {
-      margin-bottom: $baseline / 4;
-    }
-  }
-
-  // override default button hover
-  button {
-    &:hover {
-      background-image: none;
-      box-shadow: none;
-    }
-
-    &:focus {
-      box-shadow: none;
-    }
-
-    &.btn-default {
-      background-color: transparent;
-    }
-
-    &.btn-brand {
-      &:hover {
-        background-color: $btn-brand-focus-background;
-      }
-    }
-  }
-
-  .review-btn {
-    color: $blue; // notification type has other colors
-    &.sr {
-      color: $blue;
-    }
-  }
-
-  div.capa_reset {
-    padding: 25px;
-    border: 1px solid $error-color;
-    background-color: lighten($error-color, 25%);
-    border-radius: 3px;
-    font-size: 1em;
-    margin-top: $baseline/2;
-    margin-bottom: $baseline/2;
-  }
-
-  .capa_reset>h2 {
-    color: #a00;
-  }
-
-  .capa_reset li {
-    font-size: 0.9em;
-  }
-
-  .hints {
-    border: 1px solid $gray-l3;
-
-    h3 {
-      @extend %t-strong;
-
-      padding: 9px;
-      border-bottom: 1px solid #e3e3e3;
-      background: #eee;
-      text-shadow: 0 1px 0 $white;
-      font-size: em(16);
-    }
-
-    div {
-      border-bottom: 1px solid #ddd;
-
-      &:last-child {
-        border-bottom: none;
-      }
-
-      p {
-        margin-bottom: 0;
-      }
-
-      header {
-        a {
-          display: block;
-          padding: 9px;
-          background: $gray-l6;
-          box-shadow: inset 0 0 0 1px $white;
-        }
-      }
-
-      > section {
-        padding: 9px;
-      }
-    }
-  }
-
-  .test {
-    padding-top: 18px;
-
-    header {
-      margin-bottom: 12px;
-
-      h3 {
-        @extend %t-strong;
-
-        color: #aaa;
-        font-style: normal;
-        font-size: 0.9em;
-      }
-    }
-
-    > section {
-      position: relative;
-      margin-bottom: ($baseline/2);
-      padding: 9px 9px $baseline;
-      border: 1px solid #ddd;
-      border-radius: 3px;
-      background: $white;
-      box-shadow: inset 0 0 0 1px #eee;
-
-      p:last-of-type {
-        margin-bottom: 0;
-      }
-
-      .shortform {
-        margin-bottom: .6em;
-      }
-
-      a.full {
-        @include position(absolute, 0 0 1px 0);
-        box-sizing: border-box;
-
-        display: block;
-        padding: ($baseline/5);
-        background: $gray-l4;
-        text-align: right;
-        font-size: 1em;
-
-        &.full-top {
-          @include position(absolute, 1px 0 auto 0);
-        }
-
-        &.full-bottom {
-          @include position(absolute, auto 0 1px 0);
-        }
-      }
-    }
-  }
-
-  .external-grader-message {
-    section {
-      padding-top: ($baseline*1.5);
-      padding-left: $baseline;
-      background-color: #fafafa;
-      color: #2c2c2c;
-      font-size: 1em;
-      font-family: monospace;
-
-      header {
-        font-size: 1.4em;
-      }
-
-      .shortform {
-        @extend %t-strong;
-      }
-
-      .longform {
-        margin: 0;
-        padding: 0;
-
-        .result-errors {
-          margin: ($baseline/4);
-          padding: ($baseline/2) ($baseline/2) ($baseline/2) ($baseline*2);
-          background: url('#{$static-path}/images/incorrect-icon.png') center left no-repeat;
-
-          li {
-            color: #b00;
-          }
-        }
-
-        .result-output {
-          margin: $baseline/4;
-          padding: $baseline 0 ($baseline*0.75) 50px;
-          border-top: 1px solid #ddd;
-          border-left: $baseline solid #fafafa;
-
-          h4 {
-            font-size: 1em;
-            font-family: monospace;
-          }
-
-          dl {
-            margin: 0;
-          }
-
-          dt {
-            margin-top: $baseline;
-          }
-
-          dd {
-            margin-left: 24pt;
-          }
-        }
-
-        .result-correct {
-          background: url('#{$static-path}/images/correct-icon.png') left 20px no-repeat;
-
-          .result-actual-output {
-            color: #090;
-          }
-        }
-
-        .result-partially-correct {
-          background: url('#{$static-path}/images/partially-correct-icon.png') left 20px no-repeat;
-
-          .result-actual-output {
-            color: #090;
-          }
-        }
-
-        .result-incorrect {
-          background: url('#{$static-path}/images/incorrect-icon.png') left 20px no-repeat;
-
-          .result-actual-output {
-            color: #b00;
-          }
-        }
-
-        .markup-text{
-          margin: ($baseline/4);
-          padding: $baseline 0 15px 50px;
-          border-top: 1px solid #ddd;
-          border-left: 20px solid #fafafa;
-
-          bs {
-            color: #b00;
-          }
-
-          bg {
-            color: #bda046;
-          }
-        }
-      }
-    }
-  }
-}
-
-
-// +Problem - Rubric
-// ====================
-div.problem {
-  .rubric {
-    tr {
-      margin: ($baseline/2) 0;
-      height: 100%;
-    }
-
-    td {
-      margin: ($baseline/2) 0;
-      padding: $baseline 0;
-      height: 100%;
-    }
-
-    th {
-      margin: ($baseline/4);
-      padding: ($baseline/4);
-    }
-
-    label,
-    .view-only {
-      position: relative;
-      display: inline-block;
-      margin: 3px;
-      padding: ($baseline*0.75);
-      min-width: 50px;
-      min-height: 50px;
-      width: 150px;
-      height: 100%;
-      background-color: $gray-l3;
-      font-size: .9em;
-    }
-
-    .grade {
-      position: absolute;
-      right: 0;
-      bottom: 0;
-      margin: ($baseline/2);
-    }
-
-    .selected-grade {
-      background: #666;
-      color: white;
-    }
-
-    input[type=radio]:checked + label {
-      background: #666;
-      color: white;
-    }
-
-    input[class='score-selection'] {
-      display: none;
-    }
-  }
-}
-
-// +Problem - Annotation
-// ====================
-div.problem {
-  .annotation-input {
-    margin: 0 0 1em 0;
-    border: 1px solid $gray-l3;
-    border-radius: 1em;
-
-    .annotation-header {
-      @extend %t-strong;
-
-      padding: .5em 1em;
-      border-bottom: 1px solid $gray-l3;
-    }
-
-    .annotation-body { padding: .5em 1em; }
-
-    a.annotation-return {
-      float: right;
-      font: inherit;
-      font-weight: normal;
-    }
-
-    a.annotation-return::after { content: " \2191" }
-
-    .block, ul.tags {
-      margin: .5em 0;
-      padding: 0;
-    }
-
-    .block-highlight {
-      padding: .5em;
-      border: 1px solid darken($annotation-yellow, 10%);
-      background-color: $annotation-yellow;
-      color:  #333;
-      font-style: normal;
-    }
-
-    .block-comment { font-style: italic; }
-
-    ul.tags {
-      display: block;
-      margin-left: 1em;
-      list-style-type: none;
-
-      li {
-        position: relative;
-        display: block;
-        margin: 1em 0 0 0;
-
-        .tag {
-          @extend %ui-fake-link;
-
-          display: inline-block;
-          margin-left: ($baseline*2);
-          border: 1px solid rgb(102,102,102);
-
-          &.selected {
-            background-color: $annotation-yellow;
-          }
-        }
-
-        .tag-status {
-          position: absolute;
-          left: 0;
-        }
-        .tag-status, .tag { padding: .25em .5em; }
-      }
-    }
-
-    textarea.comment {
-      $num-lines-to-show: 5;
-      $line-height: 1.4em;
-      $padding: .2em;
-
-      padding: $padding (2 * $padding);
-      width: 100%;
-      height: ($num-lines-to-show * $line-height) + (2*$padding) - (($line-height - 1)/2);
-      line-height: $line-height;
-    }
-
-    .answer-annotation { display: block; margin: 0; }
-
-    /* for debugging the input value field. enable the debug flag on the inputtype */
-    .debug-value {
-      margin: 1em 0;
-      padding: 1em;
-      border: 1px solid $black;
-      background-color: #999;
-      color: $white;
-
-      input[type="text"] { width: 100%; }
-
-      pre { background-color: $gray-l3; color: $black; }
-
-      &::before {
-        @extend %t-strong;
-
-        display: block;
-        content: "debug input value";
-        font-size: 1.5em;
-      }
-    }
-  }
-}
-
-// +Problem - Choice Text Group
-// ====================
-div.problem {
-  .choicetextgroup {
-    @extend %choicegroup-base;
-
-    input[type="text"]{
-      margin-bottom: 0.5em;
-    }
-
-    label.choicetextgroup_correct, section.choicetextgroup_correct {
-      @extend label.choicegroup_correct;
-
-      input[type="text"] {
-        border-color: $correct;
-      }
-    }
-
-    label.choicetextgroup_partially-correct, section.choicetextgroup_partially-correct {
-      @extend label.choicegroup_partially-correct;
-
-      input[type="text"] {
-        border-color: $partially-correct;
-      }
-    }
-
-    label.choicetextgroup_incorrect, section.choicetextgroup_incorrect {
-      @extend label.choicegroup_incorrect;
-    }
-
-    label.choicetextgroup_submitted, section.choicetextgroup_submitted {
-      @extend label.choicegroup_submitted;
-    }
-
-    label.choicetextgroup_show_correct, section.choicetextgroup_show_correct {
-      &::after {
-        @include margin-left($baseline*0.75);
-
-        content: url('#{$static-path}/images/correct-icon.png');
-      }
-    }
-
-    span.mock_label {
-      cursor : default;
-    }
-  }
-}
-
-// +Problem - Image Input Overrides
-// ====================
-
-// NOTE: temporary override until image inputs use same base html structure as other common capa input types.
-div.problem .imageinput.capa_inputtype {
-  .status {
-    display: inline-block;
-    position: relative;
-    top: 3px;
-    width: 25px;
-    height: 20px;
-
-    &.unsubmitted,
-    &.unanswered {
-      .status-icon {
-        content: '';
-      }
-
-      .status-message {
-        display: none;
-      }
-    }
-  }
-
-  .correct {
-    @include status-icon($correct, $checkmark-icon);
-  }
-
-  .incorrect {
-    @include status-icon($incorrect, $cross-icon);
-  }
-
-  .partially-correct {
-    @include status-icon($partially-correct, $asterisk-icon);
-  }
-
-  .submitted {
-    content: '';
-  }
-}
-
-// +Problem - Annotation Problem Overrides
-// ====================
-
-// NOTE: temporary override until annotation problem inputs use same base html structure as other common capa input types.
-div.problem .annotation-input {
-  .tag-status {
-    display: inline-block;
-    position: relative;
-    top: 3px;
-    width: 25px;
-    height: 20px;
-
-    &.unsubmitted,
-    &.unanswered {
-      .status-icon {
-        content: '';
-      }
-
-      .status-message {
-        display: none;
-      }
-    }
-  }
-
-  .correct {
-    @include status-icon($correct, $checkmark-icon);
-  }
-
-  .incorrect {
-    @include status-icon($incorrect, $cross-icon);
-  }
-
-  .partially-correct {
-    @include status-icon($partially-correct, $asterisk-icon);
-  }
-
-  .submitted {
-    content: '';
-  }
-}
-
-// Loading Spinner
-// ====================
-.problems-wrapper .loading-spinner {
-  text-align: center;
-  color: $gray-d1;
-}
diff --git a/xmodule/assets/codemirror/_codemirror.scss b/xmodule/assets/codemirror/_codemirror.scss
deleted file mode 100644
index bf60ea6a49aa..000000000000
--- a/xmodule/assets/codemirror/_codemirror.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.CodeMirror {
-  background: #fff;
-  font-size: 13px;
-  color: #3c3c3c;
-}
diff --git a/xmodule/assets/editor/_edit.scss b/xmodule/assets/editor/_edit.scss
deleted file mode 100644
index 71699776522d..000000000000
--- a/xmodule/assets/editor/_edit.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@import 'vendor/bi-app/bi-app-ltr';
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'cms/theme/variables-v1';
-@import 'mixins';
-
-// This is shared CSS between the xmodule problem editor and the xmodule HTML editor.
-.editor {
-  position: relative;
-
-  .row {
-    position: relative;
-  }
-
-  .editor-bar {
-    @include clearfix();
-    @include linear-gradient(top, #d4dee8, #c9d5e2);
-
-    position: relative;
-    padding: ($baseline/4);
-    border-bottom-color: #a5aaaf;
-
-    button {
-      display: inline-block;
-
-      @include float(left);
-
-      padding: 3px ($baseline/2) 5px;
-      margin-left: 7px;
-      border: 0;
-      border-radius: 2px;
-      background: transparent;
-
-      .icon {
-        height: 21px;
-      }
-
-      &:hover,
-      &:focus {
-        background: rgba(255, 255, 255, .5);
-      }
-    }
-  }
-
-  .editor-tabs {
-    position: absolute;
-    top: 10px;
-
-    @include right(10px);
-    @include text-align(left);
-    @include direction();
-
-    li {
-      @include float(left);
-      @include margin-right($baseline/4);
-
-      &:last-child {
-        @include margin-right(0);
-      }
-    }
-
-    .tab {
-      display: block;
-      height: 24px;
-      padding: 7px 20px 3px;
-      border: 1px solid #a5aaaf;
-      border-radius: 3px 3px 0 0;
-
-      @include linear-gradient(top, $transparent 87%, rgba(0, 0, 0, .06));
-
-      background-color: #e5ecf3;
-      font-size: 13px;
-      color: #3c3c3c;
-      box-shadow: 1px -1px 1px rgba(0, 0, 0, .05);
-
-      &.current {
-        background: $white;
-        border-bottom-color: $white;
-      }
-    }
-  }
-}
diff --git a/xmodule/assets/html/_display.scss b/xmodule/assets/html/_display.scss
deleted file mode 100644
index 25e2ce4fbd64..000000000000
--- a/xmodule/assets/html/_display.scss
+++ /dev/null
@@ -1,318 +0,0 @@
-@import 'vendor/bi-app/bi-app-ltr';
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-
-// HTML component display:
-* {
-  line-height: 1.4em;
-}
-
-h1 {
-  color: $body-color;
-  font: normal 2em/1.4em $font-family-sans-serif;
-  letter-spacing: 1px;
-
-  @include margin(0, 0, 1.416em, 0);
-}
-
-h2 {
-  color: #646464;
-  font: normal 1.2em/1.2em $font-family-sans-serif;
-  letter-spacing: 1px;
-  margin-bottom: ($baseline*0.75);
-  -webkit-font-smoothing: antialiased;
-}
-
-h3,
-h4,
-h5,
-h6 {
-  @include margin(0, 0, ($baseline/2), 0);
-
-  font-weight: 600;
-}
-
-h3 {
-  font-size: 1.2em;
-}
-
-h4 {
-  font-size: 1em;
-}
-
-h5 {
-  font-size: 0.83em;
-}
-
-h6 {
-  font-size: 0.75em;
-}
-
-p {
-  margin-bottom: 1.416em;
-  font-size: 1em;
-  line-height: 1.6em !important;
-  color: $body-color;
-}
-
-em,
-i {
-  font-style: italic;
-
-  span {
-    font-style: italic;
-  }
-}
-
-strong,
-b {
-  font-weight: bold;
-
-  span {
-    font-weight: bold;
-  }
-}
-
-p + p,
-ul + p,
-ol + p {
-  margin-top: $baseline;
-}
-
-blockquote {
-  margin: 1em ($baseline*2);
-}
-
-ol,
-ul {
-  // Using the lower level Bi App Sass mixin to avoid @padding conflicts with bourbon.
-  @include bi-app-compact(padding, 0, 0, 0, 1em);
-
-  margin: 1em 0;
-  color: $body-color;
-
-  li {
-    margin-bottom: 0.708em;
-  }
-}
-
-ol {
-  list-style: decimal outside none;
-}
-
-ul {
-  list-style: disc outside none;
-}
-
-a {
-  &:link,
-  &:visited,
-  &:hover,
-  &:active,
-  &:focus {
-    color: $blue;
-  }
-}
-
-img {
-  max-width: 100%;
-}
-
-pre {
-  margin: 1em 0;
-  color: $body-color;
-  font-family: monospace, serif;
-  font-size: 1em;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-code {
-  color: $body-color;
-  font-family: monospace, serif;
-  background: none;
-  padding: 0;
-}
-
-table {
-  width: 100%;
-  margin: $baseline 0;
-  border-collapse: collapse;
-  font-size: 16px;
-
-  td,
-  th {
-    margin: $baseline 0;
-    padding: ($baseline/2);
-    border: 1px solid $gray-l3;
-    font-size: 14px;
-
-    &.cont-justified-left {
-      text-align: left !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
-    }
-
-    &.cont-justified-right {
-      text-align: right !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
-    }
-
-    &.cont-justified-center {
-      text-align: center !important; // nasty, but needed to override the bad specificity of the xmodule css selectorsstyles
-    }
-  }
-}
-
-th {
-  background: #eee;
-  font-weight: bold;
-}
-
-
-// image modal
-// --------------------
-
-// modal - image zoom, fill window
-.wrapper-modal-image {
-  .modal-ui-icon {
-    @extend %ui-fake-link;
-
-    position: absolute;
-    display: block;
-    padding: ($baseline/4) 7px;
-    border-radius: 5px;
-    opacity: 0.9;
-    background: $white;
-    color: $black;
-    border: 2px solid $black;
-
-    .label {
-      font-weight: bold;
-    }
-
-    i {
-      font-style: normal;
-    }
-  }
-
-  .image-link {
-    @extend %ui-fake-link;
-
-    position: relative;
-    display: block;
-
-    .action-fullscreen {
-      display: none;
-      top: 10px;
-      left: 10px;
-    }
-
-    &:hover .action-fullscreen {
-      display: block;
-    }
-  }
-
-  .image-modal {
-    @extend %ui-fake-link;
-    @extend %ui-depth5;
-
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    height: 100%;
-    width: 100%;
-    background-color: rgba(0, 0, 0, 0.7);
-
-    .image-content {
-      position: relative;
-      top: 2.5%;
-      display: block;
-      height: 95%;
-      width: 95%;
-      margin: auto;
-      overflow: hidden;
-
-      .image-wrapper {
-        position: relative;
-
-        img {
-          position: relative;
-          display: block;
-          max-width: 100%;
-          max-height: 100%;
-          margin: auto;
-          cursor: default;
-        }
-      }
-
-      .action-close {
-        top: 10px;
-        right: 10px;
-      }
-
-      .image-controls {
-        position: absolute;
-        right: 10px;
-        bottom: 10px;
-        margin: 0;
-        padding: 0;
-        list-style: none;
-
-        .image-control {
-          position: relative;
-          display: inline-block;
-          margin: 0;
-          padding: 0;
-
-          .modal-ui-icon {
-            position: relative;
-
-            &.action-zoom-in {
-              margin-right: ($baseline/4);
-            }
-
-            &.action-zoom-out {
-              margin-left: ($baseline/4);
-            }
-
-            &.is-disabled {
-              opacity: 0.5;
-              cursor: default;
-            }
-          }
-        }
-      }
-    }
-
-    &.image-is-fit-to-screen {
-      display: block;
-
-      // !important used here to override jQuery.
-      .image-content .image-wrapper {
-        top: 0 !important;
-        left: 0 !important;
-        width: 100% !important;
-        height: 100% !important;
-
-        img {
-          top: 0 !important;
-          left: 0 !important;
-        }
-      }
-    }
-
-    &.image-is-zoomed {
-      display: block;
-
-      .image-content .image-wrapper {
-        img {
-          max-width: none;
-          max-height: none;
-          margin: 0;
-          cursor: move;
-        }
-      }
-    }
-  }
-}
diff --git a/xmodule/assets/html/_edit.scss b/xmodule/assets/html/_edit.scss
deleted file mode 100644
index bf47a0f5d372..000000000000
--- a/xmodule/assets/html/_edit.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// HTML component editor:
-.html-editor {
-  @include clearfix();
-
-  .CodeMirror {
-    box-sizing: border-box;
-
-    height: 435px;
-  }
-
-  .is-inactive {
-    display: none;
-  }
-}
diff --git a/xmodule/assets/library_content/public/js/library_content_edit_helpers.js b/xmodule/assets/library_content/public/js/library_content_edit_helpers.js
deleted file mode 100644
index 564cc5fb0fbe..000000000000
--- a/xmodule/assets/library_content/public/js/library_content_edit_helpers.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* JavaScript for special editing operations that can be done on LibraryContentXBlock */
-// This is a temporary UI improvements that will be removed when V2 content libraries became
-// fully functional
-
-/**
- * Toggle the "Problem Type" settings section depending on selected library type.
- * As for now, the V2 libraries don't support different problem types, so they can't be
- * filtered by it. We're hiding the Problem Type field for them.
- */
-function checkProblemTypeShouldBeVisible(editor) {
-    var libraries = editor.find('.wrapper-comp-settings.metadata_edit.is-active')
-        .data().metadata.source_library_id.options;
-    var selectedIndex = $("select[name='Library']", editor)[0].selectedIndex;
-    var libraryKey = libraries[selectedIndex].value;
-    var url = URI('/xblock')
-        .segment(editor.find('.xblock.xblock-studio_view.xblock-studio_view-library_content.xblock-initialized')
-        .data('usage-id'))
-        .segment('handler')
-        .segment('is_v2_library');
-
-    $.ajax({
-        type: 'POST',
-        url: url,
-        data: JSON.stringify({'library_key': libraryKey}),
-        success: function(data) {
-            var problemTypeSelect = editor.find("select[name='Problem Type']")
-                .parents("li.field.comp-setting-entry.metadata_entry");
-            data.is_v2 ? problemTypeSelect.hide() : problemTypeSelect.show();
-        }
-    });
-}
-
-/**
- * Waits untill editor html loaded, than calls checks for Program Type field toggling.
- */
-function waitForEditorLoading() {
-    var checkContent = setInterval(function() {
-        var $modal = $('.xblock-editor');
-        var content = $modal.html();
-        if (content) {
-            clearInterval(checkContent);
-            checkProblemTypeShouldBeVisible($modal);
-        }
-    }, 10);
-}
-// Initial call
-waitForEditorLoading();
-
-var $librarySelect = $("select[name='Library']");
-$(document).on('change', $librarySelect, waitForEditorLoading)
-
-var $libraryContentEditors = $('.xblock-header.xblock-header-library_content');
-var $editBtns = $libraryContentEditors.find('.action-item.action-edit');
-$(document).on('click', $editBtns, waitForEditorLoading)
diff --git a/xmodule/assets/lti/_lti.scss b/xmodule/assets/lti/_lti.scss
deleted file mode 100644
index 4bd2c41317f5..000000000000
--- a/xmodule/assets/lti/_lti.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-@import 'base/mixins';
-
-h2.problem-header {
-  display: inline-block;
-}
-
-div.problem-progress {
-  display: inline-block;
-  padding-left: ($baseline/4);
-  color: #666;
-  font-weight: 100;
-  font-size: em(16);
-}
-
-
-div.lti {
-  // align center
-  margin: 0 auto;
-
-  .wrapper-lti-link {
-    @include font-size(14);
-
-    background-color: $sidebar-color;
-    padding: $baseline;
-
-    .lti-link {
-      margin-bottom: 0;
-      text-align: right;
-
-      .link_lti_new_window {
-        @extend .gray-button;
-
-        @include font-size(13);
-        @include line-height(14);
-      }
-    }
-  }
-
-  form.ltiLaunchForm {
-    display: none;
-  }
-
-  iframe.ltiLaunchFrame {
-    width: 100%;
-    height: 800px;
-    display: block;
-    border: 0px;
-  }
-
-  h4.problem-feedback-label {
-    font-weight: 100;
-    font-size: em(16);
-    font-family: "Source Sans", "Open Sans", Verdana, Geneva, sans-serif, sans-serif;
-  }
-
-  div.problem-feedback {
-    margin-top: ($baseline/4);
-    margin-bottom: ($baseline/4);
-
-  }
-}
diff --git a/xmodule/assets/poll/_display.scss b/xmodule/assets/poll/_display.scss
deleted file mode 100644
index 7c07f89376b2..000000000000
--- a/xmodule/assets/poll/_display.scss
+++ /dev/null
@@ -1,226 +0,0 @@
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-
-div.poll_question {
-  @media print {
-    display: block;
-    width: auto;
-    padding: 0;
-
-    canvas, img {
-      page-break-inside: avoid;
-    }
-  }
-
-  .inline {
-    display: inline;
-  }
-
-  h3 {
-    margin-top: 0;
-    margin-bottom: ($baseline*0.75);
-    color: #fe57a1;
-    font-size: 1.9em;
-
-    &.problem-header {
-      div.staff {
-        margin-top: ($baseline*1.5);
-        font-size: 80%;
-      }
-    }
-
-    @media print {
-      display: block;
-      width: auto;
-      border-right: 0;
-    }
-  }
-
-  p {
-    text-align: justify;
-    font-weight: bold;
-  }
-
-  .poll_answer {
-    margin-bottom: $baseline;
-
-    &.short {
-      clear: both;
-    }
-
-    .question {
-      height: auto;
-      clear: both;
-      min-height: 30px;
-
-      &.short {
-        clear: none;
-        width: 30%;
-        display: inline;
-        float: left;
-      }
-
-      .button {
-        @extend %ui-fake-link;
-
-        -webkit-appearance: none;
-        -webkit-background-clip: padding-box;
-        -webkit-border-image: none;
-        -webkit-box-align: center;
-        -webkit-box-shadow: rgb(255, 255, 255) 0px 1px 0px 0px inset;
-        -webkit-font-smoothing: antialiased;
-        -webkit-rtl-ordering: logical;
-        -webkit-user-select: text;
-        -webkit-writing-mode: horizontal-tb;
-        background-clip: padding-box;
-        background-color: rgb(238, 238, 238);
-        background-image: -webkit-linear-gradient(top, rgb(238, 238, 238), rgb(210, 210, 210));
-        border-bottom-color: rgb(202, 202, 202);
-        border-bottom-left-radius: 3px;
-        border-bottom-right-radius: 3px;
-        border-bottom-style: solid;
-        border-bottom-width: 1px;
-        border-left-color: rgb(202, 202, 202);
-        border-left-style: solid;
-        border-left-width: 1px;
-        border-right-color: rgb(202, 202, 202);
-        border-right-style: solid;
-        border-right-width: 1px;
-        border-top-color: rgb(202, 202, 202);
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
-        border-top-style: solid;
-        border-top-width: 1px;
-        box-shadow: rgb(255, 255, 255) 0px 1px 0px 0px inset;
-        box-sizing: border-box;
-        color: rgb(51, 51, 51);
-
-        /* display: inline-block; */
-        display: inline;
-        float: left;
-        font-family: 'Open Sans', Verdana, Geneva, sans-serif;
-        font-size: 13px;
-        font-style: normal;
-        font-variant: normal;
-        font-weight: bold;
-        letter-spacing: normal;
-        line-height: 25.59375px;
-        margin-bottom: ($baseline*0.75);
-        margin: 0;
-        padding: 0px;
-        text-align: center;
-        text-decoration: none;
-        text-indent: 0px;
-        text-shadow: rgb(248, 248, 248) 0px 1px 0px;
-        text-transform: none;
-        vertical-align: top;
-        white-space: pre-line;
-        width: 25px;
-        height: 25px;
-        word-spacing: 0px;
-        writing-mode: lr-tb;
-      }
-
-      .button.answered {
-        -webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
-        background-color: rgb(29, 157, 217);
-        background-image: -webkit-linear-gradient(top, rgb(29, 157, 217), rgb(14, 124, 176));
-        border-bottom-color: rgb(13, 114, 162);
-        border-left-color: rgb(13, 114, 162);
-        border-right-color: rgb(13, 114, 162);
-        border-top-color: rgb(13, 114, 162);
-        box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
-        color: rgb(255, 255, 255);
-        text-shadow: rgb(7, 103, 148) 0px 1px 0px;
-        background-image: none;
-      }
-
-      .text {
-        @extend %ui-fake-link;
-
-        display: inline;
-        float: left;
-        width: 80%;
-        text-align: left;
-        min-height: 30px;
-        margin-left: $baseline;
-        height: auto;
-        margin-bottom: $baseline;
-
-        &.short {
-          width: 100px;
-        }
-      }
-    }
-
-    .stats {
-      min-height: 40px;
-      margin-top: $baseline;
-      clear: both;
-
-      &.short {
-        margin-top: 0;
-        clear: none;
-        display: inline;
-        float: right;
-        width: 70%;
-      }
-
-      .bar {
-        width: 75%;
-        height: 20px;
-        border: 1px solid black;
-        display: inline;
-        float: left;
-        margin-right: ($baseline/2);
-
-        &.short {
-          width: 65%;
-          height: 20px;
-          margin-top: 3px;
-        }
-
-        .percent {
-          background-color: gray;
-          width: 0;
-          height: 20px;
-
-          &.short { }
-        }
-      }
-
-      .number {
-        width: 80px;
-        display: inline;
-        float: right;
-        height: 28px;
-        text-align: right;
-
-        &.short {
-          width: 120px;
-          height: auto;
-        }
-      }
-    }
-  }
-
-  .poll_answer.answered {
-    -webkit-box-shadow: rgb(97, 184, 225) 0 1px 0 0 inset;
-    background-color: rgb(29, 157, 217);
-    background-image: -webkit-linear-gradient(top, rgb(29, 157, 217), rgb(14, 124, 176));
-    border-bottom-color: rgb(13, 114, 162);
-    border-left-color: rgb(13, 114, 162);
-    border-right-color: rgb(13, 114, 162);
-    border-top-color: rgb(13, 114, 162);
-    box-shadow: rgb(97, 184, 225) 0 1px 0 0 inset;
-    color: rgb(255, 255, 255);
-    text-shadow: rgb(7, 103, 148) 0 1px 0;
-  }
-
-  .button.reset-button {
-    clear: both;
-    float: right;
-  }
-}
diff --git a/xmodule/assets/problem/_edit.scss b/xmodule/assets/problem/_edit.scss
deleted file mode 100644
index 018a0961c247..000000000000
--- a/xmodule/assets/problem/_edit.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-.editor-bar {
-  .editor-tabs {
-    .advanced-toggle {
-      height: auto;
-      margin-top: -4px;
-      padding: 3px 9px;
-      font-size: 12px;
-      color: $link-color;
-
-      &.current {
-        border: 1px solid $lightGrey !important;
-        border-radius: 3px !important;
-        background: $lightGrey !important;
-        color: $darkGrey !important;
-        pointer-events: none;
-        cursor: none;
-
-        &:hover,
-        &:focus {
-          box-shadow: 0 0 0 0 !important;
-          background-color: $white;
-        }
-      }
-    }
-
-  }
-}
-
-.simple-editor-cheatsheet {
-  position: absolute;
-  top: 41px;
-  @include left(70%);
-  width: 0;
-  border-left: 1px solid $gray-l2;
-
-  background-color: $lightGrey;
-  overflow: hidden;
-
-  &.shown {
-    width: 30%;
-    height: 92%;
-    overflow-y: scroll;
-  }
-
-  .cheatsheet-wrapper {
-    padding: 5%;
-  }
-
-  h6 {
-    margin-top: 4px;
-    margin-bottom: 7px;
-    margin-left: 4px;
-    font-size: 15px;
-    font-weight: 700;
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  .row {
-    @include clearfix();
-
-    padding-bottom: 5px !important;
-    margin-bottom: 10px !important;
-    border-bottom: 1px solid #ddd !important;
-
-    &:last-child {
-      border-bottom: none !important;
-      margin-bottom: 0 !important;
-    }
-  }
-
-  .col {
-    display: block;
-
-    &.sample {
-      margin-right: 30px;
-
-      .icon {
-        height: ($baseline * 1.5);
-      }
-    }
-  }
-
-  pre {
-    font-size: 12px;
-    line-height: 18px;
-  }
-
-  code {
-    padding: 0;
-    background: none;
-  }
-}
-
-.problem-editor {
-  // adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror
-  .markdown-box + .CodeMirror {
-    padding: 10px;
-    width: 69%;
-  }
-}
-
-.problem-editor-icon {
-  display: inline-block;
-  width: 26px;
-  height: 21px;
-  vertical-align: middle;
-  color: $body-color;
-}
diff --git a/xmodule/assets/sequence/_display.scss b/xmodule/assets/sequence/_display.scss
deleted file mode 100644
index 3ddda8b37d09..000000000000
--- a/xmodule/assets/sequence/_display.scss
+++ /dev/null
@@ -1,340 +0,0 @@
-@import 'vendor/bi-app/bi-app-ltr';
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'bootstrap/scss/mixins/breakpoints';
-@import 'lms/theme/variables-v1';
-
-$seq-nav-border-color: $border-color !default;
-$seq-nav-hover-color: rgb(245, 245, 245) !default;
-$seq-nav-link-color: $link-color !default;
-$seq-nav-icon-color: rgb(10, 10, 10) !default;
-$seq-nav-icon-color-muted: rgb(90, 90, 90) !default;
-$seq-nav-tooltip-color: rgb(51, 51, 51) !default;
-$seq-nav-height: 50px;
-
-// repeated extends - needed since LMS styling was referenced
-.block-link {
-  @include border-left(1px solid $seq-nav-border-color);
-
-  display: block;
-
-  &:hover,
-  &:focus {
-    background: none;
-  }
-}
-
-.topbar {
-  @include clearfix();
-
-  border-bottom: 1px solid $seq-nav-border-color;
-
-  @media print {
-    display: none;
-  }
-
-  a {
-    &.block-link {
-      @include border-left(1px solid $seq-nav-border-color);
-
-      display: block;
-
-      &:hover,
-      &:focus {
-        background: none;
-      }
-    }
-  }
-}
-
-%ui-clear-button {
-  background-color: transparent;
-  background-image: none;
-  background-position: center 14px;
-  background-repeat: no-repeat;
-  border: none;
-  border-radius: 0;
-  background-clip: border-box;
-  box-shadow: none;
-  box-sizing: content-box;
-  font-family: inherit;
-  font-size: inherit;
-  font-weight: inherit;
-}
-
-
-// ====================
-
-.sequence-nav {
-  @extend .topbar;
-
-  margin: 0 auto $baseline;
-  position: relative;
-  border-bottom: none;
-  z-index: 0;
-  height: $seq-nav-height;
-  display: flex;
-  justify-content: center;
-
-  @media print {
-    display: none;
-  }
-
-  .sequence-list-wrapper {
-    @extend %ui-depth2;
-
-    position: relative;
-    height: 100%;
-    flex-grow: 1;
-
-    @include media-breakpoint-down(xs) {
-      white-space: nowrap;
-      overflow-x: scroll;
-    }
-  }
-
-  ol {
-    display: flex;
-
-    li {
-      box-sizing: border-box;
-      min-width: 40px;
-      flex-grow: 1;
-      border-color: $seq-nav-border-color;
-      border-width: 1px;
-      border-top-style: solid;
-
-      &:not(:last-child) {
-        @include border-right-style(solid);
-      }
-
-      button {
-        @extend %ui-fake-link;
-        @extend %ui-clear-button;
-
-        width: 100%;
-        height: ($seq-nav-height - 1);
-        position: relative;
-        margin: 0;
-        padding: 0;
-        display: block;
-        text-align: center;
-        border-color: $seq-nav-border-color;
-        border-width: 1px;
-        border-bottom-style: solid;
-        box-sizing: border-box;
-        overflow: visible; // for tooltip - IE11 uses 'hidden' by default if width/height is specified
-
-        .icon {
-          display: inline-block;
-          line-height: 100%; // This matches the height of the <a> its within (the parent) to get vertical centering.
-          font-size: 110%;
-          color: $seq-nav-icon-color-muted;
-        }
-
-        .fa-bookmark {
-          color: $seq-nav-link-color;
-        }
-
-        //video
-        &.seq_video {
-          .icon::before {
-            content: "\f008"; // .fa-film
-          }
-        }
-
-        //other
-        &.seq_other {
-          .icon::before {
-            content: "\f02d"; // .fa-book
-          }
-        }
-
-        //vertical
-        &.seq_vertical {
-          .icon::before {
-            content: "\f00b";  // .fa-tasks
-          }
-        }
-
-        //problems
-        &.seq_problem {
-          .icon::before {
-            content: "\f044";  // .fa-pencil-square-o
-          }
-        }
-
-        .sequence-tooltip {
-          @include text-align(left);
-
-          @extend %ui-depth2;
-
-          margin-top: 12px;
-          background: $seq-nav-tooltip-color;
-          color: $white;
-          font-family: $font-family-sans-serif;
-          line-height: lh();
-          right: 0;  // Should not be RTLed, tooltips do not move in RTL
-          padding: 6px;
-          position: absolute;
-          top: 48px;
-          text-shadow: 0 -1px 0 $black;
-          white-space: pre;
-          pointer-events: none;
-
-          &:empty {
-            background: none;
-
-            &::after {
-              display: none;
-            }
-          }
-
-          &::after {
-            @include transform(rotate(45deg));
-            @include right(18px);
-
-            background: $seq-nav-tooltip-color;
-            content: " ";
-            display: block;
-            height: 10px;
-            right: 18px;  // Not RTLed, positions tooltips relative to seq nav item
-            position: absolute;
-            top: -5px;
-            width: 10px;
-          }
-        }
-      }
-    }
-  }
-
-  body.touch-based-device & ol li button:hover p {
-    display: none;
-  }
-}
-
-.sequence-nav-button {
-  @extend %ui-depth3;
-
-  display: block;
-  top: 0;
-  min-width: 40px;
-  max-width: 40px;
-  height: 100%;
-  text-shadow: none; // overrides default button text-shadow
-  background: none;  // overrides default button gradient
-  background-color: theme-color("inverse");
-  border-color: $seq-nav-border-color;
-  box-shadow: none;
-  font-size: inherit;
-  font-weight: normal;
-  padding: 0;
-  white-space: nowrap;
-  overflow-x: hidden;
-
-  @include media-breakpoint-up(md) {
-    min-width: 120px;
-    max-width: 200px;
-    text-overflow: ellipsis;
-
-    span:not(:last-child) {
-      @include padding-right($baseline / 2);
-    }
-  }
-
-  .sequence-nav-button-label {
-    display: none;
-
-    @include media-breakpoint-up(md) {
-      display: inline;
-    }
-  }
-
-  &.button-previous {
-    order: -999;
-
-    @include media-breakpoint-up(md) {
-      @include left(0);
-      @include border-top-left-radius(3px);
-      @include border-top-right-radius(0);
-      @include border-bottom-right-radius(0);
-      @include border-bottom-left-radius(3px);
-    }
-  }
-
-  &.button-next {
-    order: 999;
-
-    @include media-breakpoint-up(md) {
-      @include right(0);
-      @include border-top-left-radius(0);
-      @include border-top-right-radius(3px);
-      @include border-bottom-right-radius(3px);
-      @include border-bottom-left-radius(0);
-    }
-  }
-
-  &.disabled {
-    cursor: normal;
-  }
-}
-
-.seq_contents {
-  display: none;
-}
-
-.sequence-bottom {
-  position: relative;
-  height: 45px;
-  margin: lh(2) auto;
-  display: flex;
-  justify-content: center;
-
-  .sequence-nav-button {
-    position: relative;
-    min-width: 120px;
-    max-width: 200px;
-    text-overflow: ellipsis;
-
-    &:last-of-type {
-      @include border-left(none);
-    }
-  }
-
-  @media print {
-    display: none;
-  }
-}
-
-#seq_content {
-  &:focus,
-  &:active {
-    outline: none;
-  }
-}
-
-// hover and active states
-.sequence-nav-button,
-.sequence-nav button {
-  &.focused,
-  &:hover,
-  &:active,
-  &.active {
-    padding-top: 2px;
-    background-color: theme-color("primary");
-
-    .icon {
-      color: theme-color("inverse");
-    }
-
-    @include media-breakpoint-up(sm) {
-      border-bottom: 3px solid $seq-nav-link-color;
-      background-color: theme-color("inverse");
-
-      .icon {
-        color: $seq-nav-icon-color;
-      }
-    }
-  }
-}
diff --git a/xmodule/assets/tabs/_codemirror.scss b/xmodule/assets/tabs/_codemirror.scss
deleted file mode 100644
index 237d1850332a..000000000000
--- a/xmodule/assets/tabs/_codemirror.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.editor {
-  @include clearfix();
-
-  .CodeMirror {
-    box-sizing: border-box;
-
-    width: 100%;
-    position: relative;
-    height: 379px;
-    border: 1px solid #3c3c3c;
-    border-top: 1px solid #8891a1;
-    background: $white;
-    color: #3c3c3c;
-  }
-
-  .CodeMirror-scroll {
-    height: 100%;
-  }
-}
-
diff --git a/xmodule/assets/tabs/_tabs.scss b/xmodule/assets/tabs/_tabs.scss
deleted file mode 100644
index ad47d915a230..000000000000
--- a/xmodule/assets/tabs/_tabs.scss
+++ /dev/null
@@ -1,141 +0,0 @@
-// styles duped from _unit.scss - Edit Header (Component Name, Mode-Editor, Mode-Settings)
-@import 'vendor/bi-app/bi-app-ltr';
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'cms/theme/variables-v1';
-@import 'mixins';
-
-
-.tabs-wrapper {
-  padding-top: 0;
-  position: relative;
-
-  .wrapper-comp-settings {
-    // set visibility to metadata editor
-    display: block;
-  }
-}
-
-.editor-single-tab-name {
-  display: none;
-}
-
-
-.editor-with-tabs {
-  @include clearfix();
-
-  position: relative;
-
-
-  .edit-header {
-    box-sizing: border-box;
-
-    padding: 18px $baseline;
-    top: 0 !important; // ugly override for second level tab override
-    right: 0;
-    background-color: $blue;
-    border-bottom: 1px solid $blue-d2;
-    color: $white;
-
-    //Component Name
-    .component-name {
-      position: relative;
-      top: 0;
-      left: 0;
-      width: 50%;
-      color: $white;
-      font-weight: 600;
-
-
-
-      em {
-        display: inline-block;
-        margin-right: ($baseline/4);
-        font-weight: 400;
-        color: $white;
-      }
-    }
-
-    //Nav-Edit Modes
-    .editor-tabs {
-      list-style: none;
-      right: 0;
-      top: ($baseline/4);
-      position: absolute;
-      padding: 12px ($baseline*0.75);
-
-      .inner_tab_wrap {
-        display: inline-block;
-        margin-left: 8px;
-
-        a.tab {
-          @include font-size(14);
-          @include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
-
-          border: 1px solid $blue-d1;
-          border-radius: 3px;
-          padding: ($baseline/4) ($baseline);
-          background-color: $blue;
-          font-weight: bold;
-          color: $white;
-
-          &.current {
-            @include linear-gradient($blue, $blue);
-
-            color: $blue-d1;
-            box-shadow: inset 0 1px 2px 1px $shadow-l1;
-            background-color: $blue-d4;
-            cursor: default;
-          }
-
-          &:hover,
-          &:focus {
-            box-shadow: inset 0 1px 2px 1px  $shadow;
-            background-image: linear-gradient(#009fe6, #009fe6) !important;
-          }
-        }
-      }
-    }
-  }
-
-  .is-inactive {
-    display: none;
-  }
-
-  .comp-subtitles-entry {
-    text-align: center;
-
-    .file-upload {
-      display: none;
-    }
-
-    .comp-subtitles-import-list {
-      > li {
-        display: block;
-        margin: $baseline/2 0;
-      }
-
-      .blue-button {
-        font-size: 1em;
-        display: block;
-        width: 70%;
-        margin: 0 auto;
-        text-align: center;
-      }
-    }
-  }
-}
-
-.component-tab {
-  background: $white;
-  position: relative;
-  border-top: 1px solid #8891a1;
-
-  &#advanced {
-    padding: 0;
-    border: none;
-  }
-}
-
-
diff --git a/xmodule/assets/video/_accessible_menu.scss b/xmodule/assets/video/_accessible_menu.scss
deleted file mode 100644
index f7153fa98429..000000000000
--- a/xmodule/assets/video/_accessible_menu.scss
+++ /dev/null
@@ -1,236 +0,0 @@
-@import 'base/mixins';
-
-$a11y--gray: rgb(127, 127, 127);
-$a11y--blue: rgb(0, 159, 230);
-$a11y--gray-d1: shade($gray, 20%);
-$a11y--gray-l2: tint($gray, 40%);
-$a11y--gray-l3: tint($gray, 60%);
-$a11y--blue-s1: saturate($blue, 15%);
-
-%use-font-awesome {
-  font-family: FontAwesome;
-  -webkit-font-smoothing: antialiased;
-  display: inline-block;
-  speak: none;
-}
-
-.a11y-menu-container {
-  position: relative;
-
-  &.open {
-    .a11y-menu-list {
-      display: block;
-    }
-  }
-
-  .a11y-menu-list {
-    @extend %ui-depth3;
-
-    top: 100%;
-    margin: 0;
-    padding: 0;
-    display: none;
-    position: absolute;
-    list-style: none;
-    background-color: $white;
-    border: 1px solid #eee;
-
-    li {
-      @extend %ui-fake-link;
-
-      margin: 0;
-      padding: 0;
-      border-bottom: 1px solid #eee;
-      color: $white;
-
-      a {
-        display: block;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        color: $a11y--gray-l2;
-        font-size: 14px;
-        line-height: 23px;
-
-        &:hover,
-        &:focus {
-          color: $a11y--gray-d1;
-        }
-      }
-
-      &.active {
-        a {
-          color: $a11y--blue;
-        }
-      }
-
-      &:last-child {
-        box-shadow: none;
-        border-bottom: 0;
-        margin-top: 0;
-      }
-    }
-  }
-}
-
-
-// Video track button specific styles
-
-.video-tracks {
-  .a11y-menu-container {
-    display: inline-block;
-    vertical-align: top;
-    border-left: 1px solid #eee;
-
-    &.open {
-      > a {
-        background-color: $action-primary-active-bg;
-        color: $very-light-text;
-
-        &::after {
-          color: $very-light-text;
-        }
-      }
-    }
-
-    > a {
-      @include transition(all $tmg-f2 ease-in-out 0s);
-      @include font-size(12);
-
-      display: block;
-      border-radius: 0 3px 3px 0;
-      background-color: $very-light-text;
-      padding: ($baseline*0.75) ($baseline*1.25) ($baseline*0.75) ($baseline*0.75);
-      color: $a11y--gray-l2;
-      min-width: 1.5em;
-      line-height: 14px;
-      text-align: center;
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      &::after {
-        @extend %use-font-awesome;
-
-        content: "\f0d7";
-        position: absolute;
-        right: ($baseline*0.5);
-        top: 33%;
-        color: $lighter-base-font-color;
-      }
-    }
-
-    .a11y-menu-list {
-      right: 0;
-
-      li {
-        font-size: em(14);
-
-        a {
-          border: 0;
-          display: block;
-          padding: lh(0.5);
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-      }
-    }
-  }
-}
-
-
-.contextmenu,
-.submenu {
-  @extend %ui-depth5;
-
-  border: 1px solid #333;
-  background: $white;
-  color: #333;
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  position: absolute;
-  top: 0;
-  display: none;
-  outline: none;
-  cursor: default;
-  white-space: nowrap;
-
-  &.is-opened {
-    display: block;
-  }
-
-  .menu-item,
-  .submenu-item {
-    border-top: 1px solid $gray-l3;
-    padding: ($baseline/4) ($baseline/2);
-    outline: none;
-
-    & > span {
-      color: #333;
-    }
-
-    &:first-child {
-      border-top: none;
-    }
-
-    &:focus {
-      background: #333;
-      color: $white;
-
-      & > span {
-        color: $white;
-      }
-    }
-  }
-
-  .submenu-item {
-    position: relative;
-    padding: ($baseline/4) $baseline ($baseline/4) ($baseline/2);
-
-    &::after {
-      content: '\25B6';
-      position: absolute;
-      right: 5px;
-      line-height: 25px;
-      font-size: 10px;
-    }
-
-    .submenu {
-      display: none;
-    }
-
-    &.is-opened {
-      background: #333;
-      color: $white;
-
-      & > span {
-        color: $white;
-      }
-
-      & > .submenu {
-        display: block;
-      }
-    }
-
-    .is-selected {
-      font-weight: bold;
-    }
-  }
-
-  .is-disabled {
-    pointer-events: none;
-    color: $gray-l3;
-  }
-}
-
-.overlay {
-  @extend %ui-depth4;
-
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: transparent;
-}
diff --git a/xmodule/assets/video/_display.scss b/xmodule/assets/video/_display.scss
deleted file mode 100644
index fd5cd73b2105..000000000000
--- a/xmodule/assets/video/_display.scss
+++ /dev/null
@@ -1,1043 +0,0 @@
-// This is for A Font Garde
-// It loads the icon font only when it's available.
-// ---
-// It is scoped to the video player for now, but we
-// will eventually want to move this to the main font
-// sheet, globally, so it applies to all use cases.
-
-// --------
-// Defaults: what displays if the icon font doesn't load.
-// --------
-@import 'vendor/bi-app/bi-app-ltr';
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'bootstrap/scss/mixins/breakpoints';
-@import 'lms/theme/variables-v1';
-
-// the html target is necessary for xblocks and xmodules, but works across the board
-
-$secondary-dark: rgb(142, 62, 99); // UXPL secondary dark
-$secondary-base: rgb(203, 89, 141); // UXPL secondary base
-$secondary-light: rgb(219, 139, 175); // UXPL secondary light
-$cool-dark: rgb(79, 89, 93); // UXPL cool dark
-
-& {
-  margin-bottom: ($baseline*1.5);
-}
-
-.is-hidden {
-  display: none;
-}
-
-.video {
-  @include clearfix();
-
-  background: rgb(245, 245, 245); // UXPL grayscale x-back
-  display: block;
-  margin: 0 -12px;
-  padding: 12px;
-  border-radius: 5px;
-  outline: none;
-
-  &:focus,
-  &:active,
-  &:hover {
-    border: 0;
-  }
-
-  &.is-initialized {
-    .video-wrapper {
-      .spinner {
-        display: none;
-      }
-    }
-  }
-
-  // CASE: video pre-roll state
-  &.is-pre-roll {
-    .slider {
-      visibility: hidden;
-    }
-
-    .video-player {
-      position: relative;
-
-      &::before {
-        display: block;
-        content: "";
-        width: 100%;
-        padding-top: 55%;
-      }
-    }
-  }
-
-  .tc-wrapper {
-    @include clearfix();
-
-    position: relative;
-  }
-
-  .focus_grabber {
-    position: relative;
-    display: inline;
-    width: 0;
-    height: 0;
-  }
-
-  .downloads-heading {
-    margin: 1em 0 0;
-  }
-
-  .wrapper-video-bottom-section {
-    display: flex;
-    justify-content: space-between;
-
-    .wrapper-download-video,
-    .wrapper-download-transcripts,
-    .wrapper-handouts,
-    .branding,
-    .wrapper-transcript-feedback {
-      flex: 1;
-      margin-top: $baseline;
-
-      @include padding-right($baseline);
-
-      vertical-align: top;
-    }
-  }
-
-  .wrapper-downloads {
-    @include media-breakpoint-up(md) {
-      display: flex;
-    }
-
-    .hd {
-      margin: 0;
-    }
-
-    .wrapper-download-video {
-      .video-sources {
-        margin: 0;
-      }
-    }
-
-    .wrapper-download-transcripts {
-      .list-download-transcripts {
-        margin: 0;
-        padding: 0;
-        list-style: none;
-
-        .transcript-option {
-          margin: 0;
-
-          a.btn , a.btn-link{
-            font-size: 16px !important;
-            font-weight: unset;
-          }
-        }
-      }
-    }
-
-    .branding {
-      @include padding-right(0);
-
-      .host-tag {
-        position: absolute;
-        left: -9999em;
-        display: inline-block;
-        vertical-align: middle;
-        color: $body-color;
-      }
-
-      .brand-logo {
-        display: inline-block;
-        max-width: 100%;
-        max-height: ($baseline*2);
-        padding: ($baseline/4) 0;
-        vertical-align: middle;
-      }
-    }
-
-  }
-
-  .wrapper-transcript-feedback {
-    display: none;
-    
-    .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;
-    }
-  }
-
-  .google-disclaimer {
-    display: none;
-    margin-top: $baseline;
-    @include padding-right($baseline);
-    vertical-align: top;
-  }
-
-  .video-wrapper {
-    @include float(left);
-    @include margin-right(flex-gutter(9));
-
-    width: flex-grid(6, 9);
-    background-color: black;
-    position: relative;
-
-    &:hover {
-      .btn-play {
-        color: theme-color("primary");
-      }
-
-      .btn-play::after {
-        background: theme-color("inverse");
-      }
-    }
-
-    .video-player-pre,
-    .video-player-post {
-      height: 50px;
-      background-color: rgb(17, 16, 16) // UXPL grayscale black;
-    }
-
-    .spinner {
-      @include transform(translate(-50%, -50%));
-
-      position: absolute;
-      z-index: 1;
-      background: rgba(0, 0, 0, 0.7);
-      top: 50%;
-      left: 50%;
-      padding: 30px;
-      border-radius: 25%;
-
-      &::after {
-        @include animation(rotateCW 3s infinite linear);
-
-        content: '';
-        display: block;
-        width: 30px;
-        height: 30px;
-        border: 7px solid white;
-        border-top-color: transparent;
-        border-radius: 100%;
-        position: relative;
-      }
-    }
-
-    .btn-play {
-      @include transform(translate(-50%, -50%));
-
-      position: absolute;
-      z-index: 1;
-      top: 46%;
-      left: 50%;
-      font-size: 4em;
-      cursor: pointer;
-      opacity: 0.1;
-
-      &::after {
-        background: $white;
-        position: absolute;
-        width: 50%;
-        height: 50%;
-        content: '';
-        left: 0;
-        top: 0;
-        bottom: 0;
-        right: 0;
-        margin: auto;
-        z-index: -1;
-      }
-    }
-
-    .closed-captions {
-      @include left(5%);
-
-      position: absolute;
-      width: 90%;
-      box-sizing: border-box;
-      top: 70%;
-      text-align: center;
-    }
-
-    .closed-captions.is-visible {
-      max-height: ($baseline * 3);
-      border-radius: ($baseline / 5);
-      padding: 8px ($baseline / 2) 8px ($baseline * 1.5);
-      background: rgba(0, 0, 0, 0.75);
-      color: $yellow;
-
-      &::before {
-        position: absolute;
-        display: inline-block;
-        top: 50%;
-
-        @include left($baseline);
-
-        margin-top: -0.6em;
-        font-family: 'FontAwesome';
-        content: "\f142";
-        color: $white;
-        opacity: 0.5;
-      }
-
-      &:hover,
-      &.is-dragging {
-        background: rgba(0, 0, 0, 1);
-        cursor: move;
-
-        &::before {
-          opacity: 1;
-        }
-      }
-    }
-
-    .video-player {
-      overflow: hidden;
-      min-height: 158px;
-
-      > div {
-        height: 100%;
-
-        &.hidden {
-          display: none;
-        }
-      }
-
-      .video-error,
-      .video-hls-error {
-        padding: ($baseline / 5);
-        background: black;
-        color: white !important; // the pattern library headings shim is more scoped
-      }
-
-      object,
-      iframe,
-      video {
-        @include left(0);
-
-        display: block;
-        border: none;
-        width: 100%;
-      }
-
-      h4 {
-        text-align: center;
-        color: white;
-
-        &.hidden {
-          display: none;
-        }
-      }
-    }
-
-    .video-controls {
-      @include clearfix();
-
-      position: relative;
-      border: 0;
-      background: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
-      color: rgb(240, 243, 245); // UXPL grayscale-cool xx-light
-
-      &:hover,
-      &:focus {
-        ul,
-        div {
-          opacity: 1;
-        }
-      }
-
-      %video-control {
-        @extend %t-strong;
-        @extend %t-title7;
-
-        display: inline-block;
-        vertical-align: middle;
-        margin: 0;
-        border: 0;
-        border-radius: 0;
-        padding: ($baseline / 2) ($baseline / 1.5);
-        background: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
-        box-shadow: none;
-        text-shadow: none;
-        color: rgb(207, 216, 220); // UXPL grayscale-cool light
-
-        &:hover,
-        &:focus {
-          background: darken(rgb(40, 44, 46), 7%); // UXPL secondary
-        }
-
-        &:active,
-        &.is-active,
-        &.active {
-          color: rgb(14, 166, 236); // UXPL primary accent
-        }
-      }
-
-      .control {
-        @extend %video-control;
-
-        .icon {
-          width: 1em;
-
-          &.icon-hd {
-            // except when it's text, like with HD
-            // otherwise it's shifted to the right because "HD" is wider than 1em
-            width: auto;
-          }
-        }
-      }
-
-      .slider {
-        @include clearfix();
-        @include transform-origin(bottom left);
-        @include transition(height 0.7s ease-in-out 0s);
-
-        box-sizing: border-box;
-        position: absolute;
-        bottom: 100%;
-        left: 0;
-        right: 0;
-        z-index: 1;
-        height: ($baseline / 4);
-        margin-left: 0;
-        border: 1px solid $cool-dark;
-        border-radius: 0;
-        background: $cool-dark;
-
-        .ui-widget-header {
-          background: $secondary-dark;
-          border: 1px solid $secondary-dark;
-          box-shadow: none;
-          top: -1px;
-          left: -1px;
-        }
-
-        .ui-corner-all.slider-range {
-          opacity: 0.3;
-          background-color: #1e91d3;
-        }
-
-        .ui-slider-handle {
-          @extend %ui-fake-link;
-
-          @include transform-origin(bottom left);
-          @include transition(all 0.7s ease-in-out 0s);
-
-          box-sizing: border-box;
-          top: -1px;
-          height: ($baseline / 4);
-          width: ($baseline / 4);
-          margin-left: -($baseline / 8); // center-center causes the control to be beyond the end of the sider
-          border: 1px solid $secondary-base;
-          border-radius: ($baseline / 5);
-          padding: 0;
-          background: $secondary-base;
-          box-shadow: none;
-
-          &:focus,
-          &:hover {
-            background-color: $secondary-light;
-            border-color: $secondary-light;
-          }
-        }
-      }
-
-      .vcr {
-        @include float(left);
-
-        list-style: none;
-
-        @include border-right(1px solid rgb(40, 44, 46)); // UXPL grayscale-cool x-dark
-
-        padding: 0;
-
-        @media (max-width: 1120px) {
-          @include margin-right(lh(0.5));
-
-          font-size: em(14);
-        }
-
-        .video_control {
-          &:focus {
-            position: relative;
-          }
-
-          &.skip {
-            white-space: nowrap;
-          }
-        }
-
-        .vidtime {
-          @extend %t-strong;
-          @extend %t-title7;
-
-          @include padding-left(lh(0.75));
-
-          display: inline-block;
-          color: rgb(207, 216, 220); // UXPL grayscale-cool light
-          -webkit-font-smoothing: antialiased;
-
-          @media (max-width: 1120px) {
-            @include padding-left(lh(0.5));
-          }
-        }
-      }
-
-      .secondary-controls {
-        @include float(right);
-        @include border-left(1px dotted rgb(79, 89, 93)); // UXPL grayscale-cool x-dark
-
-        .volume,
-        .add-fullscreen,
-        .grouped-controls,
-        .auto-advance,
-        .quality-control {
-          @include border-left(1px dotted rgb(79, 89, 93)); // UXPL grayscale-cool x-dark
-        }
-
-        .speed-button,
-        .volume > .control,
-        .add-fullscreen,
-        .auto-advance,
-        .quality-control,
-        .toggle-transcript {
-          &:focus {
-            position: relative;
-          }
-        }
-
-        .menu-container {
-          position: relative;
-
-          .menu {
-            @include transition(none);
-
-            @extend %ui-depth1;
-
-            position: absolute;
-            display: none;
-            bottom: ($baseline * 2);
-
-            @include right(0); // right-align menus since this whole collection is on the right
-
-            width: 120px;
-            margin: 0;
-            border: none;
-            padding: 0;
-            box-shadow: none;
-            background-color: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
-            list-style: none;
-
-            li {
-              @extend %ui-fake-link;
-
-              color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
-
-              .speed-option,
-              .control-lang {
-                @include text-align(left);
-
-                display: block;
-                width: 100%;
-                border: 0;
-                border-radius: 0;
-                padding: lh(0.5);
-                background: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
-                box-shadow: none;
-                color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
-                overflow: hidden;
-                text-shadow: none;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-
-                &:hover,
-                &:focus {
-                  background-color: rgb(79, 89, 93); // UXPL grayscale-cool dark
-                  color: rgb(252, 252, 252); // UXPL grayscale white
-                }
-              }
-
-              &.is-active {
-                .speed-option,
-                .control-lang {
-                  @include border-left($baseline/10 solid rgb(14, 166, 236));
-
-                  font-weight: $font-bold;
-                  color: rgb(14, 166, 236); // UXPL primary accent
-                }
-              }
-            }
-          }
-
-          &.is-opened {
-            .menu {
-              display: block;
-            }
-          }
-        }
-
-        .speeds,
-        .lang,
-        .grouped-controls {
-          display: inline-block;
-        }
-
-        .speeds {
-          &.is-opened {
-            .control {
-              .icon {
-                @include ltr {
-                  @include transform(rotate(-90deg));
-                }
-
-                @include rtl {
-                  @include transform(rotate(90deg));
-                }
-              }
-            }
-          }
-
-          .speed-button {
-            .label {
-              @include padding(0 ($baseline/3) 0 0);
-
-              font-family: $font-family-sans-serif;
-              color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
-
-              @media (max-width: 1120px) {
-                  position: absolute;
-                  clip: rect(1px, 1px, 1px, 1px);
-              }
-            }
-
-            .value {
-              @include padding(0, lh(0.5), 0, 0);
-
-              color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
-              font-weight: bold;
-
-              @media (max-width: 1120px) {
-                padding: 0 lh(0.5);
-              }
-            }
-          }
-        }
-
-        .lang {
-          .language-menu {
-            width: $baseline;
-            padding: ($baseline / 2) 0;
-          }
-
-          .control {
-            .icon {
-              @include rtl {
-                @include transform(rotate(-180deg));
-              }
-            }
-          }
-
-          &.is-opened {
-            .control {
-              .icon {
-                @include ltr {
-                  @include transform(rotate(90deg));
-                }
-
-                @include rtl {
-                  @include transform(rotate(90deg));
-                }
-              }
-            }
-          }
-        }
-
-        .volume {
-          display: inline-block;
-          position: relative;
-
-          &.is-opened {
-            .volume-slider-container {
-              display: block;
-              opacity: 1;
-            }
-          }
-
-          &:not(:first-child) > a {
-            @include border-left(none);
-          }
-
-          .volume-slider-container {
-            @include transition(none);
-
-            @extend %ui-depth1;
-
-            display: none;
-            position: absolute;
-            bottom: ($baseline * 2);
-
-            @include right(0);
-
-            width: 41px;
-            height: 120px;
-            background-color: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
-
-            .volume-slider {
-              height: 100px;
-              width: ($baseline / 4);
-              margin: 14px auto;
-              box-sizing: border-box;
-              border: 1px solid $cool-dark;
-              background: $cool-dark;
-
-              .ui-slider-handle {
-                @extend %ui-fake-link;
-
-                @include transition(height $tmg-s2 ease-in-out 0s, width $tmg-s2 ease-in-out 0s);
-                @include left(-5px);
-
-                box-sizing: border-box;
-                height: 13px;
-                width: 13px;
-                border: 1px solid $secondary-base;
-                border-radius: ($baseline / 5);
-                padding: 0;
-                background: $secondary-base;
-                box-shadow: none;
-
-                &:hover,
-                &:focus {
-                  background: $secondary-light;
-                  border-color: $secondary-light;
-                }
-              }
-
-              .ui-slider-range {
-                background: $secondary-dark;
-                border: 1px solid $secondary-dark;
-                left: -1px;
-                bottom: -1px;
-              }
-            }
-          }
-        }
-
-        .quality-control {
-          font-weight: 700;
-          letter-spacing: -1px;
-
-          &.active {
-            color: rgb(14, 166, 236); // UXPL primary accent
-          }
-
-          &.is-hidden {
-            display: none !important;
-          }
-        }
-
-        .toggle-transcript {
-          &.is-active {
-            color: rgb(14, 166, 236); // UXPL primary accent
-          }
-        }
-
-        .lang {
-          & > .hide-subtitles {
-            @include transition(none);
-          }
-        }
-      }
-    }
-
-    &:hover {
-      .video-controls {
-        .slider {
-          height: ($baseline / 1.5);
-
-          .ui-slider-handle {
-            height: ($baseline / 1.5);
-            width: ($baseline / 1.5);
-          }
-        }
-      }
-    }
-  }
-
-  &.video-fullscreen {
-    .closed-captions {
-      width: 65%;
-    }
-
-    &.closed .closed-captions {
-      width: 90%;
-    }
-  }
-
-  .subtitles {
-    @include float(left);
-
-    overflow: auto;
-    max-height: 460px;
-    width: flex-grid(3, 9);
-    padding: 0;
-    font-size: 14px;
-    visibility: visible;
-
-    a {
-      color: #0074b5;
-    }
-
-    .subtitles-menu {
-      height: 100%;
-      margin: 0;
-      padding: 0 3px;
-      list-style: none;
-
-      li {
-        @extend %ui-fake-link;
-
-        margin-bottom: 8px;
-        border: 0;
-        padding: 0;
-        color: #0074b5; // AA compliant
-        line-height: lh();
-
-        span {
-          display: block;
-        }
-
-        &.current {
-          color: #333;
-          font-weight: 700;
-        }
-
-        &.focused {
-          outline: #000 dotted thin;
-          outline-offset: -1px;
-        }
-
-        &:hover,
-        &:focus {
-          text-decoration: underline;
-        }
-
-        &:empty {
-          margin-bottom: 0;
-        }
-
-        &.spacing:last-of-type {
-          position: relative;
-
-          .transcript-end {
-            position: absolute;
-            bottom: 0;
-          }
-        }
-      }
-    }
-  }
-
-  &.closed {
-    .video-wrapper {
-      width: flex-grid(9, 9);
-      background-color: inherit;
-    }
-
-    .video-wrapper .video-controls.html5 {
-      bottom: 0;
-      left: 0;
-      right: 0;
-      position: absolute;
-      z-index: 1;
-    }
-
-    .video-wrapper .video-player-pre,
-    .video-wrapper .video-player-post {
-      height: 0;
-    }
-
-    .video-wrapper .video-player {
-      h3 {
-        color: black;
-      }
-    }
-
-    .subtitles {
-      @extend .is-hidden;
-    }
-
-    .subtitles.html5 {
-      @extend %ui-depth0;
-
-      background-color: rgba(243, 243, 243, 0.8);
-      height: 100%;
-      position: absolute;
-      right: 0;
-      bottom: 0;
-      top: 0;
-      width: 275px;
-      padding: 0 $baseline;
-      display: none;
-    }
-  }
-
-  &.video-fullscreen {
-    @extend %ui-depth4;
-
-    background: rgba(#000, 0.95);
-    border: 0;
-    bottom: 0;
-    height: 100%;
-    left: 0;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    top: 0;
-    width: 100%;
-    vertical-align: middle;
-    border-radius: 0;
-
-    &.closed {
-      .tc-wrapper {
-        .video-wrapper {
-          width: 100%;
-        }
-      }
-    }
-
-    .video-wrapper .video-player-pre,
-    .video-wrapper .video-player-post {
-      height: 0;
-    }
-
-    .video-wrapper {
-      position: static;
-    }
-
-    .video-wrapper .video-player {
-      h3 {
-        color: white;
-      }
-    }
-
-    .tc-wrapper {
-      @include clearfix();
-
-      width: 100%;
-      height: 100%;
-      position: static;
-
-      .video-wrapper {
-        height: 100%;
-        width: 75%;
-
-        @include margin-right(0);
-
-        vertical-align: middle;
-
-        object,
-        iframe,
-        video {
-          position: absolute;
-          width: auto;
-          height: auto;
-        }
-      }
-
-      .video-controls {
-        @extend %ui-depth4;
-
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-      }
-    }
-
-    .subtitles {
-      height: 100%;
-      width: 25%;
-      padding: lh();
-
-      box-sizing: border-box;
-      @include transition(none);
-
-      background: $black;
-      visibility: visible;
-
-      li {
-        color: #aaa;
-
-        &.current {
-          color: $white;
-        }
-      }
-    }
-  }
-
-  &.is-touch {
-    .tc-wrapper {
-      .video-wrapper {
-        object,
-        iframe,
-        video {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-  }
-
-  .video-pre-roll {
-    @extend %ui-depth3;
-
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-position: 50% 50%;
-    background-repeat: no-repeat;
-    background-size: 100%;
-    background-color: $black;
-
-    &.is-html5 {
-      background-size: 15%;
-    }
-
-    .btn-play.btn-pre-roll {
-      padding: $baseline;
-      border: none;
-      border-radius: $baseline;
-      background: $black-t2;
-      box-shadow: none;
-
-      &::after {
-        // the button class, ties to functionality, also uses an icon font
-        // we're overriding it here so we can use our image instead
-        display: none;
-      }
-
-      img {
-        height: ($baseline * 4);
-        width: ($baseline * 4);
-      }
-
-      &:hover,
-      &:focus {
-        background: $blue;
-      }
-    }
-  }
-}
diff --git a/xmodule/assets/word_cloud/_display.scss b/xmodule/assets/word_cloud/_display.scss
deleted file mode 100644
index 4f7320380a12..000000000000
--- a/xmodule/assets/word_cloud/_display.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-
-.input-cloud {
-  margin: calc((var(--baseline)/4));
-}
-
-.result_cloud_section {
-  display: none;
-  width: 0px;
-  height: 0px;
-}
-
-.result_cloud_section.active {
-  display: block;
-  width: 100%;
-  height: auto;
-  margin-top: 1em;
-    
-  h3 {
-    font-size: 100%;
-  }
-}
-
-.your_words{
-  font-size: 0.85em;
-  display: block;
-}
diff --git a/xmodule/capa/safe_exec/tests/test_safe_exec.py b/xmodule/capa/safe_exec/tests/test_safe_exec.py
index fa12e4f69903..36d2cc965710 100644
--- a/xmodule/capa/safe_exec/tests/test_safe_exec.py
+++ b/xmodule/capa/safe_exec/tests/test_safe_exec.py
@@ -306,13 +306,6 @@ def equal_but_different_dicts(self):
         """
         d1 = {k: 1 for k in "abcdefghijklmnopqrstuvwxyz"}
         d2 = {k: 1 for k in "bcdefghijklmnopqrstuvwxyza"}
-        # TODO: remove the next lines once we are in python3.8
-        # since python3.8 dict preserve the order of insertion
-        # and therefore d2 and d1 keys are already in different order.
-        for i in range(10000):
-            d2[i] = 1
-        for i in range(10000):
-            del d2[i]
 
         # Check that our dicts are equal, but with different key order.
         assert d1 == d2
diff --git a/xmodule/capa/tests/test_responsetypes.py b/xmodule/capa/tests/test_responsetypes.py
index 37a6647ce7d0..e8df8894c78f 100644
--- a/xmodule/capa/tests/test_responsetypes.py
+++ b/xmodule/capa/tests/test_responsetypes.py
@@ -1538,6 +1538,20 @@ def test_floats(self):
             problem = self.build_problem(answer=given_answer)
             self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
 
+    def test_percentage(self):
+        """
+        Test percentage
+        """
+        problem_setup = [
+            # [given_answer, [list of correct responses], [list of incorrect responses]]
+            ["1%", ["1%", "1.0%", "1.00%", "0.01"], [""]],
+            ["2.0%", ["2%", "2.0%", "2.00%", "0.02"], [""]],
+            ["4.00%", ["4%", "4.0%", "4.00%", "0.04"], [""]],
+        ]
+        for given_answer, correct_responses, incorrect_responses in problem_setup:
+            problem = self.build_problem(answer=given_answer)
+            self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
+
     def test_grade_with_script(self):
         script_text = "computed_response = math.sqrt(4)"
         problem = self.build_problem(answer="$computed_response", script=script_text)
diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index 54ca0cbc312f..fa0e87325bb7 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -25,7 +25,14 @@
 from xblock.core import XBlock
 from xblock.fields import Boolean, Dict, Float, Integer, Scope, String, XMLString, List
 from xblock.scorable import ScorableXBlockMixin, Score
+from xblocks_contrib.problem import ProblemBlock as _ExtractedProblemBlock
 
+from common.djangoapps.xblock_django.constants import (
+    ATTR_KEY_DEPRECATED_ANONYMOUS_USER_ID,
+    ATTR_KEY_USER_IS_STAFF,
+    ATTR_KEY_USER_ID,
+)
+from openedx.core.djangolib.markup import HTML, Text
 from xmodule.capa import responsetypes
 from xmodule.capa.capa_problem import LoncapaProblem, LoncapaSystem
 from xmodule.capa.inputtypes import Status
@@ -36,8 +43,8 @@
 from xmodule.exceptions import NotFoundError, ProcessingError
 from xmodule.graders import ShowCorrectness
 from xmodule.raw_block import RawMixin
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.util.sandboxing import SandboxService
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     XModuleMixin,
@@ -45,20 +52,12 @@
     shim_xmodule_js
 )
 from xmodule.xml_block import XmlMixin
-from common.djangoapps.xblock_django.constants import (
-    ATTR_KEY_DEPRECATED_ANONYMOUS_USER_ID,
-    ATTR_KEY_USER_IS_STAFF,
-    ATTR_KEY_USER_ID,
-)
-from openedx.core.djangolib.markup import HTML, Text
 from .capa.xqueue_interface import XQueueService
-
 from .fields import Date, ListScoreField, ScoreField, Timedelta
 from .progress import Progress
 
 log = logging.getLogger("edx.courseware")
 
-
 # Make '_' a no-op so we can scrape strings. Using lambda instead of
 #  `django.utils.translation.gettext_noop` because Django cannot be imported in this file
 _ = lambda text: text
@@ -134,7 +133,7 @@ def from_json(self, value):
 @XBlock.needs('sandbox')
 @XBlock.needs('replace_urls')
 @XBlock.wants('call_to_action')
-class ProblemBlock(
+class _BuiltInProblemBlock(
     ScorableXBlockMixin,
     RawMixin,
     XmlMixin,
@@ -161,6 +160,8 @@ class ProblemBlock(
     """
     INDEX_CONTENT_TYPE = 'CAPA'
 
+    is_extracted = False
+
     resources_dir = None
 
     has_score = True
@@ -361,7 +362,7 @@ def student_view(self, _context, show_detailed_errors=False):
         else:
             html = self.get_html()
         fragment = Fragment(html)
-        add_sass_to_fragment(fragment, "ProblemBlockDisplay.scss")
+        add_css_to_fragment(fragment, "ProblemBlockDisplay.css")
         add_webpack_js_to_fragment(fragment, 'ProblemBlockDisplay')
         shim_xmodule_js(fragment, 'Problem')
         return fragment
@@ -393,7 +394,7 @@ def studio_view(self, _context):
         fragment = Fragment(
             self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
         )
-        add_sass_to_fragment(fragment, 'ProblemBlockEditor.scss')
+        add_css_to_fragment(fragment, 'ProblemBlockEditor.css')
         add_webpack_js_to_fragment(fragment, 'ProblemBlockEditor')
         shim_xmodule_js(fragment, 'MarkdownEditingDescriptor')
         return fragment
@@ -616,11 +617,15 @@ def index_dictionary(self):
             "",
             capa_content
         )
+        # Strip out all other tags, leaving their content. But we want spaces between adjacent tags, so that
+        # <choice correct="true"><div>Option A</div></choice><choice correct="false"><div>Option B</div></choice>
+        # becomes "Option A Option B" not "Option AOption B" (these will appear in search results)
+        capa_content = re.sub(r"</(\w+)><([^>]+)>", r"</\1> <\2>", capa_content)
         capa_content = re.sub(
             r"(\s|&nbsp;|//)+",
             " ",
             nh3.clean(capa_content, tags=set())
-        )
+        ).strip()
 
         capa_body = {
             "capa_content": capa_content,
@@ -2505,3 +2510,10 @@ def randomization_bin(seed, problem_id):
     r_hash.update(str(problem_id).encode())
     # get the first few digits of the hash, convert to an int, then mod.
     return int(r_hash.hexdigest()[:7], 16) % NUM_RANDOMIZATION_BINS
+
+
+ProblemBlock = (
+    _ExtractedProblemBlock if settings.USE_EXTRACTED_PROBLEM_BLOCK
+    else _BuiltInProblemBlock
+)
+ProblemBlock.__name__ = "ProblemBlock"
diff --git a/xmodule/course_block.py b/xmodule/course_block.py
index 52422ffa3427..5b1f92d77734 100644
--- a/xmodule/course_block.py
+++ b/xmodule/course_block.py
@@ -228,7 +228,7 @@ class ProctoringProvider(String):
     and default that pulls from edx platform settings.
     """
 
-    def from_json(self, value):
+    def from_json(self, value, validate_providers=False):
         """
         Return ProctoringProvider as full featured Python type. Perform validation on the provider
         and include any inherited values from the platform default.
@@ -237,7 +237,8 @@ def from_json(self, value):
         if settings.FEATURES.get('ENABLE_PROCTORED_EXAMS'):
             # Only validate the provider value if ProctoredExams are enabled on the environment
             # Otherwise, the passed in provider does not matter. We should always return default
-            self._validate_proctoring_provider(value)
+            if validate_providers:
+                self._validate_proctoring_provider(value)
             value = self._get_proctoring_value(value)
             return value
         else:
@@ -1114,9 +1115,6 @@ def __init__(self, *args, **kwargs):
         except InvalidTabsException as err:
             raise type(err)(f'{str(err)} For course: {str(self.id)}')  # lint-amnesty, pylint: disable=line-too-long
 
-        if not settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
-            self.set_default_certificate_available_date()
-
     def set_grading_policy(self, course_policy):
         """
         The JSON object can have the keys GRADER and GRADE_CUTOFFS. If either is
diff --git a/xmodule/discussion_block.py b/xmodule/discussion_block.py
index 89e573c07c83..79914b63d6b2 100644
--- a/xmodule/discussion_block.py
+++ b/xmodule/discussion_block.py
@@ -4,7 +4,7 @@
 
 import logging
 import urllib
-
+from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.urls import reverse
 from django.utils.translation import get_language_bidi
@@ -14,6 +14,7 @@
 from xblock.fields import UNIQUE_ID, Scope, String
 from xblock.utils.resources import ResourceLoader
 from xblock.utils.studio_editable import StudioEditableXBlockMixin
+from xblocks_contrib.discussion import DiscussionXBlock as _ExtractedDiscussionXBlock
 
 from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider
@@ -21,7 +22,6 @@
 from openedx.core.lib.xblock_utils import get_css_dependencies, get_js_dependencies
 from xmodule.xml_block import XmlMixin
 
-
 log = logging.getLogger(__name__)
 loader = ResourceLoader(__name__)  # pylint: disable=invalid-name
 
@@ -36,10 +36,12 @@ def _(text):
 @XBlock.needs('user')  # pylint: disable=abstract-method
 @XBlock.needs('i18n')
 @XBlock.needs('mako')
-class DiscussionXBlock(XBlock, StudioEditableXBlockMixin, XmlMixin):  # lint-amnesty, pylint: disable=abstract-method
+class _BuiltInDiscussionXBlock(XBlock, StudioEditableXBlockMixin,
+                               XmlMixin):  # lint-amnesty, pylint: disable=abstract-method
     """
     Provides a discussion forum that is inline with other content in the courseware.
     """
+    is_extracted = False
     completion_mode = XBlockCompletionMode.EXCLUDED
 
     discussion_id = String(scope=Scope.settings, default=UNIQUE_ID)
@@ -275,3 +277,10 @@ def _apply_metadata_and_policy(cls, block, node, runtime):
         for field_name, value in metadata.items():
             if field_name in block.fields:
                 setattr(block, field_name, value)
+
+
+DiscussionXBlock = (
+    _ExtractedDiscussionXBlock if settings.USE_EXTRACTED_DISCUSSION_BLOCK
+    else _BuiltInDiscussionXBlock
+)
+DiscussionXBlock.__name__ = "DiscussionXBlock"
diff --git a/xmodule/docs/decisions/0003-library-content-block-schema.rst b/xmodule/docs/decisions/0003-library-content-block-schema.rst
index cf49f72864e8..bf183dab7375 100644
--- a/xmodule/docs/decisions/0003-library-content-block-schema.rst
+++ b/xmodule/docs/decisions/0003-library-content-block-schema.rst
@@ -5,9 +5,9 @@ Evolving the library_content block schema
 Status
 ******
 
-**Provisional**
+**Replaced** by the `Upstream-Downstream ADR`_.
 
-Subject to change due to implementation learnings and stakeholder feedback.
+.. _Upstream-Downstream ADR: https://docs/decisions/0020-upstream-block.rst
 
 Context
 *******
diff --git a/xmodule/graders.py b/xmodule/graders.py
index a587204d682e..5261b9f4479a 100644
--- a/xmodule/graders.py
+++ b/xmodule/graders.py
@@ -387,7 +387,7 @@ def grade(self, grade_sheet, generate_random_scores=False):
                     section_name = scores[i].display_name
 
                 percentage = scores[i].percent_graded
-                summary_format = "{section_type} {index} - {name} - {percent:.0%} ({earned:.3n}/{possible:.3n})"
+                summary_format = "{section_type} {index} - {name} - {percent:.2%} ({earned:.3n}/{possible:.3n})"
                 summary = summary_format.format(
                     index=i + self.starting_index,
                     section_type=self.section_type,
@@ -421,7 +421,7 @@ def grade(self, grade_sheet, generate_random_scores=False):
         if len(breakdown) == 1:
             # if there is only one entry in a section, suppress the existing individual entry and the average,
             # and just display a single entry for the section.
-            total_detail = "{section_type} = {percent:.0%}".format(
+            total_detail = "{section_type} = {percent:.2%}".format(
                 percent=total_percent,
                 section_type=self.section_type,
             )
@@ -430,7 +430,7 @@ def grade(self, grade_sheet, generate_random_scores=False):
                           'detail': total_detail, 'category': self.category, 'prominent': True}, ]
         else:
             # Translators: "Homework Average = 0%"
-            total_detail = _("{section_type} Average = {percent:.0%}").format(
+            total_detail = _("{section_type} Average = {percent:.2%}").format(
                 percent=total_percent,
                 section_type=self.section_type
             )
diff --git a/xmodule/html_block.py b/xmodule/html_block.py
index 2db198360107..9840c3007f92 100644
--- a/xmodule/html_block.py
+++ b/xmodule/html_block.py
@@ -15,6 +15,7 @@
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.fields import Boolean, List, Scope, String
+from xblocks_contrib.html import HtmlBlock as _ExtractedHtmlBlock
 
 from common.djangoapps.xblock_django.constants import ATTR_KEY_DEPRECATED_ANONYMOUS_USER_ID
 from xmodule.contentstore.content import StaticContent
@@ -22,8 +23,8 @@
 from xmodule.edxnotes_utils import edxnotes
 from xmodule.html_checker import check_html
 from xmodule.stringify import stringify_children
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.util.misc import escape_html_characters
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
@@ -50,6 +51,7 @@ class HtmlBlockMixin(  # lint-amnesty, pylint: disable=abstract-method
     The HTML XBlock mixin.
     This provides the base class for all Html-ish blocks (including the HTML XBlock).
     """
+
     display_name = String(
         display_name=_("Display Name"),
         help=_("The display name for this component."),
@@ -90,7 +92,7 @@ def student_view(self, _context):
         Return a fragment that contains the html for the student view
         """
         fragment = Fragment(self.get_html())
-        add_sass_to_fragment(fragment, 'HtmlBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'HtmlBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'HtmlBlockDisplay')
         shim_xmodule_js(fragment, 'HTMLModule')
         return fragment
@@ -136,7 +138,7 @@ def studio_view(self, _context):
         fragment = Fragment(
             self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
         )
-        add_sass_to_fragment(fragment, 'HtmlBlockEditor.scss')
+        add_css_to_fragment(fragment, 'HtmlBlockEditor.css')
         add_webpack_js_to_fragment(fragment, 'HtmlBlockEditor')
         shim_xmodule_js(fragment, 'HTMLEditingDescriptor')
         return fragment
@@ -353,11 +355,12 @@ def index_dictionary(self):
 
 
 @edxnotes
-class HtmlBlock(HtmlBlockMixin):  # lint-amnesty, pylint: disable=abstract-method
+class _BuiltInHtmlBlock(HtmlBlockMixin):  # lint-amnesty, pylint: disable=abstract-method
     """
     This is the actual HTML XBlock.
     Nothing extra is required; this is just a wrapper to include edxnotes support.
     """
+    is_extracted = False
 
 
 class AboutFields:  # lint-amnesty, pylint: disable=missing-class-docstring
@@ -489,3 +492,10 @@ def safe_parse_date(date):
             return datetime.strptime(date, '%B %d, %Y')
         except ValueError:  # occurs for ill-formatted date values
             return datetime.today()
+
+
+HtmlBlock = (
+    _ExtractedHtmlBlock if settings.USE_EXTRACTED_HTML_BLOCK
+    else _BuiltInHtmlBlock
+)
+HtmlBlock.__name__ = "HtmlBlock"
diff --git a/xmodule/item_bank_block.py b/xmodule/item_bank_block.py
new file mode 100644
index 000000000000..7adf935e48ee
--- /dev/null
+++ b/xmodule/item_bank_block.py
@@ -0,0 +1,552 @@
+"""
+Definitions for ItemBankMixin and ItemBankBlock.
+"""
+from __future__ import annotations
+
+import json
+import logging
+import random
+from copy import copy
+from django.conf import settings
+from django.utils.functional import classproperty
+from lxml import etree
+from lxml.etree import XMLSyntaxError
+from rest_framework import status
+from web_fragments.fragment import Fragment
+from webob import Response
+from xblock.completable import XBlockCompletionMode
+from xblock.core import XBlock
+from xblock.fields import Boolean, Integer, List, Scope, String
+from xblock.utils.resources import ResourceLoader
+
+from xmodule.block_metadata_utils import display_name_with_default
+from xmodule.mako_block import MakoTemplateBlockBase
+from xmodule.studio_editable import StudioEditableBlock
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment
+from xmodule.validation import StudioValidation, StudioValidationMessage
+from xmodule.xml_block import XmlMixin
+from xmodule.x_module import (
+    ResourceTemplates,
+    XModuleMixin,
+    shim_xmodule_js,
+    STUDENT_VIEW,
+)
+
+_ = lambda text: text
+
+logger = logging.getLogger(__name__)
+loader = ResourceLoader(__name__)
+
+
+@XBlock.needs('mako')
+@XBlock.wants('user')
+class ItemBankMixin(
+    # TODO: Whittle down list of mixins if possible.
+    # https://github.com/openedx/edx-platform/issues/35686
+    MakoTemplateBlockBase,
+    XmlMixin,
+    ResourceTemplates,
+    XModuleMixin,
+    StudioEditableBlock,
+):
+    """
+    Shared logic for XBlock types which shows a random subset of their children to each learner.
+
+    Concretely, this is the shared base for ItemBankBlock and LegacyLibraryContentBlock.
+    Sharing fields and selection logic between those two blocks will allow us to eventually migrate
+    LegacyLibraryContentBlocks (backed by V1 libraries) into ItemBankBlocks (backed by V2 libraries).
+    """
+    has_children = True
+    has_author_view = True
+    show_in_read_only_mode = True
+    resources_dir = 'assets/library_content'
+    mako_template = 'widgets/metadata-edit.html'
+    studio_js_module_name = "VerticalDescriptor"
+
+    max_count = Integer(
+        display_name=_("Count"),
+        help=_("Enter the number of components to display to each student. Set it to -1 to display all components."),
+        default=1,
+        scope=Scope.settings,
+    )
+    selected = List(
+        # This is a list of (block_type, block_id) tuples used to record
+        # which random/first set of matching blocks was selected per user
+        default=[],
+        scope=Scope.user_state,
+    )
+    # This cannot be called `show_reset_button`, because children blocks inherit this as a default value.
+    allow_resetting_children = Boolean(
+        display_name=_("Show Reset Button"),
+        help=_("Determines whether a 'Reset Problems' button is shown, so users may reset their answers and reshuffle "
+               "selected items."),
+        scope=Scope.settings,
+        default=False
+    )
+
+    @classproperty
+    def completion_mode(cls):  # pylint: disable=no-self-argument
+        """
+        Allow overriding the completion mode with a feature flag.
+
+        This is a property, so it can be dynamically overridden in tests, as it is not evaluated at runtime.
+        """
+        if settings.FEATURES.get('MARK_LIBRARY_CONTENT_BLOCK_COMPLETE_ON_VIEW', False):
+            return XBlockCompletionMode.COMPLETABLE
+
+        return XBlockCompletionMode.AGGREGATOR
+
+    @classmethod
+    def make_selection(cls, selected, children, max_count):
+        """
+        Dynamically selects block_ids indicating which of the possible children are displayed to the current user.
+
+        Arguments:
+            selected - list of (block_type, block_id) pairs assigned to this student
+            children - children of this block
+            max_count - number of components to display to each student
+
+        NOTE/TODO:
+            We like to treat `self.selected` as a list of 2-tuples, but when we load a block from persistence, all
+            tuples are quietly converted to lists, so `self.selected` actually ends up being a list of 2-element lists.
+            So, we need to carefully convert the items in `self.selected` to tuples whenever we work with it. As a
+            future refactoring, it would be much better to just accept that `self.selected` always has 2-element lists,
+            and then define some @properties that intentionally convert them to BlockKeys (named 2-tuples) plus type
+            annotations to enforce it all.
+
+        Returns:
+            A dict containing the following keys:
+
+            'selected' (list) of (block_type, block_id) tuples assigned to this student.
+                       Order is RANDOM BUT ALSO SIGNIFICANT, because we want each student's order to remain stable as
+                       long as their set of assigned children hasn't changed.
+
+            'invalid' (list) of dropped (block_type, block_id) tuples that are no longer valid
+            'overlimit' (list) of dropped (block_type, block_id) tuples that were previously selected
+            'added' (list) of newly added (block_type, block_id) tuples
+
+            Order of invalid/overlimit/added is ALPHABETICAL, by type then id. This is arbitrary, but it makes the
+            events more consistent and easier to test.
+        """
+        rand = random.Random()
+
+        selected_keys = {tuple(k) for k in selected}  # set of (block_type, block_id) tuples assigned to this student
+
+        # Determine which of our children we will show:
+        valid_block_keys = {(c.block_type, c.block_id) for c in children}
+
+        # Remove any selected blocks that are no longer valid:
+        invalid_block_keys = (selected_keys - valid_block_keys)
+        if invalid_block_keys:
+            selected_keys -= invalid_block_keys
+
+        # If max_count has been decreased, we may have to drop some previously selected blocks:
+        overlimit_block_keys = set()
+        if len(selected_keys) > max_count:
+            num_to_remove = len(selected_keys) - max_count
+            overlimit_block_keys = set(rand.sample(list(selected_keys), num_to_remove))
+            selected_keys -= overlimit_block_keys
+
+        # Do we have enough blocks now?
+        num_to_add = max_count - len(selected_keys)
+
+        added_block_keys = set()
+        if num_to_add > 0:
+            # We need to select [more] blocks to display to this user:
+            pool = valid_block_keys - selected_keys
+            num_to_add = min(len(pool), num_to_add)
+            added_block_keys = set(rand.sample(list(pool), num_to_add))
+            selected_keys |= added_block_keys
+
+        if any((invalid_block_keys, overlimit_block_keys, added_block_keys)):
+            selected = list(selected_keys)
+            random.shuffle(selected)
+
+        return {
+            'selected': selected,
+            'invalid': sorted(invalid_block_keys),
+            'overlimit': sorted(overlimit_block_keys),
+            'added': sorted(added_block_keys),
+        }
+
+    def _publish_event(self, event_name, result, **kwargs):
+        """
+        Helper method to publish an event for analytics purposes
+        """
+        event_data = {
+            "location": str(self.usage_key),
+            "result": result,
+            "previous_count": getattr(self, "_last_event_result_count", len(self.selected)),
+            "max_count": self.max_count,
+        }
+        event_data.update(kwargs)
+        self.runtime.publish(self, f"{self.get_selected_event_prefix()}.{event_name}", event_data)
+        self._last_event_result_count = len(result)  # pylint: disable=attribute-defined-outside-init
+
+    @classmethod
+    def publish_selected_children_events(cls, block_keys, format_block_keys, publish_event):
+        """
+        Helper method for publishing events when children blocks are
+        selected/updated for a user.  This helper is also used by
+        the ContentLibraryTransformer.
+
+        Arguments:
+
+            block_keys -
+                A dict describing which events to publish (add or
+                remove), see `make_selection` above for format details.
+
+            format_block_keys -
+                A function to convert block keys to the format expected
+                by publish_event. Must have the signature:
+
+                    [(block_type, block_id)] -> T
+
+                Where T is a collection of block keys as accepted by
+                `publish_event`.
+
+            publish_event -
+                Function that handles the actual publishing.  Must have
+                the signature:
+
+                    <'removed'|'assigned'> -> result:T -> removed:T -> reason:str -> None
+
+                Where T is a collection of block_keys as returned by
+                `format_block_keys`.
+        """
+        if block_keys['invalid']:
+            # reason "invalid" means deleted from library or a different library is now being used.
+            publish_event(
+                "removed",
+                result=format_block_keys(block_keys['selected']),
+                removed=format_block_keys(block_keys['invalid']),
+                reason="invalid"
+            )
+
+        if block_keys['overlimit']:
+            publish_event(
+                "removed",
+                result=format_block_keys(block_keys['selected']),
+                removed=format_block_keys(block_keys['overlimit']),
+                reason="overlimit"
+            )
+
+        if block_keys['added']:
+            publish_event(
+                "assigned",
+                result=format_block_keys(block_keys['selected']),
+                added=format_block_keys(block_keys['added'])
+            )
+
+    def selected_children(self):
+        """
+        Returns a [] of block_ids indicating which of the possible children
+        have been selected to display to the current user.
+
+        This reads and updates the "selected" field, which has user_state scope.
+
+        Note: the return value (self.selected) contains block_ids. To get
+        actual BlockUsageLocators, it is necessary to use self.children,
+        because the block_ids alone do not specify the block type.
+        """
+        max_count = self.max_count
+        if max_count < 0:
+            max_count = len(self.children)
+
+        block_keys = self.make_selection(self.selected, self.children, max_count)  # pylint: disable=no-member
+
+        self.publish_selected_children_events(
+            block_keys,
+            self.format_block_keys_for_analytics,
+            self._publish_event,
+        )
+
+        if any(block_keys[changed] for changed in ('invalid', 'overlimit', 'added')):
+            # Save our selections to the user state, to ensure consistency:
+            selected = block_keys['selected']
+            self.selected = selected  # TODO: this doesn't save from the LMS "Progress" page.
+
+        return self.selected
+
+    def format_block_keys_for_analytics(self, block_keys: list[tuple[str, str]]) -> list[dict]:
+        """
+        Given a list of (block_type, block_id) pairs, prepare the JSON-ready metadata needed for analytics logging.
+
+        This is [
+            {"usage_key": x, "original_usage_key": y, "original_usage_version": z, "descendants": [...]}
+        ]
+        where the main list contains all top-level blocks, and descendants contains a *flat* list of all
+        descendants of the top level blocks, if any.
+
+        Must be implemented in child class.
+        """
+        raise NotImplementedError
+
+    @XBlock.handler
+    def reset_selected_children(self, _, __):
+        """
+        Resets the XBlock's state for a user.
+
+        This resets the state of all `selected` children and then clears the `selected` field
+        so that the new blocks are randomly chosen for this user.
+        """
+        if not self.allow_resetting_children:
+            return Response('"Resetting selected children" is not allowed for this XBlock',
+                            status=status.HTTP_400_BAD_REQUEST)
+
+        for block_type, block_id in self.selected_children():
+            block = self.runtime.get_block(self.context_key.make_usage_key(block_type, block_id))
+            if hasattr(block, 'reset_problem'):
+                block.reset_problem(None)
+                block.save()
+
+        self.selected = []
+        return Response(json.dumps(self.student_view({}).content))
+
+    def _get_selected_child_blocks(self):
+        """
+        Generator returning XBlock instances of the children selected for the
+        current user.
+        """
+        for block_type, block_id in self.selected_children():
+            yield self.runtime.get_block(self.context_key.make_usage_key(block_type, block_id))
+
+    def student_view(self, context):  # lint-amnesty, pylint: disable=missing-function-docstring
+        fragment = Fragment()
+        contents = []
+        child_context = {} if not context else copy(context)
+
+        for child in self._get_selected_child_blocks():
+            if child is None:
+                # TODO: This shouldn't be happening, but at least as of July 2020, it was happening on edx.org for
+                # unknown reasons. We should reach out to 2U and ask if they are still seeing these log items, and if
+                # they are, fix the underlying bug.
+                # * PR that added this logging: https://github.com/openedx/edx-platform/pull/24572
+                # * Private 2U Jira ticket: https://2u-internal.atlassian.net/browse/TNL-7424
+                logger.error('Skipping display for child block that is None')
+                continue
+
+            rendered_child = child.render(STUDENT_VIEW, child_context)
+            fragment.add_fragment_resources(rendered_child)
+            contents.append({
+                'id': str(child.usage_key),
+                'content': rendered_child.content,
+            })
+
+        fragment.add_content(self.runtime.service(self, 'mako').render_lms_template('vert_module.html', {
+            'items': contents,
+            'xblock_context': context,
+            'show_bookmark_button': False,
+            'watched_completable_blocks': set(),
+            'completion_delay_ms': None,
+            'reset_button': self.allow_resetting_children,
+        }))
+
+        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/library_content_reset.js'))
+        fragment.initialize_js('LibraryContentReset')
+        return fragment
+
+    def studio_view(self, _context):
+        """
+        Return the studio view.
+        """
+        fragment = Fragment(
+            self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
+        )
+        # TODO: It's not clear whether or why we need to add this JS bundle, but we're leaving it in for the Libraries
+        #       Relaunch Beta because studio_view is currently working fine.. As future cleanup, try to remove it from
+        #       the studio_view of ItemBankBlock and/or LegacyLibraryContentBlock.
+        add_webpack_js_to_fragment(fragment, 'LibraryContentBlockEditor')
+        shim_xmodule_js(fragment, self.studio_js_module_name)
+        return fragment
+
+    def get_child_blocks(self):
+        """
+        Return only the subset of our children relevant to the current student.
+        """
+        return list(self._get_selected_child_blocks())
+
+    def get_user_id(self):
+        """
+        Get the ID of the current user.
+        """
+        user_service = self.runtime.service(self, 'user')
+        if user_service:
+            user_id = user_service.get_current_user().opt_attrs.get('edx-platform.user_id', None)
+        else:
+            user_id = None
+        return user_id
+
+    def has_dynamic_children(self):
+        """
+        Inform the runtime that our children vary per-user.
+        See get_child_blocks() above
+        """
+        return True
+
+    def get_content_titles(self):
+        """
+        Returns list of friendly titles for our selected children only; without
+        thi, all possible children's titles would be seen in the sequence bar in
+        the LMS.
+
+        This overwrites the get_content_titles method included in x_module by default.
+        """
+        titles = []
+        for child in self.get_child_blocks():
+            titles.extend(child.get_content_titles())
+        return titles
+
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        """
+        Parse an itembank.
+        """
+        children = []
+
+        for child in xml_object.getchildren():
+            try:
+                children.append(system.process_xml(etree.tostring(child)).scope_ids.usage_id)
+            except (XMLSyntaxError, AttributeError):
+                msg = (
+                    "Unable to load child when parsing {self.usage_key.block_type} Block. "
+                    "This can happen when a comment is manually added to the course export."
+                )
+                logger.error(msg)
+                if system.error_tracker is not None:
+                    system.error_tracker(msg)
+
+        definition = dict(xml_object.attrib.items())
+        return definition, children
+
+    def definition_to_xml(self, resource_fs):
+        """ Exports ItemBankBlock to XML """
+        xml_object = etree.Element(self.usage_key.block_type)
+        for child in self.get_children():
+            self.runtime.add_block_as_child_node(child, xml_object)
+        # Set node attributes based on our fields.
+        for field_name, field in self.fields.items():  # pylint: disable=no-member
+            if field_name in ('children', 'parent', 'content'):
+                continue
+            if field.is_set_on(self):
+                xml_object.set(field_name, str(field.read_from(self)))
+        return xml_object
+
+    @classmethod
+    def get_selected_event_prefix(cls) -> str:
+        """
+        Get a string prefix which will be prepended (plus a dot) to events raised when `self.selected` changes.
+
+        Example: if this returned `edx.myblock.content`, new selected children will
+                 raise `edx.myblock.content.assigned`.
+        """
+        raise NotImplementedError
+
+
+class ItemBankBlock(ItemBankMixin, XBlock):
+    """
+    An XBlock which shows a random subset of its children to each learner.
+
+    Unlike LegacyLibraryContentBlock, this block does not need to worry about synchronization, capa_type filtering, etc.
+    That is all implemented using `upstream` links on each individual child.
+    """
+    display_name = String(
+        display_name=_("Display Name"),
+        help=_("The display name for this component."),
+        default="Problem Bank",
+        scope=Scope.settings,
+    )
+
+    def validate(self):
+        """
+        Validates the state of this ItemBankBlock Instance.
+        """
+        validation = super().validate()
+        if not isinstance(validation, StudioValidation):
+            validation = StudioValidation.copy(validation)
+        if not validation.empty:  # If there's already a validation error, leave it there.
+            return validation
+        if self.max_count < -1 or self.max_count == 0:
+            validation.set_summary(
+                StudioValidationMessage(
+                    StudioValidationMessage.ERROR,
+                    _(
+                        "The problem bank has been configured to show {count} problems. "
+                        "Please specify a positive number of problems, or specify -1 to show all problems."
+                    ).format(count=self.max_count),
+                    action_class='edit-button',
+                    action_label=_("Edit the problem bank configuration."),
+                )
+            )
+        elif 0 < len(self.children) < self.max_count:
+            validation.set_summary(
+                StudioValidationMessage(
+                    StudioValidationMessage.WARNING,
+                    _(
+                        "The problem bank has been configured to show {count} problems, "
+                        "but only {actual} have been selected."
+                    ).format(count=self.max_count, actual=len(self.children)),
+                    action_class='edit-button',
+                    action_label=_("Edit the problem bank configuration.")
+                )
+            )
+        return validation
+
+    def author_view(self, context):
+        """
+        Renders the Studio views.
+        Normal studio view: If block is properly configured, displays library status summary
+        Studio container view: displays a preview of all possible children.
+        """
+        fragment = Fragment()
+        root_xblock = context.get('root_xblock')
+        is_root = root_xblock and root_xblock.usage_key == self.usage_key
+        if is_root and self.children:
+            # User has clicked the "View" link. Show a preview of all possible children:
+            context['can_edit_visibility'] = False
+            context['can_move'] = False
+            context['can_collapse'] = True
+            self.render_children(context, fragment, can_reorder=False, can_add=False)
+        else:
+            # We're just on the regular unit page, or we're on the "view" page but no children exist yet.
+            # Show a summary message and instructions.
+            summary_html = loader.render_django_template('templates/item_bank/author_view.html', {
+                # Due to template interpolation limitations, we have to pass some HTML for the link here:
+                "view_link": f'<a href="/container/{self.usage_key}">',
+                "blocks": [
+                    {"display_name": display_name_with_default(child)}
+                    for child in self.get_children()
+                ],
+                "block_count": len(self.children),
+                "max_count": self.max_count,
+            })
+            fragment.add_content(summary_html)
+        # Whether on the main author view or the detailed children view, show a button to add more from the library:
+        add_html = loader.render_django_template('templates/item_bank/author_view_add.html', {})
+        fragment.add_content(add_html)
+        return fragment
+
+    def format_block_keys_for_analytics(self, block_keys: list[tuple[str, str]]) -> list[dict]:
+        """
+        Implement format_block_keys_for_analytics using the `upstream` link system.
+        """
+        return [
+            {
+                "usage_key": str(self.context_key.make_usage_key(*block_key)),
+                # TODO: Need to implement these fields. Will probably need to make `UpstreamMixin` available in the
+                #       LMS. See https://github.com/openedx/edx-platform/issues/35685.
+                # "original_usage_key": ...,
+                # "original_usage_version": ...,
+                # "descendents": ...,
+            } for block_key in block_keys
+        ]
+
+    @classmethod
+    def get_selected_event_prefix(cls) -> str:
+        """
+        Prefix for events on `self.selected`.
+
+        TODO: Ensure that this is the prefix we want to stick with
+        https://github.com/openedx/edx-platform/issues/35685
+        """
+        return "edx.itembankblock.content"
diff --git a/xmodule/js/fixtures/video_all.html b/xmodule/js/fixtures/video_all.html
index 280fc4db35f4..81b472d754d2 100644
--- a/xmodule/js/fixtures/video_all.html
+++ b/xmodule/js/fixtures/video_all.html
@@ -42,8 +42,13 @@ <h4 class="hd hd-5">Video</h4>
                   <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>
+                    <span style="display: inline-block; vertical-align: middle; padding-left: 1px;">
+                      <svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" height="15" width="12.86" viewBox="0 0 448 512">
+                          <!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
+                          <path d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zm297.1 84L257.3 234.6 379.4 396H283.8L209 298.1 123.3 396H75.8l111-126.9L69.7 116h98l67.7 89.5L313.6 116h47.5zM323.3 367.6L153.4 142.9H125.1L296.9 367.6h26.3z"/>
+                      </svg>
+                    </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>
diff --git a/xmodule/js/spec/video/video_control_spec.js b/xmodule/js/spec/video/video_control_spec.js
index 248c3c31d2be..49326290716b 100644
--- a/xmodule/js/spec/video/video_control_spec.js
+++ b/xmodule/js/spec/video/video_control_spec.js
@@ -186,6 +186,26 @@
         });
 
         describe('constructor with end-time', function() {
+            it('displays the correct time when startTime and endTime are specified', function(done) {
+                state = jasmine.initializePlayer({
+                    start: 10,
+                    end: 20
+                });
+                spyOn(state.videoPlayer, 'duration').and.returnValue(60);
+
+                state.videoControl.updateVcrVidTime({
+                    time: 15,
+                    duration: 60
+                });
+
+                jasmine.waitUntil(function() {
+                    var expectedValue = $('.video-controls').find('.vidtime');
+                    return expectedValue.text().indexOf('0:05 / 0:20') !== -1; // Expecting 15 seconds - 10 seconds = 5 seconds
+                }).then(function() {
+                    expect($('.video-controls').find('.vidtime')).toHaveText('0:05 / 0:20');
+                }).always(done);
+            });
+
             it(
                 'saved position is 0, timer slider and VCR set to 0:00 '
                 + 'and ending at specified end-time',
diff --git a/xmodule/js/spec/video/video_events_plugin_spec.js b/xmodule/js/spec/video/video_events_plugin_spec.js
index 860cfb5e07ba..ac809d054edc 100644
--- a/xmodule/js/spec/video/video_events_plugin_spec.js
+++ b/xmodule/js/spec/video/video_events_plugin_spec.js
@@ -226,6 +226,55 @@ import '../helper.js';
                 destroy: plugin.destroy
             });
         });
+
+        describe('getCurrentTime method', function() {
+            it('returns current time adjusted by startTime if video starts from a subsection', function() {
+                spyOn(state.videoPlayer, 'currentTime', 'get').and.returnValue(120);
+                state.config.startTime = 30;
+                expect(state.videoEventsPlugin.getCurrentTime()).toBe(90); // 120 - 30 = 90
+            });
+
+            it('returns 0 if currentTime is undefined', function() {
+                spyOn(state.videoPlayer, 'currentTime', 'get').and.returnValue(undefined);
+                state.config.startTime = 30; // Start time is irrelevant since current time is undefined
+                expect(state.videoEventsPlugin.getCurrentTime()).toBe(0);
+            });
+
+            it('returns unadjusted current time if startTime is not defined', function() {
+                spyOn(state.videoPlayer, 'currentTime', 'get').and.returnValue(60);
+                expect(state.videoEventsPlugin.getCurrentTime()).toBe(60); // Returns current time as is
+            });
+        });
+
+        describe('log method', function() {
+            it('logs event with adjusted duration when startTime and endTime are defined', function() {
+                state.config.startTime = 30;
+                state.config.endTime = 150;
+                state.duration = 200;
+
+                state.videoEventsPlugin.log('test_event', {});
+
+                expect(Logger.log).toHaveBeenCalledWith('test_event', {
+                    id: 'id',
+                    code: this.code,
+                    duration: 120, // 150 - 30 = 120
+                });
+            });
+
+            it('logs event with full duration when startTime and endTime are not defined', function() {
+                state.config.startTime = undefined;
+                state.config.endTime = undefined;
+                state.duration = 200;
+
+                state.videoEventsPlugin.log('test_event', {});
+
+                expect(Logger.log).toHaveBeenCalledWith('test_event', {
+                    id: 'id',
+                    code: this.code,
+                    duration: 200 // Full duration as no start/end time adjustment is needed
+                });
+            });
+        });
     });
 
     describe('VideoPlayer Events plugin', function() {
diff --git a/xmodule/js/src/video/04_video_control.js b/xmodule/js/src/video/04_video_control.js
index b8cec53cae6f..c6f2ba240745 100644
--- a/xmodule/js/src/video/04_video_control.js
+++ b/xmodule/js/src/video/04_video_control.js
@@ -152,10 +152,17 @@
             }
 
             function updateVcrVidTime(params) {
-                var endTime = (this.config.endTime !== null) ? this.config.endTime : params.duration;
+                var endTime = (this.config.endTime !== null) ? this.config.endTime : params.duration,
+                    startTime, currentTime;
                 // in case endTime is accidentally specified as being greater than the video
                 endTime = Math.min(endTime, params.duration);
-                this.videoControl.vidTimeEl.text(Time.format(params.time) + ' / ' + Time.format(endTime));
+                startTime = this.config.startTime > 0 ? this.config.startTime : 0;
+                // if it's a subsection of video, use the clip duration as endTime
+                if (startTime && this.config.endTime) {
+                    endTime = this.config.endTime - startTime;
+                }
+                currentTime = startTime ? params.time - startTime : params.time;
+                this.videoControl.vidTimeEl.text(Time.format(currentTime) + ' / ' + Time.format(endTime));
             }
         }
     );
diff --git a/xmodule/js/src/video/09_events_plugin.js b/xmodule/js/src/video/09_events_plugin.js
index d407534c983e..6116f26e22c5 100644
--- a/xmodule/js/src/video/09_events_plugin.js
+++ b/xmodule/js/src/video/09_events_plugin.js
@@ -143,8 +143,15 @@
             },
 
             getCurrentTime: function() {
-                var player = this.state.videoPlayer;
-                return player ? player.currentTime : 0;
+                var player = this.state.videoPlayer,
+                    startTime = this.state.config.startTime,
+                    currentTime;
+                currentTime = player ? player.currentTime : 0;
+                // if video didn't start from 0(it's a subsection of video), subtract the additional time at start
+                if (startTime) {
+                    currentTime = currentTime ? currentTime - startTime : 0;
+                }
+                return currentTime;
             },
 
             getCurrentLanguage: function() {
@@ -153,11 +160,15 @@
             },
 
             log: function(eventName, data) {
+                // use startTime and endTime to calculate the duration to handle the case where only a subsection of video is used
+                var endTime = this.state.config.endTime || this.state.duration,
+                    startTime = this.state.config.startTime;
+
                 var logInfo = _.extend({
                     id: this.state.id,
                     // eslint-disable-next-line no-nested-ternary
                     code: this.state.isYoutubeType() ? this.state.youtubeId() : this.state.canPlayHLS ? 'hls' : 'html5',
-                    duration: this.state.duration
+                    duration: endTime - startTime
                 }, data, this.options.data);
                 Logger.log(eventName, logInfo);
             }
diff --git a/xmodule/library_content_block.py b/xmodule/library_content_block.py
index 09a5d1dee13e..52e33108027c 100644
--- a/xmodule/library_content_block.py
+++ b/xmodule/library_content_block.py
@@ -1,45 +1,33 @@
 """
-LibraryContent: The XBlock used to include blocks from a library in a course.
+LegacyLibraryContent: The XBlock used to randomly select a subset of blocks from a "v1" (modulestore-backed) library.
+
+In Studio, it's called the "Randomized Content Module".
+
+In the long-term, this block is deprecated in favor of "v2" (learning core-backed) library references:
+https://github.com/openedx/edx-platform/issues/32457
+
+We need to retain backwards-compatibility, but please do not build any new features into this.
 """
 from __future__ import annotations
 
 import json
 import logging
-import random
-from copy import copy
 from gettext import ngettext, gettext
 
 import nh3
-from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
-from django.utils.functional import classproperty
-from lxml import etree
-from lxml.etree import XMLSyntaxError
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
-from rest_framework import status
+from opaque_keys.edx.locator import LibraryLocator
 from web_fragments.fragment import Fragment
 from webob import Response
-from xblock.completable import XBlockCompletionMode
 from xblock.core import XBlock
-from xblock.fields import Boolean, Integer, List, Scope, String
+from xblock.fields import Integer, Scope, String
 
 from xmodule.capa.responsetypes import registry
-from xmodule.mako_block import MakoTemplateBlockBase
-from xmodule.studio_editable import StudioEditableBlock
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment
+from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.item_bank_block import ItemBankMixin
 from xmodule.validation import StudioValidation, StudioValidationMessage
-from xmodule.xml_block import XmlMixin
-from xmodule.x_module import (
-    STUDENT_VIEW,
-    ResourceTemplates,
-    XModuleMixin,
-    XModuleToXBlockMixin,
-    shim_xmodule_js,
-)
-
-# Make '_' a no-op so we can scrape strings. Using lambda instead of
-#  `django.utils.translation.ugettext_noop` because Django cannot be imported in this file
+from xmodule.x_module import XModuleToXBlockMixin
+
 _ = lambda text: text
 
 logger = logging.getLogger(__name__)
@@ -74,50 +62,17 @@ def __init__(self):
         super().__init__("Needed 'library_tools' features which were not available in the current runtime")
 
 
-@XBlock.wants('library_tools')  # TODO: Split this service into its LMS and CMS parts.
+@XBlock.wants('library_tools')
 @XBlock.wants('studio_user_permissions')  # Only available in CMS.
-@XBlock.wants('user')
-@XBlock.needs('mako')
-class LibraryContentBlock(
-    MakoTemplateBlockBase,
-    XmlMixin,
-    XModuleToXBlockMixin,
-    ResourceTemplates,
-    XModuleMixin,
-    StudioEditableBlock,
-):
+class LegacyLibraryContentBlock(ItemBankMixin, XModuleToXBlockMixin, XBlock):
     """
-    An XBlock whose children are chosen dynamically from a content library.
+    An XBlock whose children are chosen dynamically from a legacy (v1) content library.
     Can be used to create randomized assessments among other things.
 
     Note: technically, all matching blocks from the content library are added
     as children of this block, but only a subset of those children are shown to
     any particular student.
     """
-    # pylint: disable=abstract-method
-    has_children = True
-    has_author_view = True
-
-    resources_dir = 'assets/library_content'
-
-    mako_template = 'widgets/metadata-edit.html'
-    studio_js_module_name = "VerticalDescriptor"
-
-    show_in_read_only_mode = True
-
-    # noinspection PyMethodParameters
-    @classproperty
-    def completion_mode(cls):  # pylint: disable=no-self-argument
-        """
-        Allow overriding the completion mode with a feature flag.
-
-        This is a property, so it can be dynamically overridden in tests, as it is not evaluated at runtime.
-        """
-        if settings.FEATURES.get('MARK_LIBRARY_CONTENT_BLOCK_COMPLETE_ON_VIEW', False):
-            return XBlockCompletionMode.COMPLETABLE
-
-        return XBlockCompletionMode.AGGREGATOR
-
     display_name = String(
         display_name=_("Display Name"),
         help=_("The display name for this component."),
@@ -135,17 +90,6 @@ def completion_mode(cls):  # pylint: disable=no-self-argument
         display_name=_("Library Version"),
         scope=Scope.settings,
     )
-    mode = String(
-        display_name=_("Mode"),
-        help=_("Determines how content is drawn from the library"),
-        default="random",
-        values=[
-            {"display_name": _("Choose n at random"), "value": "random"}
-            # Future addition: Choose a new random set of n every time the student refreshes the block, for self tests
-            # Future addition: manually selected blocks
-        ],
-        scope=Scope.settings,
-    )
     max_count = Integer(
         display_name=_("Count"),
         help=_("Enter the number of components to display to each student. Set it to -1 to display all components."),
@@ -159,263 +103,13 @@ def completion_mode(cls):  # pylint: disable=no-self-argument
         values=_get_capa_types(),
         scope=Scope.settings,
     )
-    selected = List(
-        # This is a list of (block_type, block_id) tuples used to record
-        # which random/first set of matching blocks was selected per user
-        default=[],
-        scope=Scope.user_state,
-    )
-    # This cannot be called `show_reset_button`, because children blocks inherit this as a default value.
-    allow_resetting_children = Boolean(
-        display_name=_("Show Reset Button"),
-        help=_("Determines whether a 'Reset Problems' button is shown, so users may reset their answers and reshuffle "
-               "selected items."),
-        scope=Scope.settings,
-        default=False
-    )
 
     @property
     def source_library_key(self):
         """
         Convenience method to get the library ID as a LibraryLocator and not just a string.
-
-        Supports either library v1 or library v2 locators.
-        """
-        try:
-            return LibraryLocator.from_string(self.source_library_id)
-        except InvalidKeyError:
-            return LibraryLocatorV2.from_string(self.source_library_id)
-
-    @classmethod
-    def make_selection(cls, selected, children, max_count, mode):
         """
-        Dynamically selects block_ids indicating which of the possible children are displayed to the current user.
-
-        Arguments:
-            selected - list of (block_type, block_id) tuples assigned to this student
-            children - children of this block
-            max_count - number of components to display to each student
-            mode - how content is drawn from the library
-
-        Returns:
-            A dict containing the following keys:
-
-            'selected' (set) of (block_type, block_id) tuples assigned to this student
-            'invalid' (set) of dropped (block_type, block_id) tuples that are no longer valid
-            'overlimit' (set) of dropped (block_type, block_id) tuples that were previously selected
-            'added' (set) of newly added (block_type, block_id) tuples
-        """
-        rand = random.Random()
-
-        selected_keys = {tuple(k) for k in selected}  # set of (block_type, block_id) tuples assigned to this student
-
-        # Determine which of our children we will show:
-        valid_block_keys = {(c.block_type, c.block_id) for c in children}
-
-        # Remove any selected blocks that are no longer valid:
-        invalid_block_keys = (selected_keys - valid_block_keys)
-        if invalid_block_keys:
-            selected_keys -= invalid_block_keys
-
-        # If max_count has been decreased, we may have to drop some previously selected blocks:
-        overlimit_block_keys = set()
-        if len(selected_keys) > max_count:
-            num_to_remove = len(selected_keys) - max_count
-            overlimit_block_keys = set(rand.sample(list(selected_keys), num_to_remove))
-            selected_keys -= overlimit_block_keys
-
-        # Do we have enough blocks now?
-        num_to_add = max_count - len(selected_keys)
-
-        added_block_keys = None
-        if num_to_add > 0:
-            # We need to select [more] blocks to display to this user:
-            pool = valid_block_keys - selected_keys
-            if mode == "random":
-                num_to_add = min(len(pool), num_to_add)
-                added_block_keys = set(rand.sample(list(pool), num_to_add))
-                # We now have the correct n random children to show for this user.
-            else:
-                raise NotImplementedError("Unsupported mode.")
-            selected_keys |= added_block_keys
-
-        if any((invalid_block_keys, overlimit_block_keys, added_block_keys)):
-            selected = list(selected_keys)
-            random.shuffle(selected)
-
-        return {
-            'selected': selected,
-            'invalid': invalid_block_keys,
-            'overlimit': overlimit_block_keys,
-            'added': added_block_keys,
-        }
-
-    def _publish_event(self, event_name, result, **kwargs):
-        """
-        Helper method to publish an event for analytics purposes
-        """
-        event_data = {
-            "location": str(self.location),
-            "result": result,
-            "previous_count": getattr(self, "_last_event_result_count", len(self.selected)),
-            "max_count": self.max_count,
-        }
-        event_data.update(kwargs)
-        self.runtime.publish(self, f"edx.librarycontentblock.content.{event_name}", event_data)
-        self._last_event_result_count = len(result)  # pylint: disable=attribute-defined-outside-init
-
-    @classmethod
-    def publish_selected_children_events(cls, block_keys, format_block_keys, publish_event):
-        """
-        Helper method for publishing events when children blocks are
-        selected/updated for a user.  This helper is also used by
-        the ContentLibraryTransformer.
-
-        Arguments:
-
-            block_keys -
-                A dict describing which events to publish (add or
-                remove), see `make_selection` above for format details.
-
-            format_block_keys -
-                A function to convert block keys to the format expected
-                by publish_event. Must have the signature:
-
-                    [(block_type, block_id)] -> T
-
-                Where T is a collection of block keys as accepted by
-                `publish_event`.
-
-            publish_event -
-                Function that handles the actual publishing.  Must have
-                the signature:
-
-                    <'removed'|'assigned'> -> result:T -> removed:T -> reason:str -> None
-
-                Where T is a collection of block_keys as returned by
-                `format_block_keys`.
-        """
-        if block_keys['invalid']:
-            # reason "invalid" means deleted from library or a different library is now being used.
-            publish_event(
-                "removed",
-                result=format_block_keys(block_keys['selected']),
-                removed=format_block_keys(block_keys['invalid']),
-                reason="invalid"
-            )
-
-        if block_keys['overlimit']:
-            publish_event(
-                "removed",
-                result=format_block_keys(block_keys['selected']),
-                removed=format_block_keys(block_keys['overlimit']),
-                reason="overlimit"
-            )
-
-        if block_keys['added']:
-            publish_event(
-                "assigned",
-                result=format_block_keys(block_keys['selected']),
-                added=format_block_keys(block_keys['added'])
-            )
-
-    def selected_children(self):
-        """
-        Returns a [] of block_ids indicating which of the possible children
-        have been selected to display to the current user.
-
-        This reads and updates the "selected" field, which has user_state scope.
-
-        Note: the return value (self.selected) contains block_ids. To get
-        actual BlockUsageLocators, it is necessary to use self.children,
-        because the block_ids alone do not specify the block type.
-        """
-        max_count = self.max_count
-        if max_count < 0:
-            max_count = len(self.children)
-
-        block_keys = self.make_selection(self.selected, self.children, max_count, "random")  # pylint: disable=no-member
-
-        # Publish events for analytics purposes:
-        lib_tools = self.get_tools()
-        format_block_keys = lambda keys: lib_tools.create_block_analytics_summary(self.location.course_key, keys)
-        self.publish_selected_children_events(
-            block_keys,
-            format_block_keys,
-            self._publish_event,
-        )
-
-        if any(block_keys[changed] for changed in ('invalid', 'overlimit', 'added')):
-            # Save our selections to the user state, to ensure consistency:
-            selected = block_keys['selected']
-            self.selected = selected  # TODO: this doesn't save from the LMS "Progress" page.
-
-        return self.selected
-
-    @XBlock.handler
-    def reset_selected_children(self, _, __):
-        """
-        Resets the XBlock's state for a user.
-
-        This resets the state of all `selected` children and then clears the `selected` field
-        so that the new blocks are randomly chosen for this user.
-        """
-        if not self.allow_resetting_children:
-            return Response('"Resetting selected children" is not allowed for this XBlock',
-                            status=status.HTTP_400_BAD_REQUEST)
-
-        for block_type, block_id in self.selected_children():
-            block = self.runtime.get_block(self.location.course_key.make_usage_key(block_type, block_id))
-            if hasattr(block, 'reset_problem'):
-                block.reset_problem(None)
-                block.save()
-
-        self.selected = []
-        return Response(json.dumps(self.student_view({}).content))
-
-    def _get_selected_child_blocks(self):
-        """
-        Generator returning XBlock instances of the children selected for the
-        current user.
-        """
-        for block_type, block_id in self.selected_children():
-            yield self.runtime.get_block(self.location.course_key.make_usage_key(block_type, block_id))
-
-    def student_view(self, context):  # lint-amnesty, pylint: disable=missing-function-docstring
-        fragment = Fragment()
-        contents = []
-        child_context = {} if not context else copy(context)
-
-        for child in self._get_selected_child_blocks():
-            if child is None:
-                # TODO: Fix the underlying issue in TNL-7424
-                # This shouldn't be happening, but does for an as-of-now
-                # unknown reason. Until we address the underlying issue,
-                # let's at least log the error explicitly, ignore the
-                # exception, and prevent the page from resulting in a
-                # 500-response.
-                logger.error('Skipping display for child block that is None')
-                continue
-
-            rendered_child = child.render(STUDENT_VIEW, child_context)
-            fragment.add_fragment_resources(rendered_child)
-            contents.append({
-                'id': str(child.location),
-                'content': rendered_child.content,
-            })
-
-        fragment.add_content(self.runtime.service(self, 'mako').render_lms_template('vert_module.html', {
-            'items': contents,
-            'xblock_context': context,
-            'show_bookmark_button': False,
-            'watched_completable_blocks': set(),
-            'completion_delay_ms': None,
-            'reset_button': self.allow_resetting_children,
-        }))
-
-        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/library_content_reset.js'))
-        fragment.initialize_js('LibraryContentReset')
-        return fragment
+        return LibraryLocator.from_string(self.source_library_id)
 
     def author_view(self, context):
         """
@@ -460,37 +154,15 @@ def author_view(self, context):
         fragment.initialize_js('LibraryContentAuthorView')
         return fragment
 
-    def studio_view(self, _context):
-        """
-        Return the studio view.
-        """
-        fragment = Fragment(
-            self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
-        )
-        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/library_content_edit_helpers.js'))
-        add_webpack_js_to_fragment(fragment, 'LibraryContentBlockEditor')
-        shim_xmodule_js(fragment, self.studio_js_module_name)
-        return fragment
-
-    def get_child_blocks(self):
-        """
-        Return only the subset of our children relevant to the current student.
-        """
-        return list(self._get_selected_child_blocks())
-
     @property
     def non_editable_metadata_fields(self):
         non_editable_fields = super().non_editable_metadata_fields
-        # The only supported mode is currently 'random'.
-        # Add the mode field to non_editable_metadata_fields so that it doesn't
-        # render in the edit form.
         non_editable_fields.extend([
-            LibraryContentBlock.mode,
-            LibraryContentBlock.source_library_version,
+            LegacyLibraryContentBlock.source_library_version,
         ])
         return non_editable_fields
 
-    def get_tools(self, to_read_library_content: bool = False) -> 'LibraryToolsService':
+    def get_tools(self, to_read_library_content: bool = False) -> 'LegacyLibraryToolsService':
         """
         Grab the library tools service and confirm that it'll work for us. Else, raise LibraryToolsUnavailable.
         """
@@ -499,17 +171,6 @@ def get_tools(self, to_read_library_content: bool = False) -> 'LibraryToolsServi
                 return tools
         raise LibraryToolsUnavailable()
 
-    def get_user_id(self):
-        """
-        Get the ID of the current user.
-        """
-        user_service = self.runtime.service(self, 'user')
-        if user_service:
-            user_id = user_service.get_current_user().opt_attrs.get('edx-platform.user_id', None)
-        else:
-            user_id = None
-        return user_id
-
     def _validate_sync_permissions(self):
         """
         Raises PermissionDenied() if we can't confirm that user has write on this block and read on source library.
@@ -564,22 +225,6 @@ def sync_from_library(self, upgrade_to_latest: bool = False) -> None:
             library_version=(None if upgrade_to_latest else self.source_library_version),
         )
 
-    @XBlock.json_handler
-    def is_v2_library(self, data, suffix=''):  # pylint: disable=unused-argument
-        """
-        Check the library version by library_id.
-
-        This is a temporary handler needed for hiding the Problem Type xblock editor field for V2 libraries.
-        """
-        lib_key = data.get('library_key')
-        try:
-            LibraryLocatorV2.from_string(lib_key)
-        except InvalidKeyError:
-            is_v2 = False
-        else:
-            is_v2 = True
-        return {'is_v2': is_v2}
-
     @XBlock.handler
     def children_are_syncing(self, request, suffix=''):  # pylint: disable=unused-argument
         """
@@ -744,8 +389,6 @@ def source_library_values(self):
     def post_editor_saved(self, user, old_metadata, old_content):  # pylint: disable=unused-argument
         """
         If source library or capa_type have been edited, upgrade library & sync automatically.
-
-        TODO: capa_type doesn't really need to trigger an upgrade once we've migrated to V2.
         """
         source_lib_changed = (self.source_library_id != old_metadata.get("source_library_id", ""))
         capa_filter_changed = (self.capa_type != old_metadata.get("capa_type", ANY_CAPA_TYPE_VALUE))
@@ -756,67 +399,56 @@ def post_editor_saved(self, user, old_metadata, old_content):  # pylint: disable
                 # The validation area will display an error message, no need to do anything now.
                 pass
 
-    def has_dynamic_children(self):
+    def format_block_keys_for_analytics(self, block_keys: list[tuple[str, str]]) -> list[dict]:
         """
-        Inform the runtime that our children vary per-user.
-        See get_child_blocks() above
+        Implement format_block_keys_for_analytics using the modulestore-specific legacy library original-usage system.
         """
-        return True
+        def summarize_block(usage_key):
+            """ Basic information about the given block """
+            orig_key, orig_version = self.runtime.modulestore.get_block_original_usage(usage_key)
+            return {
+                "usage_key": str(usage_key),
+                "original_usage_key": str(orig_key.replace(version=None, branch=None)) if orig_key else None,
+                "original_usage_version": str(orig_version) if orig_version else None,
+            }
 
-    def get_content_titles(self):
+        result_json = []
+        for block_key in block_keys:
+            key = self.context_key.make_usage_key(*block_key)
+            info = summarize_block(key)
+            info['descendants'] = []
+            try:
+                block = self.runtime.modulestore.get_item(key, depth=None)  # Load the item and all descendants
+                children = list(getattr(block, "children", []))
+                while children:
+                    child_key = children.pop().replace(version=None, branch=None)
+                    child = self.runtime.modulestore.get_item(child_key)
+                    info['descendants'].append(summarize_block(child_key))
+                    children.extend(getattr(child, "children", []))
+            except ItemNotFoundError:
+                pass  # The block has been deleted
+            result_json.append(info)
+        return result_json
+
+    @classmethod
+    def get_selected_event_prefix(cls) -> str:
         """
-        Returns list of friendly titles for our selected children only; without
-        thi, all possible children's titles would be seen in the sequence bar in
-        the LMS.
+        Prefix for events on `self.selected`.
 
-        This overwrites the get_content_titles method included in x_module by default.
+        We use librarycontent rather than legacylibrarycontent for backwards compatibility (this wasn't always the
+        "legacy" library content block :)
         """
-        titles = []
-        for child in self.get_child_blocks():
-            titles.extend(child.get_content_titles())
-        return titles
+        return "edx.librarycontentblock.content"
 
-    @classmethod
-    def definition_from_xml(cls, xml_object, system):
-        children = []
 
-        for child in xml_object.getchildren():
-            try:
-                children.append(system.process_xml(etree.tostring(child)).scope_ids.usage_id)
-            except (XMLSyntaxError, AttributeError):
-                msg = (
-                    "Unable to load child when parsing Library Content Block. "
-                    "This can happen when a comment is manually added to the course export."
-                )
-                logger.error(msg)
-                if system.error_tracker is not None:
-                    system.error_tracker(msg)
-
-        definition = dict(xml_object.attrib.items())
-        return definition, children
-
-    def definition_to_xml(self, resource_fs):
-        """ Exports Library Content Block to XML """
-        xml_object = etree.Element('library_content')
-        for child in self.get_children():
-            self.runtime.add_block_as_child_node(child, xml_object)
-        # Set node attributes based on our fields.
-        for field_name, field in self.fields.items():  # pylint: disable=no-member
-            if field_name in ('children', 'parent', 'content'):
-                continue
-            if field.is_set_on(self):
-                xml_object.set(field_name, str(field.read_from(self)))
-        return xml_object
-
-
-class LibrarySummary:
+class LegacyLibrarySummary:
     """
     A library summary object which contains the fields required for library listing on studio.
     """
 
     def __init__(self, library_locator, display_name):
         """
-        Initialize LibrarySummary
+        Initialize LegacyLibrarySummary
 
         Arguments:
         library_locator (LibraryLocator):  LibraryLocator object of the library.
diff --git a/xmodule/library_tools.py b/xmodule/library_tools.py
index 2c077a888482..52a31c0608ea 100644
--- a/xmodule/library_tools.py
+++ b/xmodule/library_tools.py
@@ -1,18 +1,17 @@
 """
-XBlock runtime services for LibraryContentBlock
+XBlock runtime services for LegacyLibraryContentBlock
 """
 from __future__ import annotations
 
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
-from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
+from opaque_keys.edx.locator import LibraryLocator
 from user_tasks.models import UserTaskStatus
 
 from openedx.core.lib import ensure_cms
-from openedx.core.djangoapps.content_libraries import api as library_api
 from openedx.core.djangoapps.content_libraries import tasks as library_tasks
-from xmodule.library_content_block import LibraryContentBlock
-from xmodule.library_root_xblock import LibraryRoot as LibraryRootV1
+from xmodule.library_content_block import LegacyLibraryContentBlock
+from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
 
@@ -21,9 +20,9 @@ def normalize_key_for_search(library_key):
     return library_key.replace(version_guid=None, branch=None)
 
 
-class LibraryToolsService:
+class LegacyLibraryToolsService:
     """
-    Service for LibraryContentBlock.
+    Service for LegacyLibraryContentBlock.
 
     Allows to interact with libraries in the modulestore and learning core.
 
@@ -33,62 +32,31 @@ def __init__(self, modulestore, user_id):
         self.store = modulestore
         self.user_id = user_id
 
-    def get_latest_library_version(self, lib_key) -> str | None:
+    def get_latest_library_version(self, library_id: str | LibraryLocator) -> str | None:
         """
         Get the version of the given library as string.
 
         The return value (library version) could be:
             str(<ObjectID>) - for V1 library;
-            str(<int>)      - for V2 library.
             None            - if the library does not exist.
         """
-        library = library_api.get_v1_or_v2_library(lib_key, version=None)
+        library_key: LibraryLocator
+        if isinstance(library_id, str):
+            library_key = LibraryLocator.from_string(library_id)
+        else:
+            library_key = library_id
+        library_key = library_key.for_branch(ModuleStoreEnum.BranchName.library).for_version(None)
+        try:
+            library = self.store.get_library(
+                library_key, remove_version=False, remove_branch=False, head_validation=False
+            )
+        except ItemNotFoundError:
+            return None
         if not library:
             return None
-        elif isinstance(library, LibraryRootV1):
-            # We need to know the library's version so ensure it's set in library.location.library_key.version_guid
-            assert library.location.library_key.version_guid is not None
-            return str(library.location.library_key.version_guid)
-        elif isinstance(library, library_api.ContentLibraryMetadata):
-            return str(library.version)
-
-    def create_block_analytics_summary(self, course_key, block_keys):
-        """
-        Given a CourseKey and a list of (block_type, block_id) pairs,
-        prepare the JSON-ready metadata needed for analytics logging.
-
-        This is [
-            {"usage_key": x, "original_usage_key": y, "original_usage_version": z, "descendants": [...]}
-        ]
-        where the main list contains all top-level blocks, and descendants contains a *flat* list of all
-        descendants of the top level blocks, if any.
-        """
-        def summarize_block(usage_key):
-            """ Basic information about the given block """
-            orig_key, orig_version = self.store.get_block_original_usage(usage_key)
-            return {
-                "usage_key": str(usage_key),
-                "original_usage_key": str(orig_key) if orig_key else None,
-                "original_usage_version": str(orig_version) if orig_version else None,
-            }
-
-        result_json = []
-        for block_key in block_keys:
-            key = course_key.make_usage_key(*block_key)
-            info = summarize_block(key)
-            info['descendants'] = []
-            try:
-                block = self.store.get_item(key, depth=None)  # Load the item and all descendants
-                children = list(getattr(block, "children", []))
-                while children:
-                    child_key = children.pop()
-                    child = self.store.get_item(child_key)
-                    info['descendants'].append(summarize_block(child_key))
-                    children.extend(getattr(child, "children", []))
-            except ItemNotFoundError:
-                pass  # The block has been deleted
-            result_json.append(info)
-        return result_json
+        # We need to know the library's version so ensure it's set in library.location.library_key.version_guid
+        assert library.location.library_key.version_guid is not None
+        return str(library.location.library_key.version_guid)
 
     def can_use_library_content(self, block):
         """
@@ -96,7 +64,7 @@ def can_use_library_content(self, block):
         """
         return self.store.check_supports(block.location.course_key, 'copy_from_template')
 
-    def trigger_library_sync(self, dest_block: LibraryContentBlock, library_version: str | int | None) -> None:
+    def trigger_library_sync(self, dest_block: LegacyLibraryContentBlock, library_version: str | None) -> None:
         """
         Queue task to synchronize the children of `dest_block` with it source library (at `library_version` or latest).
 
@@ -118,16 +86,20 @@ def trigger_library_sync(self, dest_block: LibraryContentBlock, library_version:
             `dest_block.children`.
         """
         ensure_cms("library_content block children may only be synced in a CMS context")
-        if not isinstance(dest_block, LibraryContentBlock):
+        if not isinstance(dest_block, LegacyLibraryContentBlock):
             raise ValueError(f"Can only sync children for library_content blocks, not {dest_block.tag} blocks.")
         if not dest_block.source_library_id:
             dest_block.source_library_version = ""
             return
-        library_key = dest_block.source_library_key
-        if not library_api.get_v1_or_v2_library(library_key, version=library_version):
+        library_key = dest_block.source_library_key.for_branch(
+            ModuleStoreEnum.BranchName.library
+        ).for_version(library_version)
+        try:
+            self.store.get_library(library_key, remove_version=False, remove_branch=False, head_validation=False)
+        except ItemNotFoundError as exc:
             if library_version:
-                raise ObjectDoesNotExist(f"Version {library_version} of library {library_key} not found.")
-            raise ObjectDoesNotExist(f"Library {library_key} not found.")
+                raise ObjectDoesNotExist(f"Version {library_version} of library {library_key} not found.") from exc
+            raise ObjectDoesNotExist(f"Library {library_key} not found.") from exc
 
         # TODO: This task is synchronous until we can figure out race conditions with import.
         # These race conditions lead to failed imports of library content from course import.
@@ -140,12 +112,14 @@ def trigger_library_sync(self, dest_block: LibraryContentBlock, library_version:
             ),
         )
 
-    def trigger_duplication(self, source_block: LibraryContentBlock, dest_block: LibraryContentBlock) -> None:
+    def trigger_duplication(
+        self, source_block: LegacyLibraryContentBlock, dest_block: LegacyLibraryContentBlock
+    ) -> None:
         """
         Queue a task to duplicate the children of `source_block` to `dest_block`.
         """
         ensure_cms("library_content block children may only be duplicated in a CMS context")
-        if not isinstance(dest_block, LibraryContentBlock):
+        if not isinstance(dest_block, LegacyLibraryContentBlock):
             raise ValueError(f"Can only duplicate children for library_content blocks, not {dest_block.tag} blocks.")
         if source_block.scope_ids.usage_id.context_key != source_block.scope_ids.usage_id.context_key:
             raise ValueError(
@@ -163,7 +137,7 @@ def trigger_duplication(self, source_block: LibraryContentBlock, dest_block: Lib
             dest_block_id=str(dest_block.scope_ids.usage_id),
         )
 
-    def are_children_syncing(self, library_content_block: LibraryContentBlock) -> bool:
+    def are_children_syncing(self, library_content_block: LegacyLibraryContentBlock) -> bool:
         """
         Is a task currently running to sync the children of `library_content_block`?
 
@@ -179,21 +153,12 @@ def are_children_syncing(self, library_content_block: LibraryContentBlock) -> bo
 
     def list_available_libraries(self):
         """
-        List all known libraries.
+        List all known legacy libraries.
 
-        Collects Only V2 Libaries if the FEATURES[ENABLE_LIBRARY_AUTHORING_MICROFRONTEND] setting is True.
-        Otherwise, return all v1 and v2 libraries.
         Returns tuples of (library key, display_name).
         """
         user = User.objects.get(id=self.user_id)
-        v1_libs = [
+        return [
             (lib.location.library_key.replace(version_guid=None, branch=None), lib.display_name)
             for lib in self.store.get_library_summaries()
         ]
-        v2_query = library_api.get_libraries_for_user(user)
-        v2_libs_with_meta = library_api.get_metadata(v2_query)
-        v2_libs = [(lib.key, lib.title) for lib in v2_libs_with_meta]
-
-        if settings.FEATURES.get('ENABLE_LIBRARY_AUTHORING_MICROFRONTEND'):
-            return v2_libs
-        return v1_libs + v2_libs
diff --git a/xmodule/lti_block.py b/xmodule/lti_block.py
index 55f940b381c2..944a7ec88db0 100644
--- a/xmodule/lti_block.py
+++ b/xmodule/lti_block.py
@@ -59,9 +59,9 @@
 import hashlib
 import logging
 import textwrap
-from xml.sax.saxutils import escape
 from unittest import mock
 from urllib import parse
+from xml.sax.saxutils import escape
 
 import nh3
 import oauthlib.oauth1
@@ -69,30 +69,29 @@
 from lxml import etree
 from oauthlib.oauth1.rfc5849 import signature
 from pytz import UTC
-from webob import Response
 from web_fragments.fragment import Fragment
+from webob import Response
 from xblock.core import List, Scope, String, XBlock
 from xblock.fields import Boolean, Float
-from xmodule.mako_block import MakoTemplateBlockBase
-
-from openedx.core.djangolib.markup import HTML, Text
-from xmodule.editing_block import EditingMixin
+from xblocks_contrib.lti import LTIBlock as _ExtractedLTIBlock
 
 from common.djangoapps.xblock_django.constants import (
     ATTR_KEY_ANONYMOUS_USER_ID,
     ATTR_KEY_USER_ROLE,
 )
+from openedx.core.djangolib.markup import HTML, Text
+from xmodule.editing_block import EditingMixin
 from xmodule.lti_2_util import LTI20BlockMixin, LTIError
+from xmodule.mako_block import MakoTemplateBlockBase
 from xmodule.raw_block import EmptyDataRawMixin
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
-from xmodule.xml_block import XmlMixin
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
     XModuleMixin,
     XModuleToXBlockMixin,
 )
-
+from xmodule.xml_block import XmlMixin
 
 log = logging.getLogger(__name__)
 
@@ -274,7 +273,7 @@ class LTIFields:
 @XBlock.needs("mako")
 @XBlock.needs("user")
 @XBlock.needs("rebind_user")
-class LTIBlock(
+class _BuiltInLTIBlock(
     LTIFields,
     LTI20BlockMixin,
     EmptyDataRawMixin,
@@ -366,6 +365,7 @@ class LTIBlock(
 
         Otherwise error message from LTI provider is generated.
     """
+    is_extracted = False
     resources_dir = None
     uses_xmodule_styles_setup = True
 
@@ -524,7 +524,7 @@ def student_view(self, _context):
         """
         fragment = Fragment()
         fragment.add_content(self.runtime.service(self, 'mako').render_lms_template('lti.html', self.get_context()))
-        add_sass_to_fragment(fragment, 'LTIBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'LTIBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'LTIBlockDisplay')
         shim_xmodule_js(fragment, 'LTI')
         return fragment
@@ -984,3 +984,10 @@ def is_past_due(self):
         else:
             close_date = due_date
         return close_date is not None and datetime.datetime.now(UTC) > close_date
+
+
+LTIBlock = (
+    _ExtractedLTIBlock if settings.USE_EXTRACTED_LTI_BLOCK
+    else _BuiltInLTIBlock
+)
+LTIBlock.__name__ = "LTIBlock"
diff --git a/xmodule/mako_block.py b/xmodule/mako_block.py
index abf3a93f3858..f9e84d5e1907 100644
--- a/xmodule/mako_block.py
+++ b/xmodule/mako_block.py
@@ -46,13 +46,6 @@ class MakoTemplateBlockBase:
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if getattr(self.runtime, 'render_template', None) is None:
-            raise TypeError(
-                '{runtime} must have a render_template function'
-                ' in order to use a MakoDescriptor'.format(
-                    runtime=self.runtime,
-                )
-            )
 
     def get_context(self):
         """
@@ -69,7 +62,7 @@ def studio_view(self, context):  # pylint: disable=unused-argument
         """
         # pylint: disable=no-member
         fragment = Fragment(
-            self.runtime.render_template(self.mako_template, self.get_context())
+            self.runtime.service(self, 'mako').render_template(self.mako_template, self.get_context())
         )
         shim_xmodule_js(fragment, self.js_module_name)
         return fragment
diff --git a/xmodule/modulestore/mixed.py b/xmodule/modulestore/mixed.py
index e1ea6640acc5..fb5be170412f 100644
--- a/xmodule/modulestore/mixed.py
+++ b/xmodule/modulestore/mixed.py
@@ -343,7 +343,7 @@ def get_library_keys(self):
     @strip_key
     def get_library_summaries(self, **kwargs):
         """
-        Returns a list of LibrarySummary objects.
+        Returns a list of LegacyLibrarySummary objects.
         Information contains `location`, `display_name`, `locator` of the libraries in this modulestore.
         """
         library_summaries = {}
diff --git a/xmodule/modulestore/search.py b/xmodule/modulestore/search.py
index 60317039821a..fc065078968b 100644
--- a/xmodule/modulestore/search.py
+++ b/xmodule/modulestore/search.py
@@ -12,7 +12,7 @@
 LOGGER = getLogger(__name__)
 
 
-def path_to_location(modulestore, usage_key, request=None, full_path=False):
+def path_to_location(modulestore, usage_key, request=None, full_path=False, branch_type=None):
     '''
     Try to find a course_id/chapter/section[/position] path to location in
     modulestore.  The courseware insists that the first level in the course is
@@ -82,46 +82,47 @@ def find_path_to_course():
             queue.append((parent, newpath))
 
     with modulestore.bulk_operations(usage_key.course_key):
-        if not modulestore.has_item(usage_key):
-            raise ItemNotFoundError(usage_key)
-
-        path = find_path_to_course()
-        if path is None:
-            raise NoPathToItem(usage_key)
-
-        if full_path:
-            return path
-
-        n = len(path)
-        course_id = path[0].course_key
-        # pull out the location names
-        chapter = path[1].block_id if n > 1 else None
-        section = path[2].block_id if n > 2 else None
-        vertical = path[3].block_id if n > 3 else None
-        # Figure out the position
-        position = None
-
-        # This block of code will find the position of a block within a nested tree
-        # of blocks. If a problem is on tab 2 of a sequence that's on tab 3 of a
-        # sequence, the resulting position is 3_2. However, no positional blocks
-        # (e.g. sequential) currently deal with this form of representing nested
-        # positions. This needs to happen before jumping to a block nested in more
-        # than one positional block will work.
-
-        if n > 3:
-            position_list = []
-            for path_index in range(2, n - 1):
-                category = path[path_index].block_type
-                if category == 'sequential':
-                    section_desc = modulestore.get_item(path[path_index])
-                    # this calls get_children rather than just children b/c old mongo includes private children
-                    # in children but not in get_children
-                    child_locs = get_child_locations(section_desc, request, course_id)
-                    # positions are 1-indexed, and should be strings to be consistent with
-                    # url parsing.
-                    if path[path_index + 1] in child_locs:
-                        position_list.append(str(child_locs.index(path[path_index + 1]) + 1))
-            position = "_".join(position_list)
+        with modulestore.branch_setting(branch_type, usage_key.course_key):
+            if not modulestore.has_item(usage_key):
+                raise ItemNotFoundError(usage_key)
+
+            path = find_path_to_course()
+            if path is None:
+                raise NoPathToItem(usage_key)
+
+            if full_path:
+                return path
+
+            n = len(path)
+            course_id = path[0].course_key
+            # pull out the location names
+            chapter = path[1].block_id if n > 1 else None
+            section = path[2].block_id if n > 2 else None
+            vertical = path[3].block_id if n > 3 else None
+            # Figure out the position
+            position = None
+
+            # This block of code will find the position of a block within a nested tree
+            # of blocks. If a problem is on tab 2 of a sequence that's on tab 3 of a
+            # sequence, the resulting position is 3_2. However, no positional blocks
+            # (e.g. sequential) currently deal with this form of representing nested
+            # positions. This needs to happen before jumping to a block nested in more
+            # than one positional block will work.
+
+            if n > 3:
+                position_list = []
+                for path_index in range(2, n - 1):
+                    category = path[path_index].block_type
+                    if category == 'sequential':
+                        section_desc = modulestore.get_item(path[path_index])
+                        # this calls get_children rather than just children b/c old mongo includes private children
+                        # in children but not in get_children
+                        child_locs = get_child_locations(section_desc, request, course_id)
+                        # positions are 1-indexed, and should be strings to be consistent with
+                        # url parsing.
+                        if path[path_index + 1] in child_locs:
+                            position_list.append(str(child_locs.index(path[path_index + 1]) + 1))
+                position = "_".join(position_list)
 
     return (course_id, chapter, section, vertical, position, path[-1])
 
diff --git a/xmodule/modulestore/split_mongo/caching_descriptor_system.py b/xmodule/modulestore/split_mongo/caching_descriptor_system.py
index b0965d63fecb..a83fec32bac0 100644
--- a/xmodule/modulestore/split_mongo/caching_descriptor_system.py
+++ b/xmodule/modulestore/split_mongo/caching_descriptor_system.py
@@ -13,7 +13,7 @@
 
 from xmodule.error_block import ErrorBlock
 from xmodule.errortracker import exc_info_to_str
-from xmodule.library_tools import LibraryToolsService
+from xmodule.library_tools import LegacyLibraryToolsService
 from xmodule.mako_block import MakoDescriptorSystem
 from xmodule.modulestore import BlockData
 from xmodule.modulestore.edit_info import EditInfoRuntimeMixin
@@ -78,7 +78,7 @@ def __init__(self, modulestore, course_entry, default_class, module_data, lazy,
 
         user = get_current_user()
         user_id = user.id if user else None
-        self._services['library_tools'] = LibraryToolsService(modulestore, user_id=user_id)
+        self._services['library_tools'] = LegacyLibraryToolsService(modulestore, user_id=user_id)
 
         # Cache of block field datas, keyed by the XBlock instance (since the ScopeId changes!)
         self.block_field_datas = weakref.WeakKeyDictionary()
diff --git a/xmodule/modulestore/split_mongo/split.py b/xmodule/modulestore/split_mongo/split.py
index 64e19420a152..e69a2ca0e53c 100644
--- a/xmodule/modulestore/split_mongo/split.py
+++ b/xmodule/modulestore/split_mongo/split.py
@@ -81,7 +81,7 @@
 from xmodule.course_block import CourseSummary
 from xmodule.error_block import ErrorBlock
 from xmodule.errortracker import null_error_tracker
-from xmodule.library_content_block import LibrarySummary
+from xmodule.library_content_block import LegacyLibrarySummary
 from xmodule.modulestore import (
     BlockData,
     BulkOperationsMixin,
@@ -1029,7 +1029,7 @@ def get_library_keys(self):
     @autoretry_read()
     def get_library_summaries(self, **kwargs):
         """
-        Returns a list of `LibrarySummary` objects.
+        Returns a list of `LegacyLibrarySummary` objects.
         kwargs can be valid db fields to match against active_versions
         collection e.g org='example_org'.
         """
@@ -1057,7 +1057,7 @@ def get_library_summaries(self, **kwargs):
                 display_name = library_block_fields['display_name']
 
             libraries_summaries.append(
-                LibrarySummary(library_locator, display_name)
+                LegacyLibrarySummary(library_locator, display_name)
             )
 
         return libraries_summaries
diff --git a/xmodule/modulestore/tests/test_mixed_modulestore.py b/xmodule/modulestore/tests/test_mixed_modulestore.py
index 8adbfcb911a4..0928ab253b9c 100644
--- a/xmodule/modulestore/tests/test_mixed_modulestore.py
+++ b/xmodule/modulestore/tests/test_mixed_modulestore.py
@@ -1752,7 +1752,7 @@ def test_path_to_location(self, default_ms, num_mysql, num_finds, num_sends):
             for location, expected in should_work:
                 # each iteration has different find count, pop this iter's find count
                 with check_mongo_calls(num_finds.pop(0), num_sends), self.assertNumQueries(num_mysql.pop(0)):
-                    path = path_to_location(self.store, location)
+                    path = path_to_location(self.store, location, branch_type=ModuleStoreEnum.Branch.published_only)
                     assert path == expected
 
         not_found = (
diff --git a/xmodule/partitions/tests/test_partitions.py b/xmodule/partitions/tests/test_partitions.py
index fde6afd3141b..41f26b14db52 100644
--- a/xmodule/partitions/tests/test_partitions.py
+++ b/xmodule/partitions/tests/test_partitions.py
@@ -462,21 +462,6 @@ class TestPartitionService(PartitionServiceBaseClass):
     Test getting a user's group out of a partition
     """
 
-    def test_get_user_group_id_for_partition(self):
-        # assign the first group to be returned
-        user_partition_id = self.user_partition.id
-        groups = self.user_partition.groups
-        self.user_partition.scheme.current_group = groups[0]
-
-        # get a group assigned to the user
-        group1_id = self.partition_service.get_user_group_id_for_partition(self.user, user_partition_id)
-        assert group1_id == groups[0].id
-
-        # switch to the second group and verify that it is returned for the user
-        self.user_partition.scheme.current_group = groups[1]
-        group2_id = self.partition_service.get_user_group_id_for_partition(self.user, user_partition_id)
-        assert group2_id == groups[1].id
-
     def test_caching(self):
         username = "psvc_cache_user"
         user_partition_id = self.user_partition.id
diff --git a/xmodule/poll_block.py b/xmodule/poll_block.py
index f09889f506e6..b8c65f1cdba8 100644
--- a/xmodule/poll_block.py
+++ b/xmodule/poll_block.py
@@ -6,22 +6,23 @@
 If student have answered - Question with statistics for each answers.
 """
 
-
 import html
 import json
 import logging
-from collections import OrderedDict
 from copy import deepcopy
 
-from web_fragments.fragment import Fragment
-
+from collections import OrderedDict
+from django.conf import settings
 from lxml import etree
+from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.fields import Boolean, Dict, List, Scope, String  # lint-amnesty, pylint: disable=wrong-import-order
+from xblocks_contrib.poll import PollBlock as _ExtractedPollBlock
+
 from openedx.core.djangolib.markup import Text, HTML
 from xmodule.mako_block import MakoTemplateBlockBase
 from xmodule.stringify import stringify_children
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
@@ -30,13 +31,12 @@
 )
 from xmodule.xml_block import XmlMixin
 
-
 log = logging.getLogger(__name__)
 _ = lambda text: text
 
 
 @XBlock.needs('mako')
-class PollBlock(
+class _BuiltInPollBlock(
     MakoTemplateBlockBase,
     XmlMixin,
     XModuleToXBlockMixin,
@@ -44,6 +44,9 @@ class PollBlock(
     XModuleMixin,
 ):  # pylint: disable=abstract-method
     """Poll Block"""
+
+    is_extracted = False
+
     # Name of poll to use in links to this poll
     display_name = String(
         help=_("The display name for this component."),
@@ -136,7 +139,7 @@ def student_view(self, _context):
             'configuration_json': self.dump_poll(),
         }
         fragment.add_content(self.runtime.service(self, 'mako').render_lms_template('poll.html', params))
-        add_sass_to_fragment(fragment, 'PollBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'PollBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'PollBlockDisplay')
         shim_xmodule_js(fragment, 'Poll')
         return fragment
@@ -244,3 +247,10 @@ def add_child(xml_obj, answer):  # lint-amnesty, pylint: disable=unused-argument
             add_child(xml_object, answer)
 
         return xml_object
+
+
+PollBlock = (
+    _ExtractedPollBlock if settings.USE_EXTRACTED_POLL_QUESTION_BLOCK
+    else _BuiltInPollBlock
+)
+PollBlock.__name__ = "PollBlock"
diff --git a/xmodule/seq_block.py b/xmodule/seq_block.py
index 6d1a8c59adeb..1b94f47d898c 100644
--- a/xmodule/seq_block.py
+++ b/xmodule/seq_block.py
@@ -23,7 +23,7 @@
 from xblock.fields import Boolean, Integer, List, Scope, String
 
 from edx_toggles.toggles import WaffleFlag, SettingDictToggle
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
@@ -459,7 +459,7 @@ def student_view(self, context):
                 banner_text, special_html = special_html_view
                 if special_html and not masquerading_as_specific_student:
                     fragment = Fragment(special_html)
-                    add_sass_to_fragment(fragment, 'SequenceBlockDisplay.scss')
+                    add_css_to_fragment(fragment, 'SequenceBlockDisplay.css')
                     add_webpack_js_to_fragment(fragment, 'SequenceBlockDisplay')
                     shim_xmodule_js(fragment, 'Sequence')
                     return fragment
@@ -601,7 +601,7 @@ def _student_or_public_view(self, context, prereq_met, prereq_meta_info, banner_
         self._capture_full_seq_item_metrics(children)
         self._capture_current_unit_metrics(children)
 
-        add_sass_to_fragment(fragment, 'SequenceBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'SequenceBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'SequenceBlockDisplay')
         shim_xmodule_js(fragment, 'Sequence')
         return fragment
diff --git a/xmodule/static/css-builtin-blocks/AnnotatableBlockDisplay.css b/xmodule/static/css-builtin-blocks/AnnotatableBlockDisplay.css
new file mode 100644
index 000000000000..804d84a7717a
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/AnnotatableBlockDisplay.css
@@ -0,0 +1,232 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-wrapper {
+    position: relative;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-header {
+    margin-bottom: 0.5em;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section {
+    position: relative;
+    padding: 0.5em 1em;
+    border: 1px solid var(--gray-l3);
+    border-radius: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section.shaded {
+    background-color: #ededed;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section .annotatable-section-title {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section .annotatable-section-title a {
+    font-weight: normal;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section .annotatable-section-body {
+    border-top: 1px solid var(--gray-l3);
+    margin-top: 0.5em;
+    padding-top: 0.5em;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section .annotatable-section-body:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section ul.instructions-template {
+    list-style: disc;
+    margin-left: 4em;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section ul.instructions-template b {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section ul.instructions-template i {
+    font-style: italic;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-section ul.instructions-template code {
+    display: inline;
+    white-space: pre;
+    font-family: Courier New, monospace;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-toggle {
+    position: absolute;
+    right: 0;
+    margin: 2px 1em 2px 0;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-toggle.expanded::after {
+    content: " \2191";
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-toggle.collapsed::after {
+    content: " \2193";
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span {
+    display: inline;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight {
+    background-color: rgba(255, 255, 10, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight.selected {
+    background-color: rgba(255, 255, 10, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-yellow {
+    background-color: rgba(255, 255, 10, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-yellow.selected {
+    background-color: rgba(255, 255, 10, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-red {
+    background-color: rgba(178, 19, 16, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-red.selected {
+    background-color: rgba(178, 19, 16, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-orange {
+    background-color: rgba(255, 165, 0, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-orange.selected {
+    background-color: rgba(255, 165, 0, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-green {
+    background-color: rgba(25, 255, 132, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-green.selected {
+    background-color: rgba(25, 255, 132, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-blue {
+    background-color: rgba(35, 163, 255, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-blue.selected {
+    background-color: rgba(35, 163, 255, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-purple {
+    background-color: rgba(115, 9, 178, 0.3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.highlight-purple.selected {
+    background-color: rgba(115, 9, 178, 0.9);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.hide {
+    cursor: none;
+    background-color: inherit;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span.hide .annotatable-icon {
+    display: none;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .annotatable-span .annotatable-comment {
+    display: none;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip {
+    font-size: 0.875em;
+    border: 1px solid #333;
+    border-radius: 1em;
+    background-color: rgba(0, 0, 0, 0.85);
+    color: var(--white);
+    -webkit-font-smoothing: antialiased;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip .ui-tooltip-titlebar {
+    font-size: 1em;
+    color: inherit;
+    background-color: transparent;
+    padding: calc((var(--baseline) / 4)) calc((var(--baseline) / 2));
+    border: none;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip .ui-tooltip-titlebar .ui-tooltip-title {
+    padding: calc((var(--baseline) / 4)) 0;
+    border-bottom: 2px solid #333;
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip .ui-tooltip-titlebar .ui-tooltip-icon {
+    right: 10px;
+    background: #333;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip .ui-tooltip-titlebar .ui-state-hover {
+    color: inherit;
+    border: 1px solid var(--gray-l3);
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip .ui-tooltip-content {
+    color: inherit;
+    font-size: 0.875em;
+    text-align: left;
+    font-weight: 400;
+    padding: 0 calc((var(--baseline) / 2)) calc((var(--baseline) / 2)) calc((var(--baseline) / 2));
+    background-color: transparent;
+    border-color: transparent;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip p {
+    color: inherit;
+    line-height: normal;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip-annotatable {
+    max-width: 375px;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip-annotatable .ui-tooltip-content {
+    padding: 0 calc((var(--baseline) / 2));
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip-annotatable .ui-tooltip-content .annotatable-comment {
+    display: block;
+    margin: 0 0 calc((var(--baseline) / 2)) 0;
+    max-height: 225px;
+    overflow: auto;
+    line-height: normal;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip-annotatable .ui-tooltip-content .annotatable-reply {
+    display: block;
+    border-top: 2px solid #333;
+    padding: calc((var(--baseline) / 4)) 0;
+    margin: 0;
+    text-align: center;
+}
+
+.xmodule_display.xmodule_AnnotatableBlock .ui-tooltip.qtip.ui-tooltip-annotatable::after {
+    content: '';
+    display: inline-block;
+    position: absolute;
+    bottom: -20px;
+    left: 50%;
+    height: 0;
+    width: 0;
+    margin-left: calc(-1 * (var(--baseline) / 4));
+    border: 10px solid transparent;
+    border-top-color: rgba(0, 0, 0, 0.85);
+}
diff --git a/xmodule/static/css-builtin-blocks/AnnotatableBlockEditor.css b/xmodule/static/css-builtin-blocks/AnnotatableBlockEditor.css
new file mode 100644
index 000000000000..498cbda9ffc4
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/AnnotatableBlockEditor.css
@@ -0,0 +1,5 @@
+.xmodule_edit.xmodule_AnnotatableBlock .CodeMirror {
+    background: #fff;
+    font-size: 13px;
+    color: #3c3c3c;
+}
diff --git a/xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css b/xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css
new file mode 100644
index 000000000000..320b6a379cc3
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css
@@ -0,0 +1,5 @@
+.xmodule_edit.xmodule_CustomTagBlock .CodeMirror {
+    background: #fff;
+    font-size: 13px;
+    color: #3c3c3c;
+}
diff --git a/xmodule/static/css-builtin-blocks/HtmlBlockDisplay.css b/xmodule/static/css-builtin-blocks/HtmlBlockDisplay.css
new file mode 100644
index 000000000000..0e7a20017092
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/HtmlBlockDisplay.css
@@ -0,0 +1,507 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_AboutBlock *,
+.xmodule_display.xmodule_CourseInfoBlock *,
+.xmodule_display.xmodule_HtmlBlock *,
+.xmodule_display.xmodule_StaticTabBlock * {
+    line-height: 1.4em;
+}
+
+.xmodule_display.xmodule_AboutBlock h1,
+.xmodule_display.xmodule_CourseInfoBlock h1,
+.xmodule_display.xmodule_HtmlBlock h1,
+.xmodule_display.xmodule_StaticTabBlock h1 {
+    color: var(--body-color);
+    font: normal 2em/1.4em var(--font-family-sans-serif);
+    letter-spacing: 1px;
+    margin: 0 0 1.416em;
+}
+
+.xmodule_display.xmodule_AboutBlock h2,
+.xmodule_display.xmodule_CourseInfoBlock h2,
+.xmodule_display.xmodule_HtmlBlock h2,
+.xmodule_display.xmodule_StaticTabBlock h2 {
+    color: #646464;
+    font: normal 1.2em/1.2em var(--font-family-sans-serif);
+    letter-spacing: 1px;
+    margin-bottom: calc((var(--baseline) * 0.75));
+    -webkit-font-smoothing: antialiased;
+}
+
+.xmodule_display.xmodule_AboutBlock h3,
+.xmodule_display.xmodule_AboutBlock h4,
+.xmodule_display.xmodule_AboutBlock h5,
+.xmodule_display.xmodule_AboutBlock h6,
+.xmodule_display.xmodule_CourseInfoBlock h3,
+.xmodule_display.xmodule_CourseInfoBlock h4,
+.xmodule_display.xmodule_CourseInfoBlock h5,
+.xmodule_display.xmodule_CourseInfoBlock h6,
+.xmodule_display.xmodule_HtmlBlock h3,
+.xmodule_display.xmodule_HtmlBlock h4,
+.xmodule_display.xmodule_HtmlBlock h5,
+.xmodule_display.xmodule_HtmlBlock h6,
+.xmodule_display.xmodule_StaticTabBlock h3,
+.xmodule_display.xmodule_StaticTabBlock h4,
+.xmodule_display.xmodule_StaticTabBlock h5,
+.xmodule_display.xmodule_StaticTabBlock h6 {
+    margin: 0 0 calc((var(--baseline) / 2));
+    font-weight: 600;
+}
+
+.xmodule_display.xmodule_AboutBlock h3,
+.xmodule_display.xmodule_CourseInfoBlock h3,
+.xmodule_display.xmodule_HtmlBlock h3,
+.xmodule_display.xmodule_StaticTabBlock h3 {
+    font-size: 1.2em;
+}
+
+.xmodule_display.xmodule_AboutBlock h4,
+.xmodule_display.xmodule_CourseInfoBlock h4,
+.xmodule_display.xmodule_HtmlBlock h4,
+.xmodule_display.xmodule_StaticTabBlock h4 {
+    font-size: 1em;
+}
+
+.xmodule_display.xmodule_AboutBlock h5,
+.xmodule_display.xmodule_CourseInfoBlock h5,
+.xmodule_display.xmodule_HtmlBlock h5,
+.xmodule_display.xmodule_StaticTabBlock h5 {
+    font-size: 0.83em;
+}
+
+.xmodule_display.xmodule_AboutBlock h6,
+.xmodule_display.xmodule_CourseInfoBlock h6,
+.xmodule_display.xmodule_HtmlBlock h6,
+.xmodule_display.xmodule_StaticTabBlock h6 {
+    font-size: 0.75em;
+}
+
+.xmodule_display.xmodule_AboutBlock p,
+.xmodule_display.xmodule_CourseInfoBlock p,
+.xmodule_display.xmodule_HtmlBlock p,
+.xmodule_display.xmodule_StaticTabBlock p {
+    margin-bottom: 1.416em;
+    font-size: 1em;
+    line-height: 1.6em !important;
+    color: var(--body-color);
+}
+
+.xmodule_display.xmodule_AboutBlock em,
+.xmodule_display.xmodule_AboutBlock i,
+.xmodule_display.xmodule_CourseInfoBlock em,
+.xmodule_display.xmodule_CourseInfoBlock i,
+.xmodule_display.xmodule_HtmlBlock em,
+.xmodule_display.xmodule_HtmlBlock i,
+.xmodule_display.xmodule_StaticTabBlock em,
+.xmodule_display.xmodule_StaticTabBlock i {
+    font-style: italic;
+}
+
+.xmodule_display.xmodule_AboutBlock em span,
+.xmodule_display.xmodule_AboutBlock i span,
+.xmodule_display.xmodule_CourseInfoBlock em span,
+.xmodule_display.xmodule_CourseInfoBlock i span,
+.xmodule_display.xmodule_HtmlBlock em span,
+.xmodule_display.xmodule_HtmlBlock i span,
+.xmodule_display.xmodule_StaticTabBlock em span,
+.xmodule_display.xmodule_StaticTabBlock i span {
+    font-style: italic;
+}
+
+.xmodule_display.xmodule_AboutBlock strong,
+.xmodule_display.xmodule_AboutBlock b,
+.xmodule_display.xmodule_CourseInfoBlock strong,
+.xmodule_display.xmodule_CourseInfoBlock b,
+.xmodule_display.xmodule_HtmlBlock strong,
+.xmodule_display.xmodule_HtmlBlock b,
+.xmodule_display.xmodule_StaticTabBlock strong,
+.xmodule_display.xmodule_StaticTabBlock b {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AboutBlock strong span,
+.xmodule_display.xmodule_AboutBlock b span,
+.xmodule_display.xmodule_CourseInfoBlock strong span,
+.xmodule_display.xmodule_CourseInfoBlock b span,
+.xmodule_display.xmodule_HtmlBlock strong span,
+.xmodule_display.xmodule_HtmlBlock b span,
+.xmodule_display.xmodule_StaticTabBlock strong span,
+.xmodule_display.xmodule_StaticTabBlock b span {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AboutBlock p+p,
+.xmodule_display.xmodule_AboutBlock ul+p,
+.xmodule_display.xmodule_AboutBlock ol+p,
+.xmodule_display.xmodule_CourseInfoBlock p+p,
+.xmodule_display.xmodule_CourseInfoBlock ul+p,
+.xmodule_display.xmodule_CourseInfoBlock ol+p,
+.xmodule_display.xmodule_HtmlBlock p+p,
+.xmodule_display.xmodule_HtmlBlock ul+p,
+.xmodule_display.xmodule_HtmlBlock ol+p,
+.xmodule_display.xmodule_StaticTabBlock p+p,
+.xmodule_display.xmodule_StaticTabBlock ul+p,
+.xmodule_display.xmodule_StaticTabBlock ol+p {
+    margin-top: var(--baseline);
+}
+
+.xmodule_display.xmodule_AboutBlock blockquote,
+.xmodule_display.xmodule_CourseInfoBlock blockquote,
+.xmodule_display.xmodule_HtmlBlock blockquote,
+.xmodule_display.xmodule_StaticTabBlock blockquote {
+    margin: 1em calc((var(--baseline) * 2));
+}
+
+.xmodule_display.xmodule_AboutBlock ol,
+.xmodule_display.xmodule_AboutBlock ul,
+.xmodule_display.xmodule_CourseInfoBlock ol,
+.xmodule_display.xmodule_CourseInfoBlock ul,
+.xmodule_display.xmodule_HtmlBlock ol,
+.xmodule_display.xmodule_HtmlBlock ul,
+.xmodule_display.xmodule_StaticTabBlock ol,
+.xmodule_display.xmodule_StaticTabBlock ul {
+    padding: 0 0 0 1em;
+    margin: 1em 0;
+    color: var(--body-color);
+}
+
+.xmodule_display.xmodule_AboutBlock ol li,
+.xmodule_display.xmodule_AboutBlock ul li,
+.xmodule_display.xmodule_CourseInfoBlock ol li,
+.xmodule_display.xmodule_CourseInfoBlock ul li,
+.xmodule_display.xmodule_HtmlBlock ol li,
+.xmodule_display.xmodule_HtmlBlock ul li,
+.xmodule_display.xmodule_StaticTabBlock ol li,
+.xmodule_display.xmodule_StaticTabBlock ul li {
+    margin-bottom: 0.708em;
+}
+
+.xmodule_display.xmodule_AboutBlock ol,
+.xmodule_display.xmodule_CourseInfoBlock ol,
+.xmodule_display.xmodule_HtmlBlock ol,
+.xmodule_display.xmodule_StaticTabBlock ol {
+    list-style: decimal outside none;
+}
+
+.xmodule_display.xmodule_AboutBlock ul,
+.xmodule_display.xmodule_CourseInfoBlock ul,
+.xmodule_display.xmodule_HtmlBlock ul,
+.xmodule_display.xmodule_StaticTabBlock ul {
+    list-style: disc outside none;
+}
+
+.xmodule_display.xmodule_AboutBlock a:link,
+.xmodule_display.xmodule_AboutBlock a:visited,
+.xmodule_display.xmodule_AboutBlock a:hover,
+.xmodule_display.xmodule_AboutBlock a:active,
+.xmodule_display.xmodule_AboutBlock a:focus,
+.xmodule_display.xmodule_CourseInfoBlock a:link,
+.xmodule_display.xmodule_CourseInfoBlock a:visited,
+.xmodule_display.xmodule_CourseInfoBlock a:hover,
+.xmodule_display.xmodule_CourseInfoBlock a:active,
+.xmodule_display.xmodule_CourseInfoBlock a:focus,
+.xmodule_display.xmodule_HtmlBlock a:link,
+.xmodule_display.xmodule_HtmlBlock a:visited,
+.xmodule_display.xmodule_HtmlBlock a:hover,
+.xmodule_display.xmodule_HtmlBlock a:active,
+.xmodule_display.xmodule_HtmlBlock a:focus,
+.xmodule_display.xmodule_StaticTabBlock a:link,
+.xmodule_display.xmodule_StaticTabBlock a:visited,
+.xmodule_display.xmodule_StaticTabBlock a:hover,
+.xmodule_display.xmodule_StaticTabBlock a:active,
+.xmodule_display.xmodule_StaticTabBlock a:focus {
+    color: var(--blue);
+}
+
+.xmodule_display.xmodule_AboutBlock img,
+.xmodule_display.xmodule_CourseInfoBlock img,
+.xmodule_display.xmodule_HtmlBlock img,
+.xmodule_display.xmodule_StaticTabBlock img {
+    max-width: 100%;
+    height: auto;
+}
+
+.xmodule_display.xmodule_AboutBlock pre,
+.xmodule_display.xmodule_CourseInfoBlock pre,
+.xmodule_display.xmodule_HtmlBlock pre,
+.xmodule_display.xmodule_StaticTabBlock pre {
+    margin: 1em 0;
+    color: var(--body-color);
+    font-family: monospace, serif;
+    font-size: 1em;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+.xmodule_display.xmodule_AboutBlock code,
+.xmodule_display.xmodule_CourseInfoBlock code,
+.xmodule_display.xmodule_HtmlBlock code,
+.xmodule_display.xmodule_StaticTabBlock code {
+    color: var(--body-color);
+    font-family: monospace, serif;
+    background: none;
+    padding: 0;
+}
+
+.xmodule_display.xmodule_AboutBlock table,
+.xmodule_display.xmodule_CourseInfoBlock table,
+.xmodule_display.xmodule_HtmlBlock table,
+.xmodule_display.xmodule_StaticTabBlock table {
+    width: 100%;
+    margin: var(--baseline) 0;
+    border-collapse: collapse;
+    font-size: 16px;
+}
+
+.xmodule_display.xmodule_AboutBlock table td,
+.xmodule_display.xmodule_AboutBlock table th,
+.xmodule_display.xmodule_CourseInfoBlock table td,
+.xmodule_display.xmodule_CourseInfoBlock table th,
+.xmodule_display.xmodule_HtmlBlock table td,
+.xmodule_display.xmodule_HtmlBlock table th,
+.xmodule_display.xmodule_StaticTabBlock table td,
+.xmodule_display.xmodule_StaticTabBlock table th {
+    margin: var(--baseline) 0;
+    padding: calc((var(--baseline) / 2));
+    border: 1px solid var(--gray-l3);
+    font-size: 14px;
+}
+
+.xmodule_display.xmodule_AboutBlock table td.cont-justified-left,
+.xmodule_display.xmodule_AboutBlock table th.cont-justified-left,
+.xmodule_display.xmodule_CourseInfoBlock table td.cont-justified-left,
+.xmodule_display.xmodule_CourseInfoBlock table th.cont-justified-left,
+.xmodule_display.xmodule_HtmlBlock table td.cont-justified-left,
+.xmodule_display.xmodule_HtmlBlock table th.cont-justified-left,
+.xmodule_display.xmodule_StaticTabBlock table td.cont-justified-left,
+.xmodule_display.xmodule_StaticTabBlock table th.cont-justified-left {
+    text-align: left !important;
+}
+
+.xmodule_display.xmodule_AboutBlock table td.cont-justified-right,
+.xmodule_display.xmodule_AboutBlock table th.cont-justified-right,
+.xmodule_display.xmodule_CourseInfoBlock table td.cont-justified-right,
+.xmodule_display.xmodule_CourseInfoBlock table th.cont-justified-right,
+.xmodule_display.xmodule_HtmlBlock table td.cont-justified-right,
+.xmodule_display.xmodule_HtmlBlock table th.cont-justified-right,
+.xmodule_display.xmodule_StaticTabBlock table td.cont-justified-right,
+.xmodule_display.xmodule_StaticTabBlock table th.cont-justified-right {
+    text-align: right !important;
+}
+
+.xmodule_display.xmodule_AboutBlock table td.cont-justified-center,
+.xmodule_display.xmodule_AboutBlock table th.cont-justified-center,
+.xmodule_display.xmodule_CourseInfoBlock table td.cont-justified-center,
+.xmodule_display.xmodule_CourseInfoBlock table th.cont-justified-center,
+.xmodule_display.xmodule_HtmlBlock table td.cont-justified-center,
+.xmodule_display.xmodule_HtmlBlock table th.cont-justified-center,
+.xmodule_display.xmodule_StaticTabBlock table td.cont-justified-center,
+.xmodule_display.xmodule_StaticTabBlock table th.cont-justified-center {
+    text-align: center !important;
+}
+
+.xmodule_display.xmodule_AboutBlock th,
+.xmodule_display.xmodule_CourseInfoBlock th,
+.xmodule_display.xmodule_HtmlBlock th,
+.xmodule_display.xmodule_StaticTabBlock th {
+    background: #eee;
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .modal-ui-icon,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .modal-ui-icon,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .modal-ui-icon,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .modal-ui-icon {
+    position: absolute;
+    display: block;
+    padding: calc((var(--baseline) / 4)) 7px;
+    border-radius: 5px;
+    opacity: 0.9;
+    background: var(--white);
+    color: var(--black);
+    border: 2px solid var(--black);
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .modal-ui-icon .label,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .modal-ui-icon .label,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .modal-ui-icon .label,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .modal-ui-icon .label {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .modal-ui-icon i,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .modal-ui-icon i,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .modal-ui-icon i,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .modal-ui-icon i {
+    font-style: normal;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-link,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-link,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-link,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-link {
+    position: relative;
+    display: block;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-link .action-fullscreen,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-link .action-fullscreen,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-link .action-fullscreen,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-link .action-fullscreen {
+    display: none;
+    top: 10px;
+    left: 10px;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-link:hover .action-fullscreen,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-link:hover .action-fullscreen,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-link:hover .action-fullscreen,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-link:hover .action-fullscreen {
+    display: block;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    display: none;
+    height: 100%;
+    width: 100%;
+    background-color: rgba(0, 0, 0, 0.7);
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content {
+    position: relative;
+    top: 2.5%;
+    display: block;
+    height: 95%;
+    width: 95%;
+    margin: auto;
+    overflow: hidden;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-wrapper,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-wrapper,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-wrapper,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-wrapper {
+    position: relative;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-wrapper img,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-wrapper img,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-wrapper img,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-wrapper img {
+    position: relative;
+    display: block;
+    max-width: 100%;
+    max-height: 100%;
+    margin: auto;
+    cursor: default;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .action-close,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .action-close,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .action-close,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .action-close {
+    top: 10px;
+    right: 10px;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-controls,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-controls,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-controls,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-controls {
+    position: absolute;
+    right: 10px;
+    bottom: 10px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control {
+    position: relative;
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon {
+    position: relative;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-in,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-in,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-in,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-in {
+    margin-right: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-out,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-out,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-out,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.action-zoom-out {
+    margin-left: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.is-disabled,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.is-disabled,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.is-disabled,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal .image-content .image-controls .image-control .modal-ui-icon.is-disabled {
+    opacity: 0.5;
+    cursor: default;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen {
+    display: block;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper {
+    top: 0 !important;
+    left: 0 !important;
+    width: 100% !important;
+    height: 100% !important;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper img,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper img,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper img,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal.image-is-fit-to-screen .image-content .image-wrapper img {
+    top: 0 !important;
+    left: 0 !important;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal.image-is-zoomed,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal.image-is-zoomed,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal.image-is-zoomed,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal.image-is-zoomed {
+    display: block;
+}
+
+.xmodule_display.xmodule_AboutBlock .wrapper-modal-image .image-modal.image-is-zoomed .image-content .image-wrapper img,
+.xmodule_display.xmodule_CourseInfoBlock .wrapper-modal-image .image-modal.image-is-zoomed .image-content .image-wrapper img,
+.xmodule_display.xmodule_HtmlBlock .wrapper-modal-image .image-modal.image-is-zoomed .image-content .image-wrapper img,
+.xmodule_display.xmodule_StaticTabBlock .wrapper-modal-image .image-modal.image-is-zoomed .image-content .image-wrapper img {
+    max-width: none;
+    max-height: none;
+    margin: 0;
+    cursor: move;
+}
diff --git a/xmodule/static/css-builtin-blocks/HtmlBlockEditor.css b/xmodule/static/css-builtin-blocks/HtmlBlockEditor.css
new file mode 100644
index 000000000000..c7ef3b7ec147
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/HtmlBlockEditor.css
@@ -0,0 +1,201 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+
+.xmodule_edit.xmodule_AboutBlock .ui-col-wide,
+.xmodule_edit.xmodule_CourseInfoBlock .ui-col-wide,
+.xmodule_edit.xmodule_HtmlBlock .ui-col-wide,
+.xmodule_edit.xmodule_StaticTabBlock .ui-col-wide {
+    width: 74.46809%;
+    margin-right: 2.12766%;
+    float: left;
+}
+
+.xmodule_edit.xmodule_AboutBlock .ui-col-narrow,
+.xmodule_edit.xmodule_CourseInfoBlock .ui-col-narrow,
+.xmodule_edit.xmodule_HtmlBlock .ui-col-narrow,
+.xmodule_edit.xmodule_StaticTabBlock .ui-col-narrow {
+    width: 23.40426%;
+    float: left;
+}
+
+.xmodule_edit.xmodule_AboutBlock .ui-loading,
+.xmodule_edit.xmodule_CourseInfoBlock .ui-loading,
+.xmodule_edit.xmodule_HtmlBlock .ui-loading,
+.xmodule_edit.xmodule_StaticTabBlock .ui-loading {
+    box-shadow: inset 0 1px 2px 1px rgba(0, 0, 0, 0.2);
+    padding: 15px 20px;
+}
+
+.xmodule_edit.xmodule_AboutBlock .ui-loading,
+.xmodule_edit.xmodule_CourseInfoBlock .ui-loading,
+.xmodule_edit.xmodule_HtmlBlock .ui-loading,
+.xmodule_edit.xmodule_StaticTabBlock .ui-loading {
+    animation: fadeIn 0.25s linear 1;
+    opacity: 0.6;
+    background-color: #fff;
+    padding: 30px 20px;
+    text-align: center;
+}
+
+.xmodule_edit.xmodule_AboutBlock .ui-loading .spin,
+.xmodule_edit.xmodule_CourseInfoBlock .ui-loading .spin,
+.xmodule_edit.xmodule_HtmlBlock .ui-loading .spin,
+.xmodule_edit.xmodule_StaticTabBlock .ui-loading .spin {
+    display: inline-block;
+}
+
+.xmodule_edit.xmodule_AboutBlock .ui-loading .copy,
+.xmodule_edit.xmodule_CourseInfoBlock .ui-loading .copy,
+.xmodule_edit.xmodule_HtmlBlock .ui-loading .copy,
+.xmodule_edit.xmodule_StaticTabBlock .ui-loading .copy {
+    padding-left: 5px;
+}
+
+.xmodule_edit.xmodule_AboutBlock .is-hidden,
+.xmodule_edit.xmodule_CourseInfoBlock .is-hidden,
+.xmodule_edit.xmodule_HtmlBlock .is-hidden,
+.xmodule_edit.xmodule_StaticTabBlock .is-hidden {
+    display: none;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor,
+.xmodule_edit.xmodule_CourseInfoBlock .editor,
+.xmodule_edit.xmodule_HtmlBlock .editor,
+.xmodule_edit.xmodule_StaticTabBlock .editor {
+    position: relative;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .row,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .row,
+.xmodule_edit.xmodule_HtmlBlock .editor .row,
+.xmodule_edit.xmodule_StaticTabBlock .editor .row {
+    position: relative;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-bar,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-bar {
+    background-color: #d4dee8;
+    background-image: -webkit-linear-gradient(top, #d4dee8, #c9d5e2);
+    background-image: linear-gradient(to bottom, #d4dee8, #c9d5e2);
+    position: relative;
+    padding: calc(var(--baseline) / 4);
+    border-bottom-color: #a5aaaf;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-bar:after,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar:after,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar:after,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-bar:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar button,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar button,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-bar button {
+    display: inline-block;
+    float: left;
+    padding: 3px calc(var(--baseline) / 2) 5px;
+    margin-left: 7px;
+    border: 0;
+    border-radius: 2px;
+    background: transparent;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button .icon,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar button .icon,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar button .icon,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-bar button .icon {
+    height: 21px;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button:hover,
+.xmodule_edit.xmodule_AboutBlock .editor .editor-bar button:focus,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar button:hover,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-bar button:focus,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar button:hover,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-bar button:focus,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-bar button:hover,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-bar button:focus {
+    background: rgba(255, 255, 255, 0.5);
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-tabs,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-tabs,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-tabs,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-tabs {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    text-align: left;
+    direction: ltr;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-tabs li,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-tabs li,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-tabs li,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-tabs li {
+    float: left;
+    margin-right: calc(var(--baseline) / 4);
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-tabs li:last-child,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-tabs li:last-child,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-tabs li:last-child,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-tabs li:last-child {
+    margin-right: 0;
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-tabs .tab,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-tabs .tab,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-tabs .tab,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-tabs .tab {
+    display: block;
+    height: 24px;
+    padding: 7px 20px 3px;
+    border: 1px solid #a5aaaf;
+    border-radius: 3px 3px 0 0;
+    background-color: var(--transparent);
+    background-image: -webkit-linear-gradient(top, var(--transparent) 87%, rgba(0, 0, 0, 0.06));
+    background-image: linear-gradient(to bottom, var(--transparent) 87%, rgba(0, 0, 0, 0.06));
+    background-color: #e5ecf3;
+    font-size: 13px;
+    color: #3c3c3c;
+    box-shadow: 1px -1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.xmodule_edit.xmodule_AboutBlock .editor .editor-tabs .tab.current,
+.xmodule_edit.xmodule_CourseInfoBlock .editor .editor-tabs .tab.current,
+.xmodule_edit.xmodule_HtmlBlock .editor .editor-tabs .tab.current,
+.xmodule_edit.xmodule_StaticTabBlock .editor .editor-tabs .tab.current {
+    background: var(--white);
+    border-bottom-color: var(--white);
+}
+
+.xmodule_edit.xmodule_AboutBlock .html-editor:after,
+.xmodule_edit.xmodule_CourseInfoBlock .html-editor:after,
+.xmodule_edit.xmodule_HtmlBlock .html-editor:after,
+.xmodule_edit.xmodule_StaticTabBlock .html-editor:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_edit.xmodule_AboutBlock .html-editor .CodeMirror,
+.xmodule_edit.xmodule_CourseInfoBlock .html-editor .CodeMirror,
+.xmodule_edit.xmodule_HtmlBlock .html-editor .CodeMirror,
+.xmodule_edit.xmodule_StaticTabBlock .html-editor .CodeMirror {
+    box-sizing: border-box;
+    height: 435px;
+}
+
+.xmodule_edit.xmodule_AboutBlock .html-editor .is-inactive,
+.xmodule_edit.xmodule_CourseInfoBlock .html-editor .is-inactive,
+.xmodule_edit.xmodule_HtmlBlock .html-editor .is-inactive,
+.xmodule_edit.xmodule_StaticTabBlock .html-editor .is-inactive {
+    display: none;
+}
diff --git a/xmodule/static/css-builtin-blocks/LTIBlockDisplay.css b/xmodule/static/css-builtin-blocks/LTIBlockDisplay.css
new file mode 100644
index 000000000000..5ca27a4c4a0a
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/LTIBlockDisplay.css
@@ -0,0 +1,56 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+
+.xmodule_display.xmodule_LTIBlock h2.problem-header {
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_LTIBlock div.problem-progress {
+    display: inline-block;
+    padding-left: calc((var(--baseline) / 4));
+    color: #666;
+    font-weight: 100;
+    font-size: 1em;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti {
+    margin: 0 auto;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti .wrapper-lti-link {
+    font-size: 14px;
+    background-color: var(--sidebar-color);
+    padding: var(--baseline);
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti .wrapper-lti-link .lti-link {
+    margin-bottom: 0;
+    text-align: right;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti .wrapper-lti-link .lti-link .link_lti_new_window {
+    font-size: 13px;
+    line-height: 20.72px;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti form.ltiLaunchForm {
+    display: none;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti iframe.ltiLaunchFrame {
+    width: 100%;
+    height: 800px;
+    display: block;
+    border: 0px;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti h4.problem-feedback-label {
+    font-weight: 100;
+    font-size: 1em;
+    font-family: "Source Sans", "Open Sans", Verdana, Geneva, sans-serif, sans-serif;
+}
+
+.xmodule_display.xmodule_LTIBlock div.lti div.problem-feedback {
+    margin-top: calc((var(--baseline) / 4));
+    margin-bottom: calc((var(--baseline) / 4));
+}
diff --git a/xmodule/static/css-builtin-blocks/PollBlockDisplay.css b/xmodule/static/css-builtin-blocks/PollBlockDisplay.css
new file mode 100644
index 000000000000..cf9058281dd4
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/PollBlockDisplay.css
@@ -0,0 +1,217 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+@media print {
+    .xmodule_display.xmodule_PollBlock div.poll_question {
+        display: block;
+        width: auto;
+        padding: 0;
+    }
+
+    .xmodule_display.xmodule_PollBlock div.poll_question canvas,
+    .xmodule_display.xmodule_PollBlock div.poll_question img {
+        page-break-inside: avoid;
+    }
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .inline {
+    display: inline;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question h3 {
+    margin-top: 0;
+    margin-bottom: calc((var(--baseline) * 0.75));
+    color: #fe57a1;
+    font-size: 1.9em;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question h3.problem-header div.staff {
+    margin-top: calc((var(--baseline) * 1.5));
+    font-size: 80%;
+}
+
+@media print {
+    .xmodule_display.xmodule_PollBlock div.poll_question h3 {
+        display: block;
+        width: auto;
+        border-right: 0;
+    }
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question p {
+    text-align: justify;
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer {
+    margin-bottom: var(--baseline);
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer.short {
+    clear: both;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question {
+    height: auto;
+    clear: both;
+    min-height: 30px;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question.short {
+    clear: none;
+    width: 30%;
+    display: inline;
+    float: left;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question .button {
+    -webkit-appearance: none;
+    -webkit-background-clip: padding-box;
+    -webkit-border-image: none;
+    -webkit-box-align: center;
+    -webkit-box-shadow: white 0px 1px 0px 0px inset;
+    -webkit-font-smoothing: antialiased;
+    -webkit-rtl-ordering: logical;
+    -webkit-user-select: text;
+    -webkit-writing-mode: horizontal-tb;
+    background-clip: padding-box;
+    background-color: #eeeeee;
+    background-image: -webkit-linear-gradient(top, #eeeeee, #d2d2d2);
+    border-bottom-color: #cacaca;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    border-left-color: #cacaca;
+    border-left-style: solid;
+    border-left-width: 1px;
+    border-right-color: #cacaca;
+    border-right-style: solid;
+    border-right-width: 1px;
+    border-top-color: #cacaca;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    border-top-style: solid;
+    border-top-width: 1px;
+    box-shadow: white 0px 1px 0px 0px inset;
+    box-sizing: border-box;
+    color: #333333;
+    /* display: inline-block; */
+    display: inline;
+    float: left;
+    font-family: 'Open Sans', Verdana, Geneva, sans-serif;
+    font-size: 13px;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: bold;
+    letter-spacing: normal;
+    line-height: 25.59375px;
+    margin-bottom: calc((var(--baseline) * 0.75));
+    margin: 0;
+    padding: 0px;
+    text-align: center;
+    text-decoration: none;
+    text-indent: 0px;
+    text-shadow: #f8f8f8 0px 1px 0px;
+    text-transform: none;
+    vertical-align: top;
+    white-space: pre-line;
+    width: 25px;
+    height: 25px;
+    word-spacing: 0px;
+    writing-mode: lr-tb;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question .button.answered {
+    -webkit-box-shadow: #61b8e1 0px 1px 0px 0px inset;
+    background-color: #1d9dd9;
+    background-image: -webkit-linear-gradient(top, #1d9dd9, #0e7cb0);
+    border-bottom-color: #0d72a2;
+    border-left-color: #0d72a2;
+    border-right-color: #0d72a2;
+    border-top-color: #0d72a2;
+    box-shadow: #61b8e1 0px 1px 0px 0px inset;
+    color: white;
+    text-shadow: #076794 0px 1px 0px;
+    background-image: none;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question .text {
+    display: inline;
+    float: left;
+    width: 80%;
+    text-align: left;
+    min-height: 30px;
+    margin-left: var(--baseline);
+    height: auto;
+    margin-bottom: var(--baseline);
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question .text.short {
+    width: 100px;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats {
+    min-height: 40px;
+    margin-top: var(--baseline);
+    clear: both;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats.short {
+    margin-top: 0;
+    clear: none;
+    display: inline;
+    float: right;
+    width: 70%;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats .bar {
+    width: 75%;
+    height: 20px;
+    border: 1px solid black;
+    display: inline;
+    float: left;
+    margin-right: calc((var(--baseline) / 2));
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats .bar.short {
+    width: 65%;
+    height: 20px;
+    margin-top: 3px;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats .bar .percent {
+    background-color: gray;
+    width: 0;
+    height: 20px;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats .number {
+    width: 80px;
+    display: inline;
+    float: right;
+    height: 28px;
+    text-align: right;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats .number.short {
+    width: 120px;
+    height: auto;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .poll_answer.answered {
+    -webkit-box-shadow: #61b8e1 0 1px 0 0 inset;
+    background-color: #1d9dd9;
+    background-image: -webkit-linear-gradient(top, #1d9dd9, #0e7cb0);
+    border-bottom-color: #0d72a2;
+    border-left-color: #0d72a2;
+    border-right-color: #0d72a2;
+    border-top-color: #0d72a2;
+    box-shadow: #61b8e1 0 1px 0 0 inset;
+    color: white;
+    text-shadow: #076794 0 1px 0;
+}
+
+.xmodule_display.xmodule_PollBlock div.poll_question .button.reset-button {
+    clear: both;
+    float: right;
+}
diff --git a/xmodule/static/css-builtin-blocks/ProblemBlockDisplay.css b/xmodule/static/css-builtin-blocks/ProblemBlockDisplay.css
new file mode 100644
index 000000000000..3cd20ab7608e
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/ProblemBlockDisplay.css
@@ -0,0 +1,1738 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.incorrect .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.incorrect .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.partially-correct .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.partially-correct .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.correct .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.correct .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .partially-correct .status-icon::after {
+    font-family: FontAwesome;
+    -webkit-font-smoothing: antialiased;
+    display: inline-block;
+    speak: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock h2 {
+    margin-top: 0;
+    margin-bottom: calc((var(--baseline) * 0.75));
+}
+
+.xmodule_display.xmodule_ProblemBlock h2.problem-header {
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock h2.problem-header section.staff {
+    margin-top: calc((var(--baseline) * 1.5));
+    font-size: 80%;
+}
+
+@media print {
+    .xmodule_display.xmodule_ProblemBlock h2 {
+        display: block;
+        width: auto;
+        border-right: 0;
+    }
+}
+
+.xmodule_display.xmodule_ProblemBlock .explanation-title {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-incorrect,
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-partially-correct,
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-correct {
+    margin-top: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-incorrect .icon,
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-partially-correct .icon,
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-correct .icon {
+    margin-right: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-incorrect .icon {
+    color: var(--incorrect);
+}
+
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-partially-correct .icon,
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-correct .icon {
+    color: var(--correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-text {
+    color: #646464;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem-hint {
+    margin-bottom: 20px;
+    width: 100%;
+}
+
+.xmodule_display.xmodule_ProblemBlock .hint-label {
+    display: inline-block;
+    padding-right: 0.5em;
+}
+
+.xmodule_display.xmodule_ProblemBlock .hint-text {
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock .feedback-hint-multi .hint-text {
+    display: block;
+}
+
+.xmodule_display.xmodule_ProblemBlock iframe[seamless] {
+    overflow: hidden;
+    padding: 0;
+    border: 0 none transparent;
+    background-color: transparent;
+}
+
+.xmodule_display.xmodule_ProblemBlock .inline-error {
+    color: var(--error-color-dark);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem-progress {
+    display: inline-block;
+    color: var(--gray-d1);
+    font-size: 0.875em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem {
+    padding-top: var(--baseline);
+}
+
+@media print {
+    .xmodule_display.xmodule_ProblemBlock div.problem {
+        display: block;
+        padding: 0;
+        width: auto;
+    }
+
+    .xmodule_display.xmodule_ProblemBlock div.problem canvas,
+    .xmodule_display.xmodule_ProblemBlock div.problem img {
+        page-break-inside: avoid;
+    }
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem input.math {
+    direction: ltr;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .inline {
+    display: inline;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .inline+p {
+    margin-top: var(--baseline);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .question-description {
+    color: var(--gray-d1);
+    font-size: var(--small-font-size);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem form>label,
+.xmodule_display.xmodule_ProblemBlock div.problem .problem-group-label {
+    display: block;
+    margin-bottom: var(--baseline);
+    font: inherit;
+    color: inherit;
+    -webkit-font-smoothing: initial;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .problem-group-label+.question-description {
+    margin-top: calc(-1 * var(--baseline));
+}
+
+.xmodule_display.xmodule_ProblemBlock .wrapper-problem-response+.wrapper-problem-response,
+.xmodule_display.xmodule_ProblemBlock .wrapper-problem-response+p {
+    margin-top: calc((var(--baseline) * 1.5));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup {
+    min-width: 100px;
+    width: auto !important;
+    width: 100px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup:after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup label,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup label {
+    box-sizing: border-box;
+    display: inline-block;
+    clear: both;
+    margin-bottom: calc((var(--baseline) / 2));
+    border: 2px solid var(--gray-l4);
+    border-radius: 3px;
+    padding: calc((var(--baseline) / 2));
+    width: 100%;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup label::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup label::after {
+    margin-left: calc((var(--baseline) * 0.75));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup .indicator-container,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .indicator-container {
+    min-height: 1px;
+    width: 25px;
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup fieldset,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup fieldset {
+    box-sizing: border-box;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input[type="radio"],
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input[type="radio"],
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input[type="checkbox"],
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input[type="checkbox"] {
+    margin: calc((var(--baseline) / 4));
+    margin-right: calc((var(--baseline) / 2));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label {
+    border: 2px solid var(--blue);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_correct {
+    border: 2px solid var(--correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_correct .status-icon::after {
+    color: var(--correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_partially-correct,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_partially-correct {
+    border: 2px solid var(--partially-correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_partially-correct .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_partially-correct .status-icon::after {
+    color: var(--partially-correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_incorrect,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_incorrect {
+    border: 2px solid var(--incorrect);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_incorrect .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_incorrect .status-icon::after {
+    color: var(--incorrect);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_submitted,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_submitted {
+    border: 2px solid var(--submitted);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup .field {
+    position: relative;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup label {
+    padding: calc((var(--baseline) / 2));
+    padding-left: calc((var(--baseline) * 2.3));
+    position: relative;
+    font-size: var(--base-font-size);
+    line-height: normal;
+    cursor: pointer;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input[type="radio"],
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input[type="checkbox"] {
+    left: 0.5625em;
+    position: absolute;
+    top: 0.35em;
+    width: calc(var(--baseline) * 1.1);
+    height: calc(var(--baseline) * 1.1);
+    z-index: 1;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup legend {
+    margin-bottom: var(--baseline);
+    max-width: 100%;
+    white-space: normal;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup legend+.question-description {
+    margin-top: calc(-1 * var(--baseline));
+    max-width: 100%;
+    white-space: normal;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container {
+    margin-left: calc((var(--baseline) * 0.75));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status {
+    width: var(--baseline);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.correct .status-icon::after {
+    color: var(--correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.partially-correct .status-icon::after {
+    color: var(--partially-correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.incorrect .status-icon::after {
+    color: var(--incorrect);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.submitted .status-icon,
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.unsubmitted .status-icon,
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.unanswered .status-icon {
+    content: '';
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem ol.enumerate li::before {
+    display: block;
+    visibility: hidden;
+    height: 0;
+    content: " ";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .solution-span>span {
+    margin: var(--baseline) 0;
+    display: block;
+    position: relative;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .solution-span>span:empty {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .targeted-feedback-span>span {
+    display: block;
+    position: relative;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .targeted-feedback-span>span:empty {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div p.answer {
+    margin-top: -2px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div p span.clarification i {
+    font-style: normal;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div p span.clarification i:hover {
+    color: var(--blue);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.correct input,
+.xmodule_display.xmodule_ProblemBlock div.problem div.ui-icon-check input {
+    border-color: var(--correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.partially-correct input,
+.xmodule_display.xmodule_ProblemBlock div.problem div.ui-icon-check input {
+    border-color: var(--partially-correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.processing input {
+    border-color: #aaa;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.ui-icon-close input {
+    border-color: var(--incorrect);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.incorrect input,
+.xmodule_display.xmodule_ProblemBlock div.problem div.incomplete input {
+    border-color: var(--incorrect);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.submitted input,
+.xmodule_display.xmodule_ProblemBlock div.problem div.ui-icon-check input {
+    border-color: var(--submitted);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div p.answer {
+    display: inline-block;
+    margin-top: calc((var(--baseline) / 2));
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div p.answer::before {
+    display: inline;
+    content: "Answer: ";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div p.answer:empty::before {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation {
+    clear: both;
+    margin-top: 3px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation .MathJax_Display {
+    width: auto;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation img.loading {
+    padding-left: calc((var(--baseline) / 2));
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation span {
+    margin-bottom: 0;
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation span.MathJax_CHTML,
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation span.MathJax,
+.xmodule_display.xmodule_ProblemBlock div.problem div div.equation span.MathJax_SVG {
+    padding: 6px;
+    min-width: 30px;
+    border: 1px solid #e3e3e3;
+    border-radius: 4px;
+    background: #f1f1f1;
+}
+
+@media print {
+    .xmodule_display.xmodule_ProblemBlock div.problem div [id^='display'].equation {
+        display: none;
+    }
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div span.ui-icon-bullet {
+    display: inline-block;
+    position: relative;
+    top: 4px;
+    width: 14px;
+    height: 14px;
+    background: url("var(--static-path)/images/unanswered-icon.png") center center no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div span.processing,
+.xmodule_display.xmodule_ProblemBlock div.problem div span.ui-icon-processing {
+    display: inline-block;
+    position: relative;
+    top: 6px;
+    width: 25px;
+    height: 20px;
+    background: url("var(--static-path)/images/spinner.gif") center center no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div span.ui-icon-check {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    width: 25px;
+    height: 20px;
+    background: url("var(--static-path)/images/correct-icon.png") center center no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div span.incomplete,
+.xmodule_display.xmodule_ProblemBlock div.problem div span.ui-icon-close {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    width: 20px;
+    height: 20px;
+    background: url("var(--static-path)/images/incorrect-icon.png") center center no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .reload {
+    float: right;
+    margin: calc((var(--baseline) / 2));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status {
+    margin: calc(var(--baseline) / 2) 0;
+    padding: calc(var(--baseline) / 2);
+    border-radius: 5px;
+    background: var(--gray-l6);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status span {
+    display: block;
+    float: left;
+    overflow: hidden;
+    margin: -7px 7px 0 0;
+    text-indent: -9999px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status .grading {
+    margin: 0px 7px 0 0;
+    padding-left: 25px;
+    background: url("var(--static-path)/images/info-icon.png") left center no-repeat;
+    text-indent: 0px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status p {
+    float: left;
+    margin-bottom: 0;
+    text-transform: capitalize;
+    line-height: 20px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status.file {
+    margin-top: var(--baseline);
+    padding: var(--baseline) 0 0 0;
+    border: 0;
+    border-top: 1px solid #eee;
+    background: var(--white);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status.file p.debug {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .grader-status.file input {
+    float: left;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation p {
+    margin-bottom: calc((var(--baseline) / 5));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .feedback-on-feedback {
+    margin-right: var(--baseline);
+    height: 100px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation-response header {
+    text-align: right;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation-response header a {
+    font-size: .85em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation-scoring .scoring-list {
+    margin-left: 3px;
+    list-style-type: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation-scoring .scoring-list li {
+    display: inline;
+    margin-left: 50px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation-scoring .scoring-list li:first-child {
+    margin-left: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .evaluation-scoring .scoring-list li label {
+    font-size: .9em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div .submit-message-container {
+    margin: var(--baseline) 0px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.inline>span {
+    display: inline;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem ul {
+    margin-bottom: lh();
+    margin-left: .75em;
+    margin-left: .75rem;
+    list-style: disc outside none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem ol {
+    margin-bottom: lh();
+    margin-left: .75em;
+    margin-left: .75rem;
+    list-style: decimal outside none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem dl {
+    line-height: 1.4em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem dl dd {
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem dd {
+    margin-left: .5em;
+    margin-left: .5rem;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem li {
+    margin-bottom: lh(0.5);
+    line-height: 1.4em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem li:last-child {
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem p {
+    margin-bottom: lh();
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table {
+    margin: lh() 0;
+    border-collapse: collapse;
+    table-layout: auto;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table td.cont-justified-left,
+.xmodule_display.xmodule_ProblemBlock div.problem table th.cont-justified-left {
+    text-align: left !important;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table td.cont-justified-right,
+.xmodule_display.xmodule_ProblemBlock div.problem table th.cont-justified-right {
+    text-align: right !important;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table td.cont-justified-center,
+.xmodule_display.xmodule_ProblemBlock div.problem table th.cont-justified-center {
+    text-align: center !important;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table th {
+    text-align: left;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table td {
+    text-align: left;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table caption,
+.xmodule_display.xmodule_ProblemBlock div.problem table th,
+.xmodule_display.xmodule_ProblemBlock div.problem table td {
+    padding: .25em .75em .25em 0;
+    padding: .25rem .75rem .25rem 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table caption {
+    margin-bottom: .75em;
+    margin-bottom: .75rem;
+    padding: .75em 0;
+    padding: .75rem 0;
+    background: #f1f1f1;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem table tr,
+.xmodule_display.xmodule_ProblemBlock div.problem table td,
+.xmodule_display.xmodule_ProblemBlock div.problem table th {
+    vertical-align: middle;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem code {
+    margin: 0 2px;
+    padding: 0px 5px;
+    border: 1px solid #eaeaea;
+    border-radius: 3px;
+    background-color: var(--gray-l6);
+    white-space: nowrap;
+    font-size: .9em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem pre {
+    overflow: auto;
+    padding: 6px calc(var(--baseline) / 2);
+    border: 1px solid var(--gray-l3);
+    border-radius: 3px;
+    background-color: var(--gray-l6);
+    font-size: .9em;
+    line-height: 1.4;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem pre>code {
+    margin: 0;
+    padding: 0;
+    border: none;
+    background: transparent;
+    white-space: pre;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput input {
+    box-sizing: border-box;
+    border: 2px solid var(--gray-l4);
+    border-radius: 3px;
+    min-width: 160px;
+    height: 46px;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline .status,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput .status {
+    display: inline-block;
+    margin-top: calc((var(--baseline) / 2));
+    background: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.incorrect input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.incorrect input {
+    border: 2px solid var(--incorrect);
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.incorrect .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.incorrect .status .status-icon::after {
+    color: var(--incorrect);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.partially-correct input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.partially-correct input {
+    border: 2px solid var(--partially-correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.partially-correct .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.partially-correct .status .status-icon::after {
+    color: var(--partially-correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.correct input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.correct input {
+    border: 2px solid var(--correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.correct .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.correct .status .status-icon::after {
+    color: var(--correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.submitted input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.submitted input {
+    border: 2px solid var(--submitted);
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.submitted .status,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.submitted .status {
+    content: '';
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.unanswered input,
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.unsubmitted input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.unanswered input,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.unsubmitted input {
+    border: 2px solid var(--gray-l4);
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.unanswered .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .capa_inputtype.textline>.unsubmitted .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.unanswered .status .status-icon::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>.unsubmitted .status .status-icon::after {
+    content: '';
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.formulaequationinput>div input {
+    direction: ltr;
+    text-align: left;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .trailing_text {
+    margin-right: calc((var(--baseline) / 2));
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input {
+    margin: 0 0 0 0 !important;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input .indicator-container {
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input .indicator-container .status.correct::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input .indicator-container .status.partially-correct::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input .indicator-container .status.incorrect::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input .indicator-container .status.submitted::after,
+.xmodule_display.xmodule_ProblemBlock .problem .inputtype.option-input .indicator-container .status.unanswered::after {
+    margin-left: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror {
+    border: 1px solid black;
+    font-size: 14px;
+    line-height: 18px;
+    resize: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror .cm-tab {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
+    background-position: right;
+    background-repeat: no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror pre {
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+    border-width: 0;
+    border-radius: 0;
+    background: transparent;
+    white-space: pre;
+    word-wrap: normal;
+    font-size: inherit;
+    font-family: inherit;
+    resize: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror pre.CodeMirror-cursor {
+    position: absolute;
+    visibility: hidden;
+    width: 0;
+    border-right: none;
+    border-left: 1px solid var(--black);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror-focused pre.CodeMirror-cursor {
+    visibility: visible;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror-code pre {
+    width: -webkit-fit-content;
+    width: -moz-fit-content;
+    width: fit-content;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .CodeMirror-scroll {
+    margin-right: 0px;
+}
+
+.xmodule_display.xmodule_ProblemBlock .capa-message {
+    display: inline-block;
+    color: var(--gray-d1);
+    -webkit-font-smoothing: antialiased;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action {
+    min-height: var(--baseline);
+    width: 100%;
+    display: flex;
+    display: -ms-flexbox;
+    -ms-flex-align: start;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-buttons-wrapper {
+    display: inline-flex;
+    justify-content: flex-end;
+    width: 100%;
+    padding-bottom: var(--baseline);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-button-wrapper {
+    border-right: 1px solid var(--gray-300);
+    padding: 0 13px;
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-button-wrapper:last-child {
+    border: none;
+    padding-right: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-btn {
+    border: none;
+    max-width: 110px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-btn:hover,
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-btn:focus,
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-btn:active {
+    color: var(--primary) !important;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-btn .icon {
+    margin-bottom: calc(var(--baseline) / 10);
+    display: block;
+}
+
+@media print {
+    .xmodule_display.xmodule_ProblemBlock div.problem .action .problem-action-btn {
+        display: none;
+    }
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .submit-attempt-container {
+    padding-bottom: var(--baseline);
+    flex-grow: 1;
+    display: flex;
+    align-items: center;
+}
+
+@media (max-width: var(--bp-screen-lg)) {
+    .xmodule_display.xmodule_ProblemBlock div.problem .action .submit-attempt-container {
+        max-width: 100%;
+        padding-bottom: var(--baseline);
+    }
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .submit-attempt-container .submit {
+    margin-right: calc((var(--baseline) / 2));
+    float: left;
+    white-space: nowrap;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .submit-attempt-container .submit-cta-description {
+    color: var(--primary);
+    font-size: small;
+    padding-right: calc(var(--baseline) / 2);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .submit-attempt-container .submit-cta-link-button {
+    color: var(--primary);
+    padding-right: calc(var(--baseline) / 4);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .submission-feedback {
+    margin-right: calc((var(--baseline) / 2));
+    margin-top: calc(var(--baseline) / 2);
+    display: inline-block;
+    color: var(--gray-d1);
+    font-size: var(--medium-font-size);
+    -webkit-font-smoothing: antialiased;
+    vertical-align: middle;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .action .submission-feedback.cta-enabled {
+    margin-top: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem hr {
+    float: none;
+    clear: both;
+    margin: 0 0 .75rem;
+    width: 100%;
+    height: 1px;
+    border: none;
+    background: #ddd;
+    color: #ddd;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hidden {
+    display: none;
+    visibility: hidden;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem var (--all-text-inputs) {
+    display: inline;
+    width: auto;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem center {
+    display: block;
+    margin: lh() 0;
+    padding: lh();
+    border: 1px solid var(--gray-l3);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .message {
+    font-size: inherit;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .detailed-solution>p {
+    margin: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .detailed-solution>p:first-child {
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .detailed-targeted-feedback>p,
+.xmodule_display.xmodule_ProblemBlock div.problem .detailed-targeted-feedback-partially-correct>p,
+.xmodule_display.xmodule_ProblemBlock div.problem .detailed-targeted-feedback-correct>p {
+    margin: 0;
+    font-weight: normal;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.capa_alert {
+    margin-top: var(--baseline);
+    padding: 8px 12px;
+    border: 1px solid var(--warning-color);
+    border-radius: 3px;
+    background: var(--warning-color-accent);
+    font-size: 0.9em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification {
+    float: left;
+    margin-top: calc(var(--baseline) / 2);
+    padding: calc((var(--baseline) / 2.5)) calc((var(--baseline) / 2)) calc((var(--baseline) / 5)) calc((var(--baseline) / 2));
+    line-height: var(--base-line-height);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.success {
+    border-top: 3px solid var(--success);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.success .icon {
+    margin-right: 15px;
+    color: var(--success);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.error {
+    border-top: 3px solid var(--danger);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.error .icon {
+    margin-right: 15px;
+    color: var(--danger);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.warning {
+    border-top: 3px solid var(--warning);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.warning .icon {
+    margin-right: 15px;
+    color: var(--warning);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.general {
+    border-top: 3px solid var(--general-color-accent);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.general .icon {
+    margin-right: 15px;
+    color: var(--general-color-accent);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.problem-hint {
+    border: 1px solid var(--uxpl-gray-background);
+    border-radius: 6px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.problem-hint .icon {
+    margin-right: calc(3 * var(--baseline) / 4);
+    color: var(--uxpl-gray-dark);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.problem-hint li {
+    color: var(--uxpl-gray-base);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification.problem-hint li strong {
+    color: var(--uxpl-gray-dark);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification .icon {
+    float: left;
+    position: relative;
+    top: calc(var(--baseline) / 5);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification .notification-message {
+    display: inline-block;
+    width: 69.38776%;
+    margin-bottom: 8px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification .notification-message ol {
+    list-style: none outside none;
+    padding: 0;
+    margin: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification .notification-message ol li:not(:last-child) {
+    margin-bottom: calc(var(--baseline) / 4);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification .notification-btn-wrapper {
+    float: right;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification-btn {
+    float: right;
+    padding: calc((var(--baseline) / 10)) calc((var(--baseline) / 4));
+    min-width: calc((var(--baseline) * 3));
+    display: block;
+    clear: both;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .notification-btn:first-child {
+    margin-bottom: calc(var(--baseline) / 4);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem button:hover {
+    background-image: none;
+    box-shadow: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem button:focus {
+    box-shadow: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem button.btn-default {
+    background-color: transparent;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem button.btn-brand:hover {
+    background-color: var(--btn-brand-focus-background);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .review-btn {
+    color: var(--blue);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .review-btn.sr {
+    color: var(--blue);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem div.capa_reset {
+    padding: 25px;
+    background-color: var(--error-color-light);
+    border: 1px solid var(--error-color);
+    border-radius: 3px;
+    font-size: 1em;
+    margin-top: calc(var(--baseline) / 2);
+    margin-bottom: calc(var(--baseline) / 2);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .capa_reset>h2 {
+    color: #a00;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .capa_reset li {
+    font-size: 0.9em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints {
+    border: 1px solid var(--gray-l3);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints h3 {
+    padding: 9px;
+    border-bottom: 1px solid #e3e3e3;
+    background: #eee;
+    text-shadow: 0 1px 0 var(--white);
+    font-size: 1em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints div {
+    border-bottom: 1px solid #ddd;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints div:last-child {
+    border-bottom: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints div p {
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints div header a {
+    display: block;
+    padding: 9px;
+    background: var(--gray-l6);
+    box-shadow: inset 0 0 0 1px var(--white);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .hints div>section {
+    padding: 9px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test {
+    padding-top: 18px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test header {
+    margin-bottom: 12px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test header h3 {
+    color: #aaa;
+    font-style: normal;
+    font-size: 0.9em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test>section {
+    position: relative;
+    margin-bottom: calc((var(--baseline) / 2));
+    padding: 9px 9px var(--baseline);
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    background: var(--white);
+    box-shadow: inset 0 0 0 1px #eee;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test>section p:last-of-type {
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test>section .shortform {
+    margin-bottom: .6em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test>section a.full {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 1px;
+    left: 0;
+    box-sizing: border-box;
+    display: block;
+    padding: calc((var(--baseline) / 5));
+    background: var(--gray-l4);
+    text-align: right;
+    font-size: 1em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test>section a.full.full-top {
+    position: absolute;
+    top: 1px;
+    right: 0;
+    bottom: auto;
+    left: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .test>section a.full.full-bottom {
+    position: absolute;
+    top: auto;
+    right: 0;
+    bottom: 1px;
+    left: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section {
+    padding-top: calc((var(--baseline) * 1.5));
+    padding-left: var(--baseline);
+    background-color: #fafafa;
+    color: #2c2c2c;
+    font-size: 1em;
+    font-family: monospace;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section header {
+    font-size: 1.4em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform {
+    margin: 0;
+    padding: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-errors {
+    margin: calc((var(--baseline) / 4));
+    padding: calc((var(--baseline) / 2)) calc((var(--baseline) / 2)) calc((var(--baseline) / 2)) calc((var(--baseline) * 2));
+    background: url("var(--static-path)/images/incorrect-icon.png") center left no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-errors li {
+    color: #b00;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-output {
+    margin: calc(var(--baseline) / 4);
+    padding: var(--baseline) 0 calc((var(--baseline) * 0.75)) 50px;
+    border-top: 1px solid #ddd;
+    border-left: var(--baseline) solid #fafafa;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-output h4 {
+    font-size: 1em;
+    font-family: monospace;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-output dl {
+    margin: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-output dt {
+    margin-top: var(--baseline);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-output dd {
+    margin-left: 24pt;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-correct {
+    background: url("var(--static-path)/images/correct-icon.png") left 20px no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-correct .result-actual-output {
+    color: #090;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-partially-correct {
+    background: url("var(--static-path)/images/partially-correct-icon.png") left 20px no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-partially-correct .result-actual-output {
+    color: #090;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-incorrect {
+    background: url("var(--static-path)/images/incorrect-icon.png") left 20px no-repeat;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .result-incorrect .result-actual-output {
+    color: #b00;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .markup-text {
+    margin: calc((var(--baseline) / 4));
+    padding: var(--baseline) 0 15px 50px;
+    border-top: 1px solid #ddd;
+    border-left: 20px solid #fafafa;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .markup-text bs {
+    color: #b00;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .external-grader-message section .longform .markup-text bg {
+    color: #bda046;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric tr {
+    margin: calc((var(--baseline) / 2)) 0;
+    height: 100%;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric td {
+    margin: calc((var(--baseline) / 2)) 0;
+    padding: var(--baseline) 0;
+    height: 100%;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric th {
+    margin: calc((var(--baseline) / 4));
+    padding: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric label,
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric .view-only {
+    position: relative;
+    display: inline-block;
+    margin: 3px;
+    padding: calc((var(--baseline) * 0.75));
+    min-width: 50px;
+    min-height: 50px;
+    width: 150px;
+    height: 100%;
+    background-color: var(--gray-l3);
+    font-size: .9em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric .grade {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    margin: calc((var(--baseline) / 2));
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric .selected-grade {
+    background: #666;
+    color: white;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric input[type=radio]:checked+label {
+    background: #666;
+    color: white;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .rubric input[class='score-selection'] {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input {
+    margin: 0 0 1em 0;
+    border: 1px solid var(--gray-l3);
+    border-radius: 1em;
+    /* for debugging the input value field. enable the debug flag on the inputtype */
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .annotation-header {
+    padding: .5em 1em;
+    border-bottom: 1px solid var(--gray-l3);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .annotation-body {
+    padding: .5em 1em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input a.annotation-return {
+    float: right;
+    font: inherit;
+    font-weight: normal;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input a.annotation-return::after {
+    content: " \2191";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .block,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags {
+    margin: .5em 0;
+    padding: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .block-highlight {
+    padding: .5em;
+    border: 1px solid rgba(214, 214, 0, 0.3);
+    background-color: rgba(255, 255, 10, 0.3);
+    color: #333;
+    font-style: normal;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .block-comment {
+    font-style: italic;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags {
+    display: block;
+    margin-left: 1em;
+    list-style-type: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags li {
+    position: relative;
+    display: block;
+    margin: 1em 0 0 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags li .tag {
+    display: inline-block;
+    margin-left: calc((var(--baseline) * 2));
+    border: 1px solid #666666;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags li .tag.selected {
+    background-color: rgba(255, 255, 10, 0.3);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags li .tag-status {
+    position: absolute;
+    left: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags li .tag-status,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input ul.tags li .tag {
+    padding: .25em .5em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input textarea.comment {
+    padding: 0.2em 0.4em;
+    width: 100%;
+    height: 7.2em;
+    line-height: 1.4em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .answer-annotation {
+    display: block;
+    margin: 0;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .debug-value {
+    margin: 1em 0;
+    padding: 1em;
+    border: 1px solid var(--black);
+    background-color: #999;
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .debug-value input[type="text"] {
+    width: 100%;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .debug-value pre {
+    background-color: var(--gray-l3);
+    color: var(--black);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .debug-value::before {
+    display: block;
+    content: "debug input value";
+    font-size: 1.5em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input[type="text"] {
+    margin-bottom: 0.5em;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup label.choicetextgroup_correct input[type="text"],
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup section.choicetextgroup_correct input[type="text"] {
+    border-color: var(--correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup label.choicetextgroup_partially-correct input[type="text"],
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup section.choicetextgroup_partially-correct input[type="text"] {
+    border-color: var(--partially-correct);
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup label.choicetextgroup_show_correct::after,
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup section.choicetextgroup_show_correct::after {
+    margin-left: calc((var(--baseline) * 0.75));
+    content: url("var(--static-path)/images/correct-icon.png");
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup span.mock_label {
+    cursor: default;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .status {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    width: 25px;
+    height: 20px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .status.unsubmitted .status-icon,
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .status.unanswered .status-icon {
+    content: '';
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .status.unsubmitted .status-message,
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .status.unanswered .status-message {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .correct .status-icon::after {
+    color: var(--correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .incorrect .status-icon::after {
+    color: var(--incorrect);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .partially-correct .status-icon::after {
+    color: var(--partially-correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .imageinput.capa_inputtype .submitted {
+    content: '';
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .tag-status {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    width: 25px;
+    height: 20px;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .tag-status.unsubmitted .status-icon,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .tag-status.unanswered .status-icon {
+    content: '';
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .tag-status.unsubmitted .status-message,
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .tag-status.unanswered .status-message {
+    display: none;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .correct .status-icon::after {
+    color: var(--correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .incorrect .status-icon::after {
+    color: var(--incorrect);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .partially-correct .status-icon::after {
+    color: var(--partially-correct);
+    font-size: 1.2em;
+    content: "";
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .annotation-input .submitted {
+    content: '';
+}
+
+.xmodule_display.xmodule_ProblemBlock .problems-wrapper .loading-spinner {
+    text-align: center;
+    color: var(--gray-d1);
+}
diff --git a/xmodule/static/css-builtin-blocks/ProblemBlockEditor.css b/xmodule/static/css-builtin-blocks/ProblemBlockEditor.css
new file mode 100644
index 000000000000..467717a4076e
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/ProblemBlockEditor.css
@@ -0,0 +1,221 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_edit.xmodule_ProblemBlock .ui-col-wide {
+    width: 74.46809%;
+    margin-right: 2.12766%;
+    float: left;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .ui-col-narrow {
+    width: 23.40426%;
+    float: left;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .ui-loading {
+    box-shadow: inset 0 1px 2px 1px rgba(0, 0, 0, 0.2);
+    padding: 15px 20px;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .ui-loading {
+    animation: fadeIn 0.25s linear 1;
+    opacity: 0.6;
+    background-color: #fff;
+    padding: 30px 20px;
+    text-align: center;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .ui-loading .spin {
+    display: inline-block;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .ui-loading .copy {
+    padding-left: 5px;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .is-hidden {
+    display: none;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor {
+    position: relative;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .row {
+    position: relative;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar {
+    background-color: #d4dee8;
+    background-image: -webkit-linear-gradient(top, #d4dee8, #c9d5e2);
+    background-image: linear-gradient(to bottom, #d4dee8, #c9d5e2);
+    position: relative;
+    padding: calc(var(--baseline) / 4);
+    border-bottom-color: #a5aaaf;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button {
+    display: inline-block;
+    float: left;
+    padding: 3px calc(var(--baseline) / 2) 5px;
+    margin-left: 7px;
+    border: 0;
+    border-radius: 2px;
+    background: transparent;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button .icon {
+    height: 21px;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button:hover,
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-bar button:focus {
+    background: rgba(255, 255, 255, 0.5);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-tabs {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    text-align: left;
+    direction: ltr;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-tabs li {
+    float: left;
+    margin-right: calc(var(--baseline) / 4);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-tabs li:last-child {
+    margin-right: 0;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-tabs .tab {
+    display: block;
+    height: 24px;
+    padding: 7px 20px 3px;
+    border: 1px solid #a5aaaf;
+    border-radius: 3px 3px 0 0;
+    background-color: var(--transparent);
+    background-image: -webkit-linear-gradient(top, var(--transparent) 87%, rgba(0, 0, 0, 0.06));
+    background-image: linear-gradient(to bottom, var(--transparent) 87%, rgba(0, 0, 0, 0.06));
+    background-color: #e5ecf3;
+    font-size: 13px;
+    color: #3c3c3c;
+    box-shadow: 1px -1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor .editor-tabs .tab.current {
+    background: var(--white);
+    border-bottom-color: var(--white);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle {
+    height: auto;
+    margin-top: -4px;
+    padding: 3px 9px;
+    font-size: 12px;
+    color: var(--link-color);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current {
+    border: 1px solid var(--lightGrey) !important;
+    border-radius: 3px !important;
+    background: var(--lightGrey) !important;
+    color: var(--darkGrey) !important;
+    pointer-events: none;
+    cursor: none;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current:hover,
+.xmodule_edit.xmodule_ProblemBlock .editor-bar .editor-tabs .advanced-toggle.current:focus {
+    box-shadow: 0 0 0 0 !important;
+    background-color: var(--white);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet {
+    position: absolute;
+    top: 41px;
+    left: 70%;
+    width: 0;
+    border-left: 1px solid var(--gray-l2);
+    background-color: var(--lightGrey);
+    overflow: hidden;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet.shown {
+    width: 30%;
+    height: 92%;
+    overflow-y: scroll;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .cheatsheet-wrapper {
+    padding: 5%;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet h6 {
+    margin-top: 4px;
+    margin-bottom: 7px;
+    margin-left: 4px;
+    font-size: 15px;
+    font-weight: 700;
+    display: inline-block;
+    vertical-align: top;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .row {
+    padding-bottom: 5px !important;
+    margin-bottom: 10px !important;
+    border-bottom: 1px solid #ddd !important;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .row:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .row:last-child {
+    border-bottom: none !important;
+    margin-bottom: 0 !important;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .col {
+    display: block;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .col.sample {
+    margin-right: 30px;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet .col.sample .icon {
+    height: calc(var(--baseline) * 1.5);
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet pre {
+    font-size: 12px;
+    line-height: 18px;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .simple-editor-cheatsheet code {
+    padding: 0;
+    background: none;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .problem-editor .markdown-box+.CodeMirror {
+    padding: 10px;
+    width: 69%;
+}
+
+.xmodule_edit.xmodule_ProblemBlock .problem-editor-icon {
+    display: inline-block;
+    width: 26px;
+    height: 21px;
+    vertical-align: middle;
+    color: var(--body-color);
+}
diff --git a/xmodule/static/css-builtin-blocks/SequenceBlockDisplay.css b/xmodule/static/css-builtin-blocks/SequenceBlockDisplay.css
new file mode 100644
index 000000000000..24d9b8ae6c32
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/SequenceBlockDisplay.css
@@ -0,0 +1,359 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_SequenceBlock .block-link {
+    border-left: 1px solid var(--border-color);
+    display: block;
+}
+
+.xmodule_display.xmodule_SequenceBlock .block-link:hover,
+.xmodule_display.xmodule_SequenceBlock .block-link:focus {
+    background: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .topbar,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav {
+    border-bottom: 1px solid var(--border-color);
+}
+
+.xmodule_display.xmodule_SequenceBlock .topbar:after,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+@media print {
+
+    .xmodule_display.xmodule_SequenceBlock .topbar,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav {
+        display: none;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .topbar a.block-link,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav a.block-link {
+    border-left: 1px solid var(--border-color);
+    display: block;
+}
+
+.xmodule_display.xmodule_SequenceBlock .topbar a.block-link:hover,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav a.block-link:hover,
+.xmodule_display.xmodule_SequenceBlock .topbar a.block-link:focus,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav a.block-link:focus {
+    background: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button {
+    background-color: transparent;
+    background-image: none;
+    background-position: center 14px;
+    background-repeat: no-repeat;
+    border: none;
+    border-radius: 0;
+    background-clip: border-box;
+    box-shadow: none;
+    box-sizing: content-box;
+    font-family: inherit;
+    font-size: inherit;
+    font-weight: inherit;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav {
+    margin: 0 auto var(--baseline);
+    position: relative;
+    border-bottom: none;
+    z-index: 0;
+    height: 50px;
+    display: flex;
+    justify-content: center;
+}
+
+@media print {
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav {
+        display: none;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav .sequence-list-wrapper {
+    position: relative;
+    height: 100%;
+    flex-grow: 1;
+}
+
+@media (max-width: 575.98px) {
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav .sequence-list-wrapper {
+        white-space: nowrap;
+        overflow-x: scroll;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol {
+    display: flex;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li {
+    box-sizing: border-box;
+    min-width: 40px;
+    flex-grow: 1;
+    border-color: var(--border-color);
+    border-width: 1px;
+    border-top-style: solid;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li:not(:last-child) {
+    border-right-style: solid;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button {
+    width: 100%;
+    height: 49px;
+    position: relative;
+    margin: 0;
+    padding: 0;
+    display: block;
+    text-align: center;
+    border-color: var(--border-color);
+    border-width: 1px;
+    border-bottom-style: solid;
+    box-sizing: border-box;
+    overflow: visible;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button .icon {
+    display: inline-block;
+    line-height: 100%;
+    font-size: 110%;
+    color: #5a5a5a;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button .fa-bookmark {
+    color: var(--link-color);
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button.seq_video .icon::before {
+    content: "\f008";
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button.seq_other .icon::before {
+    content: "\f02d";
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button.seq_vertical .icon::before {
+    content: "\f00b";
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button.seq_problem .icon::before {
+    content: "\f044";
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button .sequence-tooltip {
+    text-align: left;
+    margin-top: 12px;
+    background: #333333;
+    color: var(--white);
+    font-family: var(--font-family-sans-serif);
+    line-height: lh();
+    right: 0;
+    padding: 6px;
+    position: absolute;
+    top: 48px;
+    text-shadow: 0 -1px 0 var(--black);
+    white-space: pre;
+    pointer-events: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button .sequence-tooltip:empty {
+    background: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button .sequence-tooltip:empty::after {
+    display: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button .sequence-tooltip::after {
+    transform: rotate(45deg);
+    right: 18px;
+    background: #333333;
+    content: " ";
+    display: block;
+    height: 10px;
+    right: 18px;
+    position: absolute;
+    top: -5px;
+    width: 10px;
+}
+
+body.touch-based-device .xmodule_display.xmodule_SequenceBlock .sequence-nav ol li button:hover p {
+    display: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button {
+    display: block;
+    top: 0;
+    min-width: 40px;
+    max-width: 40px;
+    height: 100%;
+    text-shadow: none;
+    background: none;
+    background-color: #fff;
+    border-color: var(--border-color);
+    box-shadow: none;
+    font-size: inherit;
+    font-weight: normal;
+    padding: 0;
+    white-space: nowrap;
+    overflow-x: hidden;
+}
+
+@media (min-width: 768px) {
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button {
+        min-width: 120px;
+        max-width: 200px;
+        text-overflow: ellipsis;
+    }
+
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button span:not(:last-child) {
+        padding-right: calc((var(--baseline) / 2));
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button .sequence-nav-button-label {
+    display: none;
+}
+
+@media (min-width: 768px) {
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button .sequence-nav-button-label {
+        display: inline;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.button-previous {
+    order: -999;
+}
+
+@media (min-width: 768px) {
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button.button-previous {
+        left: 0;
+        -webkit-border-top-left-radius: 3px;
+        -moz-border-topleft-radius: 3px;
+        border-top-left-radius: 3px;
+        -webkit-border-top-right-radius: 0;
+        -moz-border-topright-radius: 0;
+        border-top-right-radius: 0;
+        -webkit-border-bottom-right-radius: 0;
+        -moz-border-bottomright-radius: 0;
+        border-bottom-right-radius: 0;
+        -webkit-border-bottom-left-radius: 3px;
+        -moz-border-bottomleft-radius: 3px;
+        border-bottom-left-radius: 3px;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.button-next {
+    order: 999;
+}
+
+@media (min-width: 768px) {
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button.button-next {
+        right: 0;
+        -webkit-border-top-left-radius: 0;
+        -moz-border-topleft-radius: 0;
+        border-top-left-radius: 0;
+        -webkit-border-top-right-radius: 3px;
+        -moz-border-topright-radius: 3px;
+        border-top-right-radius: 3px;
+        -webkit-border-bottom-right-radius: 3px;
+        -moz-border-bottomright-radius: 3px;
+        border-bottom-right-radius: 3px;
+        -webkit-border-bottom-left-radius: 0;
+        -moz-border-bottomleft-radius: 0;
+        border-bottom-left-radius: 0;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.disabled {
+    cursor: normal;
+}
+
+.xmodule_display.xmodule_SequenceBlock .seq_contents {
+    display: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-bottom {
+    position: relative;
+    height: 45px;
+    margin: lh(2) auto;
+    display: flex;
+    justify-content: center;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-bottom .sequence-nav-button {
+    position: relative;
+    min-width: 120px;
+    max-width: 200px;
+    text-overflow: ellipsis;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-bottom .sequence-nav-button:last-of-type {
+    border-left: none;
+}
+
+@media print {
+    .xmodule_display.xmodule_SequenceBlock .sequence-bottom {
+        display: none;
+    }
+}
+
+.xmodule_display.xmodule_SequenceBlock #seq_content:focus,
+.xmodule_display.xmodule_SequenceBlock #seq_content:active {
+    outline: none;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.focused,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button:hover,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button:active,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.active,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button.focused,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button:hover,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button:active,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button.active {
+    padding-top: 2px;
+    background-color: #0075b4;
+}
+
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.focused .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button:hover .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button:active .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav-button.active .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button.focused .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button:hover .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button:active .icon,
+.xmodule_display.xmodule_SequenceBlock .sequence-nav button.active .icon {
+    color: #fff;
+}
+
+@media (min-width: 576px) {
+
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button.focused,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button:hover,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button:active,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button.active,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button.focused,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button:hover,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button:active,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button.active {
+        border-bottom: 3px solid var(--link-color);
+        background-color: #fff;
+    }
+
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button.focused .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button:hover .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button:active .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav-button.active .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button.focused .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button:hover .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button:active .icon,
+    .xmodule_display.xmodule_SequenceBlock .sequence-nav button.active .icon {
+        color: #0a0a0a;
+    }
+}
diff --git a/xmodule/static/css-builtin-blocks/VideoBlockDisplay.css b/xmodule/static/css-builtin-blocks/VideoBlockDisplay.css
new file mode 100644
index 000000000000..29e9fce6ef58
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/VideoBlockDisplay.css
@@ -0,0 +1,1163 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_VideoBlock {
+    margin-bottom: calc((var(--baseline) * 1.5));
+}
+
+.xmodule_display.xmodule_VideoBlock .is-hidden,
+.xmodule_display.xmodule_VideoBlock .video.closed .subtitles {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video {
+    background: whitesmoke;
+    display: block;
+    margin: 0 -12px;
+    padding: 12px;
+    border-radius: 5px;
+    outline: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_VideoBlock .video:focus,
+.xmodule_display.xmodule_VideoBlock .video:active,
+.xmodule_display.xmodule_VideoBlock .video:hover {
+    border: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.is-initialized .video-wrapper .spinner {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.is-pre-roll .slider {
+    visibility: hidden;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.is-pre-roll .video-player {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.is-pre-roll .video-player::before {
+    display: block;
+    content: "";
+    width: 100%;
+    padding-top: 55%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .tc-wrapper {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .tc-wrapper:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .focus_grabber {
+    position: relative;
+    display: inline;
+    width: 0;
+    height: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .downloads-heading {
+    margin: 1em 0 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-video-bottom-section {
+    display: flex;
+    justify-content: space-between;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-video-bottom-section .wrapper-download-video,
+.xmodule_display.xmodule_VideoBlock .video .wrapper-video-bottom-section .wrapper-download-transcripts,
+.xmodule_display.xmodule_VideoBlock .video .wrapper-video-bottom-section .wrapper-handouts,
+.xmodule_display.xmodule_VideoBlock .video .wrapper-video-bottom-section .branding,
+.xmodule_display.xmodule_VideoBlock .video .wrapper-video-bottom-section .wrapper-transcript-feedback {
+    flex: 1;
+    margin-top: var(--baseline);
+    padding-right: var(--baseline);
+    vertical-align: top;
+}
+
+@media (min-width: 768px) {
+    .xmodule_display.xmodule_VideoBlock .video .wrapper-downloads {
+        display: flex;
+    }
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .hd {
+    margin: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .wrapper-download-video .video-sources {
+    margin: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .wrapper-download-transcripts .list-download-transcripts {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .wrapper-download-transcripts .list-download-transcripts .transcript-option {
+    margin: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .wrapper-download-transcripts .list-download-transcripts .transcript-option a.btn,
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .wrapper-download-transcripts .list-download-transcripts .transcript-option a.btn-link {
+    font-size: 16px !important;
+    font-weight: unset;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .branding {
+    padding-right: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .branding .host-tag {
+    position: absolute;
+    left: -9999em;
+    display: inline-block;
+    vertical-align: middle;
+    color: var(--body-color);
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .branding .brand-logo {
+    display: inline-block;
+    max-width: 100%;
+    max-height: calc((var(--baseline) * 2));
+    padding: calc((var(--baseline) / 4)) 0;
+    vertical-align: middle;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-transcript-feedback {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-transcript-feedback .transcript-feedback-buttons {
+    display: flex;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-transcript-feedback .transcript-feedback-btn-wrapper {
+    margin-right: 10px;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .wrapper-transcript-feedback .thumbs-up-btn,
+.xmodule_display.xmodule_VideoBlock .video .wrapper-transcript-feedback .thumbs-down-btn {
+    border: none;
+    box-shadow: none;
+    background: transparent;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .google-disclaimer {
+    display: none;
+    margin-top: var(--baseline);
+    padding-right: var(--baseline);
+    vertical-align: top;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper {
+    float: left;
+    margin-right: 2.27273%;
+    width: 65.90909%;
+    background-color: black;
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper:hover .btn-play {
+    color: #0075b4;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper:hover .btn-play::after {
+    background: #fff;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player-pre,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player-post {
+    height: 50px;
+    background-color: #111010;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .spinner {
+    transform: translate(-50%, -50%);
+    position: absolute;
+    z-index: 1;
+    background: rgba(0, 0, 0, 0.7);
+    top: 50%;
+    left: 50%;
+    padding: 30px;
+    border-radius: 25%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .spinner::after {
+    animation: rotateCW 3s infinite linear;
+    content: '';
+    display: block;
+    width: 30px;
+    height: 30px;
+    border: 7px solid white;
+    border-top-color: transparent;
+    border-radius: 100%;
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .btn-play {
+    transform: translate(-50%, -50%);
+    position: absolute;
+    z-index: 1;
+    top: 46%;
+    left: 50%;
+    font-size: 4em;
+    cursor: pointer;
+    opacity: 0.1;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .btn-play::after {
+    background: var(--white);
+    position: absolute;
+    width: 50%;
+    height: 50%;
+    content: '';
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    margin: auto;
+    z-index: -1;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions {
+    left: 5%;
+    position: absolute;
+    width: 90%;
+    box-sizing: border-box;
+    top: 70%;
+    text-align: center;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions.is-visible {
+    max-height: calc((var(--baseline) * 3));
+    border-radius: calc((var(--baseline) / 5));
+    padding: 8px calc((var(--baseline) / 2)) 8px calc((var(--baseline) * 1.5));
+    background: rgba(0, 0, 0, 0.75);
+    color: var(--yellow);
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions.is-visible::before {
+    position: absolute;
+    display: inline-block;
+    top: 50%;
+    left: var(--baseline);
+    margin-top: -0.6em;
+    font-family: 'FontAwesome';
+    content: "\f142";
+    color: var(--white);
+    opacity: 0.5;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions.is-visible:hover,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions.is-visible.is-dragging {
+    background: black;
+    cursor: move;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions.is-visible:hover::before,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .closed-captions.is-visible.is-dragging::before {
+    opacity: 1;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player {
+    overflow: hidden;
+    min-height: 158px;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player>div {
+    height: 100%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player>div.hidden {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player .video-error,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player .video-hls-error {
+    padding: calc((var(--baseline) / 5));
+    background: black;
+    color: white !important;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player object,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player iframe,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player video {
+    left: 0;
+    display: block;
+    border: none;
+    width: 100%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player h4 {
+    text-align: center;
+    color: white;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-player h4.hidden {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls {
+    position: relative;
+    border: 0;
+    background: #282c2e;
+    color: #f0f3f5;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls:hover ul,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls:hover div,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls:focus ul,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls:focus div {
+    opacity: 1;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .control {
+    display: inline-block;
+    vertical-align: middle;
+    margin: 0;
+    border: 0;
+    border-radius: 0;
+    padding: calc((var(--baseline) / 2)) calc((var(--baseline) / 1.5));
+    background: #282c2e;
+    box-shadow: none;
+    text-shadow: none;
+    color: #cfd8dc;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .control:hover,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .control:focus {
+    background: #171a1b;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .control:active,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .is-active.control,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .active.control {
+    color: #0ea6ec;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .control .icon {
+    width: 1em;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .control .icon.icon-hd {
+    width: auto;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider {
+    transform-origin: bottom left;
+    transition: height 0.7s ease-in-out 0s;
+    box-sizing: border-box;
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    right: 0;
+    z-index: 1;
+    height: calc((var(--baseline) / 4));
+    margin-left: 0;
+    border: 1px solid #4f595d;
+    border-radius: 0;
+    background: #4f595d;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider .ui-widget-header {
+    background: #8e3e63;
+    border: 1px solid #8e3e63;
+    box-shadow: none;
+    top: -1px;
+    left: -1px;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider .ui-corner-all.slider-range {
+    opacity: 0.3;
+    background-color: #1e91d3;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider .ui-slider-handle {
+    transform-origin: bottom left;
+    transition: all 0.7s ease-in-out 0s;
+    box-sizing: border-box;
+    top: -1px;
+    height: calc((var(--baseline) / 4));
+    width: calc((var(--baseline) / 4));
+    margin-left: calc(-1 * (var(--baseline) / 8));
+    border: 1px solid #cb598d;
+    border-radius: calc((var(--baseline) / 5));
+    padding: 0;
+    background: #cb598d;
+    box-shadow: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider .ui-slider-handle:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider .ui-slider-handle:hover {
+    background-color: #db8baf;
+    border-color: #db8baf;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .vcr {
+    float: left;
+    list-style: none;
+    border-right: 1px solid #282c2e;
+    padding: 0;
+}
+
+@media (max-width: 1120px) {
+    .xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .vcr {
+        margin-right: lh(0.5);
+        font-size: 0.875em;
+    }
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .vcr .video_control:focus {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .vcr .video_control.skip {
+    white-space: nowrap;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .vcr .vidtime {
+    padding-left: lh(0.75);
+    display: inline-block;
+    color: #cfd8dc;
+    -webkit-font-smoothing: antialiased;
+}
+
+@media (max-width: 1120px) {
+    .xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .vcr .vidtime {
+        padding-left: lh(0.5);
+    }
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls {
+    float: right;
+    border-left: 1px dotted #4f595d;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .add-fullscreen,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .grouped-controls,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .auto-advance,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .quality-control {
+    border-left: 1px dotted #4f595d;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speed-button:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume>.control:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .add-fullscreen:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .auto-advance:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .quality-control:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .toggle-transcript:focus {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu {
+    transition: none;
+    position: absolute;
+    display: none;
+    bottom: calc((var(--baseline) * 2));
+    right: 0;
+    width: 120px;
+    margin: 0;
+    border: none;
+    padding: 0;
+    box-shadow: none;
+    background-color: #282c2e;
+    list-style: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li {
+    color: #e7ecee;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li .speed-option,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li .control-lang {
+    text-align: left;
+    display: block;
+    width: 100%;
+    border: 0;
+    border-radius: 0;
+    padding: lh(0.5);
+    background: #282c2e;
+    box-shadow: none;
+    color: #e7ecee;
+    overflow: hidden;
+    text-shadow: none;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li .speed-option:hover,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li .speed-option:focus,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li .control-lang:hover,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li .control-lang:focus {
+    background-color: #4f595d;
+    color: #fcfcfc;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li.is-active .speed-option,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li.is-active .control-lang {
+    border-left: calc(var(--baseline) / 10) solid #0ea6ec;
+    font-weight: var(--font-bold);
+    color: #0ea6ec;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container.is-opened .menu {
+    display: block;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speeds,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .lang,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .grouped-controls {
+    display: inline-block;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speeds.is-opened .control .icon {
+    transform: rotate(-90deg);
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speeds .speed-button .label {
+    padding: 0 calc((var(--baseline) / 3)) 0 0;
+    font-family: var(--font-family-sans-serif);
+    color: #e7ecee;
+}
+
+@media (max-width: 1120px) {
+    .xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speeds .speed-button .label {
+        position: absolute;
+        clip: rect(1px, 1px, 1px, 1px);
+    }
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speeds .speed-button .value {
+    padding: 0 lh(0.5) 0 0;
+    color: #e7ecee;
+    font-weight: bold;
+}
+
+@media (max-width: 1120px) {
+    .xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .speeds .speed-button .value {
+        padding: 0 lh(0.5);
+    }
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .lang .language-menu {
+    width: var(--baseline);
+    padding: calc((var(--baseline) / 2)) 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .lang.is-opened .control .icon {
+    transform: rotate(90deg);
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume {
+    display: inline-block;
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume.is-opened .volume-slider-container {
+    display: block;
+    opacity: 1;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume:not(:first-child)>a {
+    border-left: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container {
+    transition: none;
+    display: none;
+    position: absolute;
+    bottom: calc((var(--baseline) * 2));
+    right: 0;
+    width: 41px;
+    height: 120px;
+    background-color: #282c2e;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container .volume-slider {
+    height: 100px;
+    width: calc((var(--baseline) / 4));
+    margin: 14px auto;
+    box-sizing: border-box;
+    border: 1px solid #4f595d;
+    background: #4f595d;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container .volume-slider .ui-slider-handle {
+    transition: height var(--tmg-s2) ease-in-out 0s, width var(--tmg-s2) ease-in-out 0s;
+    left: -5px;
+    box-sizing: border-box;
+    height: 13px;
+    width: 13px;
+    border: 1px solid #cb598d;
+    border-radius: calc((var(--baseline) / 5));
+    padding: 0;
+    background: #cb598d;
+    box-shadow: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container .volume-slider .ui-slider-handle:hover,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container .volume-slider .ui-slider-handle:focus {
+    background: #db8baf;
+    border-color: #db8baf;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container .volume-slider .ui-slider-range {
+    background: #8e3e63;
+    border: 1px solid #8e3e63;
+    left: -1px;
+    bottom: -1px;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .quality-control {
+    font-weight: 700;
+    letter-spacing: -1px;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .quality-control.active {
+    color: #0ea6ec;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .quality-control.is-hidden,
+.xmodule_display.xmodule_VideoBlock .video.closed .video-wrapper .video-controls .secondary-controls .quality-control.subtitles {
+    display: none !important;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .toggle-transcript.is-active {
+    color: #0ea6ec;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .lang>.hide-subtitles {
+    transition: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper:hover .video-controls .slider {
+    height: calc((var(--baseline) / 1.5));
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper:hover .video-controls .slider .ui-slider-handle {
+    height: calc((var(--baseline) / 1.5));
+    width: calc((var(--baseline) / 1.5));
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .closed-captions {
+    width: 65%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen.closed .closed-captions {
+    width: 90%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles {
+    float: left;
+    overflow: auto;
+    max-height: 460px;
+    width: 31.81818%;
+    padding: 0;
+    font-size: 14px;
+    visibility: visible;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles a {
+    color: #0074b5;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu {
+    height: 100%;
+    margin: 0;
+    padding: 0 3px;
+    list-style: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li {
+    margin-bottom: 8px;
+    border: 0;
+    padding: 0;
+    color: #0074b5;
+    line-height: lh();
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li span {
+    display: block;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li.current {
+    color: #333;
+    font-weight: 700;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li.focused {
+    outline: #000 dotted thin;
+    outline-offset: -1px;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li:hover,
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li:focus {
+    text-decoration: underline;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li:empty {
+    margin-bottom: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li.spacing:last-of-type {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li.spacing:last-of-type .transcript-end {
+    position: absolute;
+    bottom: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.closed .video-wrapper {
+    width: 100%;
+    background-color: inherit;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.closed .video-wrapper .video-controls.html5 {
+    bottom: 0;
+    left: 0;
+    right: 0;
+    position: absolute;
+    z-index: 1;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.closed .video-wrapper .video-player-pre,
+.xmodule_display.xmodule_VideoBlock .video.closed .video-wrapper .video-player-post {
+    height: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.closed .video-wrapper .video-player h3 {
+    color: black;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.closed .subtitles.html5 {
+    background-color: rgba(243, 243, 243, 0.8);
+    height: 100%;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    top: 0;
+    width: 275px;
+    padding: 0 var(--baseline);
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen {
+    background: rgba(0, 0, 0, 0.95);
+    border: 0;
+    bottom: 0;
+    height: 100%;
+    left: 0;
+    margin: 0;
+    padding: 0;
+    position: fixed;
+    top: 0;
+    width: 100%;
+    vertical-align: middle;
+    border-radius: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen.closed .tc-wrapper .video-wrapper {
+    width: 100%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .video-wrapper .video-player-pre,
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .video-wrapper .video-player-post {
+    height: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .video-wrapper {
+    position: static;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .video-wrapper .video-player h3 {
+    color: white;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper {
+    width: 100%;
+    height: 100%;
+    position: static;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper .video-wrapper {
+    height: 100%;
+    width: 75%;
+    margin-right: 0;
+    vertical-align: middle;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper .video-wrapper object,
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper .video-wrapper iframe,
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper .video-wrapper video {
+    position: absolute;
+    width: auto;
+    height: auto;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper .video-controls {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .subtitles {
+    height: 100%;
+    width: 25%;
+    padding: lh();
+    box-sizing: border-box;
+    transition: none;
+    background: var(--black);
+    visibility: visible;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .subtitles li {
+    color: #aaa;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .subtitles li.current {
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_VideoBlock .video.is-touch .tc-wrapper .video-wrapper object,
+.xmodule_display.xmodule_VideoBlock .video.is-touch .tc-wrapper .video-wrapper iframe,
+.xmodule_display.xmodule_VideoBlock .video.is-touch .tc-wrapper .video-wrapper video {
+    width: 100%;
+    height: 100%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    background-size: 100%;
+    background-color: var(--black);
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll.is-html5 {
+    background-size: 15%;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll .btn-play.btn-pre-roll {
+    padding: var(--baseline);
+    border: none;
+    border-radius: var(--baseline);
+    background: var(--black-t2);
+    box-shadow: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll .btn-play.btn-pre-roll::after {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll .btn-play.btn-pre-roll img {
+    height: calc((var(--baseline) * 4));
+    width: calc((var(--baseline) * 4));
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll .btn-play.btn-pre-roll:hover,
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll .btn-play.btn-pre-roll:focus {
+    background: var(--blue);
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .slider .ui-slider-handle,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu li,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container .volume-slider .ui-slider-handle,
+.xmodule_display.xmodule_VideoBlock .video .subtitles .subtitles-menu li,
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li {
+    cursor: pointer;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.closed .subtitles.html5 {
+    z-index: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .menu-container .menu,
+.xmodule_display.xmodule_VideoBlock .video .video-wrapper .video-controls .secondary-controls .volume .volume-slider-container {
+    z-index: 10;
+}
+
+.xmodule_display.xmodule_VideoBlock .video .video-pre-roll,
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list {
+    z-index: 1000;
+}
+
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen,
+.xmodule_display.xmodule_VideoBlock .video.video-fullscreen .tc-wrapper .video-controls,
+.xmodule_display.xmodule_VideoBlock .overlay {
+    z-index: 10000;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu,
+.xmodule_display.xmodule_VideoBlock .submenu {
+    z-index: 100000;
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container>a::after {
+    font-family: FontAwesome;
+    -webkit-font-smoothing: antialiased;
+    display: inline-block;
+    speak: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container {
+    position: relative;
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container.open .a11y-menu-list {
+    display: block;
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list {
+    top: 100%;
+    margin: 0;
+    padding: 0;
+    display: none;
+    position: absolute;
+    list-style: none;
+    background-color: var(--white);
+    border: 1px solid #eee;
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li {
+    margin: 0;
+    padding: 0;
+    border-bottom: 1px solid #eee;
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li a {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: var(--gray-l2);
+    font-size: 14px;
+    line-height: 23px;
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li a:hover,
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li a:focus {
+    color: var(--gray-d1);
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li.active a {
+    color: #009fe6;
+}
+
+.xmodule_display.xmodule_VideoBlock .a11y-menu-container .a11y-menu-list li:last-child {
+    box-shadow: none;
+    border-bottom: 0;
+    margin-top: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container {
+    display: inline-block;
+    vertical-align: top;
+    border-left: 1px solid #eee;
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container.open>a {
+    background-color: var(--action-primary-active-bg);
+    color: var(--very-light-text);
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container.open>a::after {
+    color: var(--very-light-text);
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container>a {
+    transition: all var(--tmg-f2) ease-in-out 0s;
+    font-size: 12px;
+    display: block;
+    border-radius: 0 3px 3px 0;
+    background-color: var(--very-light-text);
+    padding: calc((var(--baseline) * 0.75)) calc((var(--baseline) * 1.25)) calc((var(--baseline) * 0.75)) calc((var(--baseline) * 0.75));
+    color: var(--gray-l2);
+    min-width: 1.5em;
+    line-height: 14px;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container>a::after {
+    content: "\f0d7";
+    position: absolute;
+    right: calc((var(--baseline) * 0.5));
+    top: 33%;
+    color: var(--lighter-base-font-color);
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container .a11y-menu-list {
+    right: 0;
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container .a11y-menu-list li {
+    font-size: 0.875em;
+}
+
+.xmodule_display.xmodule_VideoBlock .video-tracks .a11y-menu-container .a11y-menu-list li a {
+    border: 0;
+    display: block;
+    padding: 0.70788em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu,
+.xmodule_display.xmodule_VideoBlock .submenu {
+    border: 1px solid #333;
+    background: var(--white);
+    color: #333;
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    position: absolute;
+    top: 0;
+    display: none;
+    outline: none;
+    cursor: default;
+    white-space: nowrap;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu.is-opened,
+.xmodule_display.xmodule_VideoBlock .submenu.is-opened {
+    display: block;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .menu-item,
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item,
+.xmodule_display.xmodule_VideoBlock .submenu .menu-item,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item {
+    border-top: 1px solid var(--gray-l3);
+    padding: calc((var(--baseline) / 4)) calc((var(--baseline) / 2));
+    outline: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .menu-item>span,
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item>span,
+.xmodule_display.xmodule_VideoBlock .submenu .menu-item>span,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item>span {
+    color: #333;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .menu-item:first-child,
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item:first-child,
+.xmodule_display.xmodule_VideoBlock .submenu .menu-item:first-child,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item:first-child {
+    border-top: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .menu-item:focus,
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item:focus,
+.xmodule_display.xmodule_VideoBlock .submenu .menu-item:focus,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item:focus {
+    background: #333;
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .menu-item:focus>span,
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item:focus>span,
+.xmodule_display.xmodule_VideoBlock .submenu .menu-item:focus>span,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item:focus>span {
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item {
+    position: relative;
+    padding: calc((var(--baseline) / 4)) var(--baseline) calc((var(--baseline) / 4)) calc((var(--baseline) / 2));
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item::after,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item::after {
+    content: '\25B6';
+    position: absolute;
+    right: 5px;
+    line-height: 25px;
+    font-size: 10px;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item .submenu,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item .submenu {
+    display: none;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item.is-opened,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item.is-opened {
+    background: #333;
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item.is-opened>span,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item.is-opened>span {
+    color: var(--white);
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item.is-opened>.submenu,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item.is-opened>.submenu {
+    display: block;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .submenu-item .is-selected,
+.xmodule_display.xmodule_VideoBlock .submenu .submenu-item .is-selected {
+    font-weight: bold;
+}
+
+.xmodule_display.xmodule_VideoBlock .contextmenu .is-disabled,
+.xmodule_display.xmodule_VideoBlock .submenu .is-disabled {
+    pointer-events: none;
+    color: var(--gray-l3);
+}
+
+.xmodule_display.xmodule_VideoBlock .overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: transparent;
+}
diff --git a/xmodule/static/css-builtin-blocks/VideoBlockEditor.css b/xmodule/static/css-builtin-blocks/VideoBlockEditor.css
new file mode 100644
index 000000000000..c509a017ba60
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/VideoBlockEditor.css
@@ -0,0 +1,165 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_edit.xmodule_VideoBlock .ui-col-wide {
+    width: 74.46809%;
+    margin-right: 2.12766%;
+    float: left;
+}
+
+.xmodule_edit.xmodule_VideoBlock .ui-col-narrow {
+    width: 23.40426%;
+    float: left;
+}
+
+.xmodule_edit.xmodule_VideoBlock .ui-loading {
+    box-shadow: inset 0 1px 2px 1px rgba(0, 0, 0, 0.2);
+    padding: 15px 20px;
+}
+
+.xmodule_edit.xmodule_VideoBlock .ui-loading {
+    animation: fadeIn 0.25s linear 1;
+    opacity: 0.6;
+    background-color: #fff;
+    padding: 30px 20px;
+    text-align: center;
+}
+
+.xmodule_edit.xmodule_VideoBlock .ui-loading .spin {
+    display: inline-block;
+}
+
+.xmodule_edit.xmodule_VideoBlock .ui-loading .copy {
+    padding-left: 5px;
+}
+
+.xmodule_edit.xmodule_VideoBlock .is-hidden {
+    display: none;
+}
+
+.xmodule_edit.xmodule_VideoBlock .tabs-wrapper {
+    padding-top: 0;
+    position: relative;
+}
+
+.xmodule_edit.xmodule_VideoBlock .tabs-wrapper .wrapper-comp-settings {
+    display: block;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-single-tab-name {
+    display: none;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs {
+    position: relative;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header {
+    box-sizing: border-box;
+    padding: 18px var(--baseline);
+    top: 0 !important;
+    right: 0;
+    background-color: var(--blue);
+    border-bottom: 1px solid var(--blue-d2);
+    color: var(--white);
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .component-name {
+    position: relative;
+    top: 0;
+    left: 0;
+    width: 50%;
+    color: var(--white);
+    font-weight: 600;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .component-name em {
+    display: inline-block;
+    margin-right: calc((var(--baseline) / 4));
+    font-weight: 400;
+    color: var(--white);
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .editor-tabs {
+    list-style: none;
+    right: 0;
+    top: calc((var(--baseline) / 4));
+    position: absolute;
+    padding: 12px calc((var(--baseline) * 0.75));
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .editor-tabs .inner_tab_wrap {
+    display: inline-block;
+    margin-left: 8px;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .editor-tabs .inner_tab_wrap a.tab {
+    font-size: 14px;
+    font-size: 1.4rem;
+    background-color: rgba(255, 255, 255, 0.3);
+    background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
+    background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
+    border: 1px solid var(--blue-d1);
+    border-radius: 3px;
+    padding: calc((var(--baseline) / 4)) var(--baseline);
+    background-color: var(--blue);
+    font-weight: bold;
+    color: var(--white);
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .editor-tabs .inner_tab_wrap a.tab.current {
+    background-color: var(--blue);
+    background-image: -webkit-linear-gradient(var(--blue), var(--blue));
+    background-image: linear-gradient(to, var(--blue));
+    color: var(--blue-d1);
+    box-shadow: inset 0 1px 2px 1px var(--shadow-l1);
+    background-color: var(--blue-d4);
+    cursor: default;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .editor-tabs .inner_tab_wrap a.tab:hover,
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .edit-header .editor-tabs .inner_tab_wrap a.tab:focus {
+    box-shadow: inset 0 1px 2px 1px var(--shadow);
+    background-image: linear-gradient(#009fe6, #009fe6) !important;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .is-inactive {
+    display: none;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .comp-subtitles-entry {
+    text-align: center;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .comp-subtitles-entry .file-upload {
+    display: none;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .comp-subtitles-entry .comp-subtitles-import-list>li {
+    display: block;
+    margin: calc(var(--baseline) / 2) 0;
+}
+
+.xmodule_edit.xmodule_VideoBlock .editor-with-tabs .comp-subtitles-entry .comp-subtitles-import-list .blue-button {
+    font-size: 1em;
+    display: block;
+    width: 70%;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.xmodule_edit.xmodule_VideoBlock .component-tab {
+    background: var(--white);
+    position: relative;
+    border-top: 1px solid #8891a1;
+}
+
+.xmodule_edit.xmodule_VideoBlock .component-tab#advanced {
+    padding: 0;
+    border: none;
+}
diff --git a/xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css b/xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css
new file mode 100644
index 000000000000..8be5f77ede00
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css
@@ -0,0 +1,27 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_WordCloudBlock .input-cloud {
+    margin: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_WordCloudBlock .result_cloud_section {
+    display: none;
+    width: 0px;
+    height: 0px;
+}
+
+.xmodule_display.xmodule_WordCloudBlock .result_cloud_section.active {
+    display: block;
+    width: 100%;
+    height: auto;
+    margin-top: 1em;
+}
+
+.xmodule_display.xmodule_WordCloudBlock .result_cloud_section.active h3 {
+    font-size: 100%;
+}
+
+.xmodule_display.xmodule_WordCloudBlock .your_words {
+    font-size: 0.85em;
+    display: block;
+}
diff --git a/xmodule/template_block.py b/xmodule/template_block.py
index e6e69742cfbf..cdf83a556665 100644
--- a/xmodule/template_block.py
+++ b/xmodule/template_block.py
@@ -9,7 +9,7 @@
 from web_fragments.fragment import Fragment
 from xmodule.editing_block import EditingMixin
 from xmodule.raw_block import RawMixin
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
@@ -69,7 +69,7 @@ def studio_view(self, _context):
         fragment = Fragment(
             self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
         )
-        add_sass_to_fragment(fragment, 'CustomTagBlockEditor.scss')
+        add_css_to_fragment(fragment, 'CustomTagBlockEditor.css')
         add_webpack_js_to_fragment(fragment, 'CustomTagBlockEditor')
         shim_xmodule_js(fragment, 'XMLEditingDescriptor')
         return fragment
diff --git a/xmodule/templates/html/zooming_image.yaml b/xmodule/templates/html/zooming_image.yaml
index b91717550b27..14e9ef2c2392 100644
--- a/xmodule/templates/html/zooming_image.yaml
+++ b/xmodule/templates/html/zooming_image.yaml
@@ -2,56 +2,238 @@
 metadata:
     display_name: Zooming Image Tool
 data: |
-      <h3 class="hd hd-2">Zooming Image Tool</h3>
-      <p>Use the Zooming Image Tool to enable learners to see details of large, complex images.</p>
-      <p>With the Zooming Image Tool, the learner can move the mouse pointer over a part of the image to enlarge it and see more detail.</p>
-      <p>To use the Zooming Image Tool, you must first add the <a href="http://files.edx.org/jquery.loupeAndLightbox.js" target="_blank">jquery.loupeAndLightbox.js JavaScript file</a> to your course.</p>
-      <p>You must also add both the regular and magnified image files to your course.</p>
-      <p>The following HTML code shows the format required to use the Zooming Image tool. For the example in this template, you must replace the values in <i>italics</i>.</p>
-        <pre>
-        &lt;div class="zooming-image-place" style="position: relative;"&gt;
-          &lt;a class="loupe" href="<i>path to the magnified version of the image</i>"&gt;
-            &lt;img alt="<i>Text for screen readers</i>"
-              src="<i>path to the image you want to display in the unit</i>" /&gt;
-          &lt;/a>
-          &lt;div class="script_placeholder"
-            data-src="<i>path to the jquery.loupeAndLightbox.js JavaScript file in your course</i>"/&gt;
-        &lt;/div&gt;
-        &lt;script type="text/javascript"&gt;// &gt;![CDATA[
-        JavascriptLoader.executeModuleScripts($('.zooming-image-place').eq(0), function() {
-          $('.loupe').loupeAndLightbox({
+      <p>Use the Zooming Image Tool to enable learners to see details of large, complex images. With the tool, the learner can move the mouse pointer over a part of the image to enlarge it and see more detail.</p>
+      <p>To set it up, first upload the regular image file and, optionally, a magnified image file to your course. Then refer to them with the following HTML code, replacing the values in <i>italics</i> accordingly:</p>
+      <pre>
+      &lt;div class="zooming-image"&gt;
+        &lt;a <strong>data-src</strong>="<i style="color: blue">(Optional) URL to the magnified image</i>"&gt;
+          &lt;img <strong>src</strong>="<i style="color: blue">URL to the regular image</i>" /&gt;
+        &lt;/a&gt;
+      &lt;/div&gt;
+      </pre>
+      <p>If a magnified image is not provided, the regular one will be used at its native size.</p>
+      <p>Feel free to modify the example below for your own use, but take care not to remove the included Javascript.</p>
+      <div class="zooming-image">
+        <a data-src="">
+          <!-- The following sample image is in the public domain.  Source: https://commons.wikimedia.org/wiki/File:12-Color-SVG.svg -->
+          <img alt="A color wheel." src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiCiB3aWR0aD0iMTMwMCIgaGVpZ2h0PSIxMzAwIiB2aWV3Qm94PSItNjUwIC02NTAgMTMwMCAxMzAwIj4KIDxkZWZzPgogPHBhdGggaWQ9ImsiIHN0cm9rZT0iYmx1ZSIgc3Ryb2tlLXdpZHRoPSIzIgogZD0iTTAsMCBoMjAwIGEyMDAsMjAwIDAgMSwwIC00MCwtMTUwIHoiIC8+CgogPGZpbHRlciBpZD0icyIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjMzIiBpbj0iU291cmNlR3JhcGhpYyIgLz4KIDwvZmlsdGVyPgogIDxmaWx0ZXIgaWQ9InMxOSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjgiIGluPSJTb3VyY2VHcmFwaGljIiAvPgogPC9maWx0ZXI+CiA8ZmlsdGVyIGlkPSJzMSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjY0IiBpbj0iU291cmNlR3JhcGhpYyIgLz4KIDwvZmlsdGVyPgogPGZpbHRlciBpZD0iczI3IiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giCiAgICAgICAgICB4PSItMC4yNSIgeT0iLTAuMjUiIHdpZHRoPSIxLjUiIGhlaWdodD0iMS41Ij4KICAgIDxmZUNvbG9yTWF0cml4IHR5cGU9InNhdHVyYXRlIiB2YWx1ZXM9IjAuNTEiIGluPSJTb3VyY2VHcmFwaGljIiAvPgogPC9maWx0ZXI+CiA8ZmlsdGVyIGlkPSJzMiIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjQxIiBpbj0iU291cmNlR3JhcGhpYyIgLz4KIDwvZmlsdGVyPgogPGZpbHRlciBpZD0iczMiIGZpbHRlclVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIKICAgICAgICAgIHg9Ii0wLjI1IiB5PSItMC4yNSIgd2lkdGg9IjEuNSIgaGVpZ2h0PSIxLjUiPgogICAgPGZlQ29sb3JNYXRyaXggdHlwZT0ic2F0dXJhdGUiIHZhbHVlcz0iMC4yNiIgaW49IlNvdXJjZUdyYXBoaWMiIC8+CiA8L2ZpbHRlcj4KIDxmaWx0ZXIgaWQ9InM0MyIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjMiIGluPSJTb3VyY2VHcmFwaGljIiAvPgogPC9maWx0ZXI+CiA8ZmlsdGVyIGlkPSJzNCIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjE3IiBpbj0iU291cmNlR3JhcGhpYyIgLz4KIDwvZmlsdGVyPgoKIDxmaWx0ZXIgaWQ9InM0MSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjEzIiBpbj0iU291cmNlR3JhcGhpYyIgLz4KIDwvZmlsdGVyPgogPGZpbHRlciBpZD0iczUiIGZpbHRlclVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIKICAgICAgICAgIHg9Ii0wLjI1IiB5PSItMC4yNSIgd2lkdGg9IjEuNSIgaGVpZ2h0PSIxLjUiPgogICAgPGZlQ29sb3JNYXRyaXggdHlwZT0ic2F0dXJhdGUiIHZhbHVlcz0iMC4xMSIgaW49IlNvdXJjZUdyYXBoaWMiIC8+CiA8L2ZpbHRlcj4KIDxmaWx0ZXIgaWQ9InM2IiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giCiAgICAgICAgICB4PSItMC4yNSIgeT0iLTAuMjUiIHdpZHRoPSIxLjUiIGhlaWdodD0iMS41Ij4KICAgIDxmZUNvbG9yTWF0cml4IHR5cGU9InNhdHVyYXRlIiB2YWx1ZXM9IjAuMDkiIGluPSJTb3VyY2VHcmFwaGljIiAvPgogPC9maWx0ZXI+CiA8ZmlsdGVyIGlkPSJzNjg3IiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giCiAgICAgICAgICB4PSItMC4yNSIgeT0iLTAuMjUiIHdpZHRoPSIxLjUiIGhlaWdodD0iMS41Ij4KICAgIDxmZUNvbG9yTWF0cml4IHR5cGU9InNhdHVyYXRlIiB2YWx1ZXM9IjAuMDY4NyIgaW49IlNvdXJjZUdyYXBoaWMiIC8+CiA8L2ZpbHRlcj4KIDxmaWx0ZXIgaWQ9InM1NSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjA1NSIgaW49IlNvdXJjZUdyYXBoaWMiIC8+CiA8L2ZpbHRlcj4KIDxmaWx0ZXIgaWQ9InM0NCIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjA0NCIgaW49IlNvdXJjZUdyYXBoaWMiIC8+CiA8L2ZpbHRlcj4KIDxmaWx0ZXIgaWQ9InMzNSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IgogICAgICAgICAgeD0iLTAuMjUiIHk9Ii0wLjI1IiB3aWR0aD0iMS41IiBoZWlnaHQ9IjEuNSI+CiAgICA8ZmVDb2xvck1hdHJpeCB0eXBlPSJzYXR1cmF0ZSIgdmFsdWVzPSIwLjAzNSIgaW49IlNvdXJjZUdyYXBoaWMiIC8+CiA8L2ZpbHRlcj4KIDxmaWx0ZXIgaWQ9InMwIiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giCiAgICAgICAgICB4PSItMC4yNSIgeT0iLTAuMjUiIHdpZHRoPSIxLjUiIGhlaWdodD0iMS41Ij4KICAgIDxmZUNvbG9yTWF0cml4IHR5cGU9InNhdHVyYXRlIiB2YWx1ZXM9IjAiIGluPSJTb3VyY2VHcmFwaGljIiAvPgogPC9maWx0ZXI+CgogIDxtYXNrIGlkPSJtYXNrZSI+CiAgIDxyZWN0IHg9Ii01MDAiIHk9Ii01MDAiIHdpZHRoPSIxNjAwIiBoZWlnaHQ9IjE2MDAiIGZpbGw9IiNmZmYiIC8+CiAgIDx1c2UgeGxpbms6aHJlZj0iI2siIGZpbGw9IiMwMDAiIC8+CiAgIDwhLS11c2UgeGxpbms6aHJlZj0iI2siIHg9IjAiIHk9IjAiIHRyYW5zZm9ybT0icm90YXRlKC0zMCkiIGZpbGw9IiMwMDAiIC8tLT4KICAgPHVzZSB4bGluazpocmVmPSIjayIgdHJhbnNmb3JtPSJyb3RhdGUoLTMwKSIgZmlsbD0iIzAwMCIgLz4KICA8L21hc2s+CiA8L2RlZnM+CiA8ZyBpZD0ic2NoaXJtIiB0cmFuc2Zvcm09InNjYWxlKDEpIj4KICA8dXNlIGZpbGw9InJlZCIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMzApIiBmaWxsPSIjZmY3ZjAwIiB4bGluazpocmVmPSIjayIgLz4KICA8dXNlIHRyYW5zZm9ybT0icm90YXRlKC02MCkiIGZpbGw9IiNmZjAiIHhsaW5rOmhyZWY9IiNrIiAvPgogIDx1c2UgdHJhbnNmb3JtPSJyb3RhdGUoLTkwKSIgZmlsbD0iIzdmZmYwMCIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMTIwKSIgZmlsbD0iIzBmMCIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMTUwKSIgZmlsbD0iIzAwZmY3ZiIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMTgwKSIgZmlsbD0iIzBmZiIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMjEwKSIgZmlsbD0iIzAwN2ZmZiIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMjQwKSIgZmlsbD0iIzAwZiIgeGxpbms6aHJlZj0iI2siIC8+CiAgPHVzZSB0cmFuc2Zvcm09InJvdGF0ZSgtMjcwKSIgZmlsbD0iIzdmMDBmZiIgeGxpbms6aHJlZj0iI2siIC8+CiAgPGcgbWFzaz0idXJsKCNtYXNrZSkiPgogIDx1c2UgdHJhbnNmb3JtPSJyb3RhdGUoNjApIiBmaWxsPSIjZjBmIiB4bGluazpocmVmPSIjayIgLz4KICA8dXNlIHRyYW5zZm9ybT0icm90YXRlKDMwKSIgZmlsbD0iI2ZmMDA3ZiIgeGxpbms6aHJlZj0iI2siIG9wYWNpdHk9IjEiLz4KIDwvZz48L2c+CiA8ZyBpZD0ic2NoaXJtZSIgb3BhY2l0eT0iMSI+CiA8dXNlIHRyYW5zZm9ybT0ic2NhbGUoMC44KSIgZmlsdGVyPSJ1cmwoI3MxOSkiIHhsaW5rOmhyZWY9IiNzY2hpcm0iIC8+CiA8dXNlIHRyYW5zZm9ybT0ic2NhbGUoMC42NCkiIGZpbHRlcj0idXJsKCNzMSkiIHhsaW5rOmhyZWY9IiNzY2hpcm0iIC8+CiA8dXNlIHRyYW5zZm9ybT0ic2NhbGUoMC41MTIpIiBmaWx0ZXI9InVybCgjczI3KSIgeGxpbms6aHJlZj0iI3NjaGlybSIgLz4KIDx1c2UgdHJhbnNmb3JtPSJzY2FsZSgwLjQwOTYpIiBmaWx0ZXI9InVybCgjczIpIiB4bGluazpocmVmPSIjc2NoaXJtIiAvPgogPHVzZSB0cmFuc2Zvcm09InNjYWxlKDAuMzI3NykiIGZpbHRlcj0idXJsKCNzKSIgeGxpbms6aHJlZj0iI3NjaGlybSIgLz4KIDx1c2UgdHJhbnNmb3JtPSJzY2FsZSgwLjI2MjEpIiBmaWx0ZXI9InVybCgjczMpIiB4bGluazpocmVmPSIjc2NoaXJtIiAvPgogPHVzZSB0cmFuc2Zvcm09InNjYWxlKDAuMjA5NykiIGZpbHRlcj0idXJsKCNzNDMpIiB4bGluazpocmVmPSIjc2NoaXJtIiAvPgogPHVzZSB0cmFuc2Zvcm09InNjYWxlKDAuMTY3OCkiIGZpbHRlcj0idXJsKCNzNCkiIHhsaW5rOmhyZWY9IiNzY2hpcm0iIC8+CiA8dXNlIHRyYW5zZm9ybT0ic2NhbGUoMC4xMzQyKSIgZmlsdGVyPSJ1cmwoI3M0MSkiIHhsaW5rOmhyZWY9IiNzY2hpcm0iIC8+CiA8dXNlIHRyYW5zZm9ybT0ic2NhbGUoMC4xMDc0KSIgZmlsdGVyPSJ1cmwoI3M1KSIgeGxpbms6aHJlZj0iI3NjaGlybSIgLz4KIDx1c2UgdHJhbnNmb3JtPSJzY2FsZSgwLjA4NTkpIiBmaWx0ZXI9InVybCgjczYpIiB4bGluazpocmVmPSIjc2NoaXJtIiAvPgogPHVzZSB0cmFuc2Zvcm09InNjYWxlKDAuMDY4NykiIGZpbHRlcj0idXJsKCNzNjg3KSIgeGxpbms6aHJlZj0iI3NjaGlybSIgLz4KIDx1c2UgdHJhbnNmb3JtPSJzY2FsZSgwLjA1NSkiIGZpbHRlcj0idXJsKCNzNTUpIiB4bGluazpocmVmPSIjc2NoaXJtIiAvPgogPHVzZSB0cmFuc2Zvcm09InNjYWxlKDAuMDQ0KSIgZmlsdGVyPSJ1cmwoI3M0NCkiIHhsaW5rOmhyZWY9IiNzY2hpcm0iIC8+CiA8dXNlIHRyYW5zZm9ybT0ic2NhbGUoMC4wMzUpIiBmaWx0ZXI9InVybCgjczM1KSIgeGxpbms6aHJlZj0iI3NjaGlybSIgLz4KIDx1c2UgdHJhbnNmb3JtPSJzY2FsZSgwLjAyOCkiIGZpbHRlcj0idXJsKCNzMCkiIHhsaW5rOmhyZWY9IiNzY2hpcm0iIC8+CiA8L2c+Cjwvc3ZnPg==" />
+        </a>
+      </div>
+      <script type="text/javascript">//<![CDATA[
+        /*
+        jQuery loupeAndLightbox Plugin
+        * Version 1.1
+        * 12-11-2024
+        * Authors: M.Biscan, Adolfo R. Brandes
+        * requires jQuery 1.4.2
+        Copyright (c) 2010 M.Biscan
+
+        Permission is hereby granted, free of charge, to any person obtaining
+        a copy of this software and associated documentation files (the
+        "Software"), to deal in the Software without restriction, including
+        without limitation the rights to use, copy, modify, merge, publish,
+        distribute, sublicense, and/or sell copies of the Software, and to
+        permit persons to whom the Software is furnished to do so, subject to
+        the following conditions:
+
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+        LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+        OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+        WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+        */
+        (function($) {
+          if ('loupe' in $.fn)
+            return;
+
+          $.fn.loupe = function(options) {
+            var settings = $.extend({}, $.fn.loupe.defaults, options);
+
+            return this.each(function() {
+              var $this = $(this);
+
+              if ($this.hasClass('loupe')) {
+                return;
+              } else {
+                $this.addClass('loupe').css({
+                  position: 'relative'
+                });
+              }
+
+              var $targetAnchor = $this.find('> a');
+              var $targetImage = $targetAnchor.find('> img');
+              var $magnifiedImage = $('<img />');
+              var $loupe = $('<div class="larger" style="overflow: hidden;">');
+              var $errorMessage = $('<div class="lal_errorMessage">');
+              var $loader = $('<div class="lal_loader">Loading...</div>');
+
+              $targetAnchor.css({
+                cursor: 'default'
+              });
+
+              $targetImage.css({
+                cursor: 'pointer'
+              });
+
+              $magnifiedImage.css({
+                position: 'absolute',
+                maxWidth: 'none'
+              });
+
+              $loupe.css({
+                cursor: 'none',
+                display: 'none',
+                border: settings.border,
+                height: settings.height,
+                overflow: 'hidden',
+                position: 'absolute',
+                bottom: 0,
+                left: 0,
+                width: settings.width,
+                zIndex: settings.zIndex,
+                borderRadius: '50%',
+                background: '#FFF',
+              });
+
+              $errorMessage
+                .text(settings.errorMessage)
+                .css({
+                  height:settings.height,
+                  width:settings.width
+                });
+
+              $loader.css({
+                  height:settings.height,
+                  width:settings.width
+                });
+
+              $targetAnchor.click(function(event) {
+                event.preventDefault();
+              });
+
+              $targetImage.click(function(event) {
+                if(!$loupe.hasClass('visible')) {
+                  var left = event.pageX;
+                  var top = event.pageY;
+
+                  if(!$magnifiedImage.hasClass('appended')) {
+                    getMagnifiedImage();
+                  }
+
+                  setTimeout(function() {
+                    appendLoupe();
+                    magnify(left, top);
+                  }, 100);
+                }
+              });
+
+              $targetImage.mousemove(function(event) {
+                var left = event.pageX;
+                var top = event.pageY;
+                var offsetTop = $targetImage.offset().top-($loupe.width()/2);
+                var offsetLeft = $targetImage.offset().left-($loupe.height()/2);
+                var offsetBottom = $targetImage.offset().top+$targetImage.height()+($loupe.height()/2);
+                var offsetRight = $targetImage.offset().left+$targetImage.width()+($loupe.width()/2);
+
+                if(left < offsetLeft || left > offsetRight || top < offsetTop || top > offsetBottom) {
+                  $targetImage.css({cursor:'default'});
+                } else {
+                  $targetImage.css({cursor:'crosshair'});
+                  magnify(left, top);
+                }
+              }).click(function() {
+                detachLoupe();
+              }).mouseleave(function() {
+                pulseLoupe();
+              });
+
+              // Detach when clicking outside of the loupe
+              $(document).click(function(event) {
+                if($loupe.hasClass('visible')) {
+                  detachLoupe();
+                }
+              });
+
+              // Resize with window
+              $(window).resize(function() {
+                if($loupe.is(':visible')) {
+                  $magnifiedImage.css({
+                    left: -($magnifiedImage.width() / 2) + ($loupe.width() / 2),
+                    top: -($magnifiedImage.height() / 2) + ($loupe.height() / 2)
+                  });
+                }
+              });
+
+              function magnify(left, top) {
+                var heightDiff = $magnifiedImage.height() / $targetImage.height();
+                var widthDiff = $magnifiedImage.width() / $targetImage.width();
+                var magnifierTop = (-(top - $targetImage.offset().top) * heightDiff) + (settings.height / 2);
+                var magnifierLeft = (-(left - $targetImage.offset().left) * widthDiff) + (settings.width / 2);
+
+                $magnifiedImage.css({
+                    top: magnifierTop,
+                    left: magnifierLeft
+                });
+              };
+
+              function appendLoupe() {
+                $loupe
+                  .appendTo($this)
+                  .append($magnifiedImage)
+                  .fadeIn(settings.fadeSpeed, function() {
+                    $(this).addClass('visible');
+                  });
+              };
+
+              function getMagnifiedImage() {
+                var src = $targetAnchor.data('src') ? $targetAnchor.data('src') : $targetImage.attr('src');
+                $loader.appendTo($loupe);
+
+                $magnifiedImage
+                  .load(function() {
+                    $(this).addClass('appended');
+                    $loader.detach();
+                  })
+                  .error(function () {
+                    $(this).hide();
+                    $loupe
+                      .append($errorMessage)
+                      .addClass('lal_loadError');
+                    $loader.detach();
+                  })
+                  .attr('src', src);
+              };
+
+              function detachLoupe() {
+                $loupe.fadeOut(settings.fadeSpeed, function() {
+                  $(this)
+                    .removeClass('visible')
+                    .detach();
+                });
+              };
+
+              function pulseLoupe() {
+                $loupe.fadeTo(150, 0.25, function() {
+                  $(this).fadeTo(150, 1.0);
+                });
+              };
+            });
+          };
+
+          $.fn.loupe.defaults = {
+            zIndex: 1000,
             width: 350,
             height: 350,
-            lightbox: false
-          });
-        });
-        // ]]&gt;&lt;/script&gt;
-        &lt;div id="ap_listener_added"&gt;&lt;/div&gt;
-        </pre>
-
-      <p>You can modify the example below for your own use.</p>
-      <ol>
-        <li>Replace the value of the link's <strong>href</strong> attribute with the path to the magnified image. Do not change the value of the class attribute.</li>
-        <li>Replace the value of the image's <strong>src</strong> attribute with the path to the image that will appear in the unit.</li>
-        <li>Replace the value of the image's <strong>alt</strong> attribute with text that both describes the image and the action or destination of clicking on the image. You <strong>must</strong> include alt text to provide an accessible label.</li>
-        <li>Replace the value of the div element's <strong>data-src</strong> attribute with the path to the jquery.loupeAndLightbox.js JavaScript file in your course.</li>
-      </ol>
-      <p>The example below shows a subset of the biochemical reactions that cells carry out. </p>
-      <p>You can view the chemical structures of the molecules by clicking on them. The magnified view also lists the enzymes involved in each step.</p>
-      <p class="sr">Press spacebar to open the magnifier.</p>
-      <div class="zooming-image-place" style="position: relative;">
-        <a class="loupe" href="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_detail_01.png">
-            <img alt="magnify" src="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_overview_01.png" />
-          </a>
-        <div class="script_placeholder" data-src="https://studio.edx.org/c4x/edX/DemoX/asset/jquery.loupeAndLightbox.js" />
-      </div>
-      <script type="text/javascript">// <![CDATA[
-      JavascriptLoader.executeModuleScripts($('.zooming-image-place').eq(0), function() {
-        $('.loupe').loupeAndLightbox({
-          width: 350,
-          height: 350,
-          lightbox: false
-        });
-      });
-      // ]]></script>
-      <div id="ap_listener_added"></div>
+            border: '2px solid #ccc',
+            fadeSpeed: 250,
+            errorMessage: 'Image load error'
+          };
+        })(jQuery);
+
+        $('.zooming-image').loupe();
+      //]]></script>
diff --git a/xmodule/templates/item_bank/author_view.html b/xmodule/templates/item_bank/author_view.html
new file mode 100644
index 000000000000..92c289b6f0fb
--- /dev/null
+++ b/xmodule/templates/item_bank/author_view.html
@@ -0,0 +1,46 @@
+{% load i18n %}
+{% load django_markup %}
+<div style="padding: 1em">
+    {% if block_count > 0 %}
+        {% if max_count == -1 %}
+            <p>
+                {% filter force_escape %}
+                {% blocktrans count num_selected=block_count %}
+                Learners will see the selected component:
+                {% plural %}
+                Learners will see all of the {{ num_selected }} selected components, in random order:
+                {% endblocktrans %}
+                {% endfilter %}
+            </p>
+        {% else %}
+            <p>
+                {% filter force_escape %}
+                {% blocktrans with max_count=max_count count num_selected=block_count %}
+                Learners will see the selected component:
+                {% plural %}
+                Learners will see {{ max_count }} of the {{ num_selected }} selected components:
+                {% endblocktrans %}
+                {% endfilter %}
+            </p>
+        {% endif %}
+        <ol style="list-style: decimal; margin-left: 2em;">
+            {% for block in blocks %}
+                <li>{{ block.display_name }}</li>
+            {% endfor %}
+        </ol>
+        <p style="color: var(--gray);">
+            {% blocktrans trimmed asvar view_msg %}
+            Press {link_start}View{link_end} to preview, sync/update, and/or remove the selected components.
+            {% endblocktrans %}
+            {% interpolate_html view_msg link_start=view_link|safe link_end='</a>'|safe %}
+        </p>
+        <p style="color: var(--gray);">
+            {% blocktrans trimmed asvar edit_msg %}
+            Press {link_start}Edit{link_end} to configure how many will be shown and other settings.
+            {% endblocktrans %}
+            {% interpolate_html edit_msg link_start='<a role="button" href="#" class="edit-button action-button">'|safe link_end='</a>'|safe %}
+        </p>
+    {% else %}
+        <p>{% trans "You have not selected any components yet." as tmsg %}{{tmsg|force_escape}}</p>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/xmodule/templates/item_bank/author_view_add.html b/xmodule/templates/item_bank/author_view_add.html
new file mode 100644
index 000000000000..2927fd47b202
--- /dev/null
+++ b/xmodule/templates/item_bank/author_view_add.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+{% load django_markup %}
+<div class="insert-new-lib-blocks-here"></div>
+<div class="xblock-header-secondary">
+    {% comment %}
+    How this button works: An event handler in cms/static/js/views/pages/container.js
+    will watch for clicks and then display the SelectV2LibraryContent modal and process
+    the list of selected blocks returned from the modal.
+    {% endcomment %}
+    {% blocktrans trimmed asvar tmsg %}
+    {button_start}Add components{button_end} from a content library to this problem bank.
+    {% endblocktrans %}
+    {% interpolate_html tmsg button_start='<button class="btn btn-primary problem-bank-v2-add-button"><span class="icon fa fa-plus" aria-hidden="true"></span> '|safe button_end='</button>'|safe %}
+</div>
diff --git a/xmodule/templates/test/zooming_image.yaml b/xmodule/templates/test/zooming_image.yaml
deleted file mode 100644
index 3ac9d63bcbbc..000000000000
--- a/xmodule/templates/test/zooming_image.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-metadata:
-    display_name: Zooming Image
-data: |
-      <h2>ZOOMING DIAGRAMS</h2>
-      <p>Some edX classes use extremely large, extremely detailed graphics. To make it easier to understand we can offer two versions of those graphics, with the zoomed section showing when you click on the main view.</p>
-      <p>The example below is from <a href="https://www.edx.org/course/mit/7-00x/introduction-biology-secret-life/1014" target="_blank">7.00x: Introduction to Biology</a> and shows a subset of the biochemical reactions that cells carry out. </p>
-      <p>You can view the chemical structures of the molecules by clicking on them. The magnified view also lists the enzymes involved in each step.</p>
-      <p class="sr">Press spacebar to open the magifier.</p>
-      <div class="zooming-image-place" style="position: relative;">
-        <a class="loupe" href="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_detail_01.png">
-            <img alt="magnify" src="https://studio.edx.org/c4x/edX/DemoX/asset/pathways_overview_01.png" />
-          </a>
-        <div class="script_placeholder" data-src="https://studio.edx.org/c4x/edX/DemoX/asset/jquery.loupeAndLightbox.js" />
-      </div>
-      <script type="text/javascript">// <![CDATA[
-      JavascriptLoader.executeModuleScripts($('.zooming-image-place').eq(0), function() {
-        $('.loupe').loupeAndLightbox({
-          width: 350,
-          height: 350,
-          lightbox: false
-        });
-      });
-      // ]]></script>
-      <div id="ap_listener_added"></div>
diff --git a/xmodule/tests/__init__.py b/xmodule/tests/__init__.py
index b2cdd67b71ba..786836c050b5 100644
--- a/xmodule/tests/__init__.py
+++ b/xmodule/tests/__init__.py
@@ -1,10 +1,5 @@
 """
 unittests for xmodule
-
-Run like this:
-
-    paver test_lib -l ./xmodule
-
 """
 
 
diff --git a/xmodule/tests/test_capa_block.py b/xmodule/tests/test_capa_block.py
index d1c01e109718..c81b137f1b23 100644
--- a/xmodule/tests/test_capa_block.py
+++ b/xmodule/tests/test_capa_block.py
@@ -3290,7 +3290,7 @@ def test_response_types_ignores_non_response_tags(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['multiplechoiceresponse'],
-                'content': {'display_name': name, 'capa_content': ' Label Some comment Apple Banana Chocolate Donut '}}
+                'content': {'display_name': name, 'capa_content': 'Label Some comment Apple Banana Chocolate Donut'}}
 
     def test_response_types_multiple_tags(self):
         xml = textwrap.dedent("""
@@ -3328,7 +3328,7 @@ def test_response_types_multiple_tags(self):
                 'problem_types': {"optionresponse", "multiplechoiceresponse"},
                 'content': {
                     'display_name': name,
-                    'capa_content': " Label Some comment Donut Buggy '1','2' "
+                    'capa_content': "Label Some comment Donut Buggy '1','2'"
                 },
             }
         )
@@ -3369,7 +3369,7 @@ def test_solutions_not_indexed(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': [],
-                'content': {'display_name': name, 'capa_content': ' '}}
+                'content': {'display_name': name, 'capa_content': ''}}
 
     def test_indexing_checkboxes(self):
         name = "Checkboxes"
@@ -3390,7 +3390,7 @@ def test_indexing_checkboxes(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['choiceresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_dropdown(self):
         name = "Dropdown"
@@ -3405,7 +3405,7 @@ def test_indexing_dropdown(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['optionresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_multiple_choice(self):
         name = "Multiple Choice"
@@ -3424,7 +3424,7 @@ def test_indexing_multiple_choice(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['multiplechoiceresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_numerical_input(self):
         name = "Numerical Input"
@@ -3446,7 +3446,7 @@ def test_indexing_numerical_input(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['numericalresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_text_input(self):
         name = "Text Input"
@@ -3465,7 +3465,7 @@ def test_indexing_text_input(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['stringresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_non_latin_problem(self):
         sample_text_input_problem_xml = textwrap.dedent("""
@@ -3476,7 +3476,7 @@ def test_indexing_non_latin_problem(self):
         """)
         name = "Non latin Input"
         block = self._create_block(sample_text_input_problem_xml, name=name)
-        capa_content = " Δοκιμή με μεταβλητές με Ελληνικούς χαρακτήρες μέσα σε python: $FX1_VAL "
+        capa_content = "Δοκιμή με μεταβλητές με Ελληνικούς χαρακτήρες μέσα σε python: $FX1_VAL"
 
         block_dict = block.index_dictionary()
         assert block_dict['content']['capa_content'] == smart_str(capa_content)
@@ -3503,7 +3503,7 @@ def test_indexing_checkboxes_with_hints_and_feedback(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['choiceresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_dropdown_with_hints_and_feedback(self):
         name = "Dropdown with Hints and Feedback"
@@ -3523,7 +3523,7 @@ def test_indexing_dropdown_with_hints_and_feedback(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['optionresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_multiple_choice_with_hints_and_feedback(self):
         name = "Multiple Choice with Hints and Feedback"
@@ -3543,7 +3543,7 @@ def test_indexing_multiple_choice_with_hints_and_feedback(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['multiplechoiceresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_numerical_input_with_hints_and_feedback(self):
         name = "Numerical Input with Hints and Feedback"
@@ -3561,7 +3561,7 @@ def test_indexing_numerical_input_with_hints_and_feedback(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['numericalresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_text_input_with_hints_and_feedback(self):
         name = "Text Input with Hints and Feedback"
@@ -3579,7 +3579,7 @@ def test_indexing_text_input_with_hints_and_feedback(self):
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': ['stringresponse'],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ').strip()}}
 
     def test_indexing_problem_with_html_tags(self):
         sample_problem_xml = textwrap.dedent("""
@@ -3598,14 +3598,33 @@ def test_indexing_problem_with_html_tags(self):
         """)
         name = "Mixed business"
         block = self._create_block(sample_problem_xml, name=name)
-        capa_content = textwrap.dedent("""
-            This has HTML comment in it.
-            HTML end.
-        """)
+        capa_content = "This has HTML comment in it. HTML end."
         assert block.index_dictionary() ==\
                {'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
                 'problem_types': [],
-                'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}}
+                'content': {'display_name': name, 'capa_content': capa_content}}
+
+    def test_indexing_problem_with_no_whitespace_between_tags(self):
+        """
+        The new (MFE) visual editor for capa problems renders the OLX without spaces between the tags.
+        We want to make sure the index description is still readable and has whitespace.
+        """
+        sample_problem_xml = (
+            "<problem display_name=\"No spaces\">"
+            "<choiceresponse><div>Question text here.</div><checkboxgroup>"
+            "<choice correct=\"true\"><div>Option A</div></choice>"
+            "<choice correct=\"false\"><div>Option B</div></choice>"
+            "</checkboxgroup></choiceresponse>"
+            "</problem>"
+        )
+        name = "No spaces"
+        block = self._create_block(sample_problem_xml, name=name)
+        capa_content = "Question text here. Option A Option B"
+        assert block.index_dictionary() == {
+            'content_type': ProblemBlock.INDEX_CONTENT_TYPE,
+            'problem_types': ['choiceresponse'],
+            'content': {'display_name': name, 'capa_content': capa_content},
+        }
 
     def test_invalid_xml_handling(self):
         """
diff --git a/xmodule/tests/test_course_block.py b/xmodule/tests/test_course_block.py
index 39c6c39e8783..f2956cca0d7e 100644
--- a/xmodule/tests/test_course_block.py
+++ b/xmodule/tests/test_course_block.py
@@ -542,14 +542,27 @@ def test_from_json_with_invalid_provider(self, proctored_exams_setting_enabled):
         with override_settings(FEATURES=FEATURES_WITH_PROCTORED_EXAMS):
             if proctored_exams_setting_enabled:
                 with pytest.raises(InvalidProctoringProvider) as context_manager:
-                    self.proctoring_provider.from_json(provider)
+                    self.proctoring_provider.from_json(provider, validate_providers=True)
                 expected_error = f'The selected proctoring provider, {provider}, is not a valid provider. ' \
                     f'Please select from one of {allowed_proctoring_providers}.'
                 assert str(context_manager.value) == expected_error
             else:
-                provider_value = self.proctoring_provider.from_json(provider)
+                provider_value = self.proctoring_provider.from_json(provider, validate_providers=True)
                 assert provider_value == self.proctoring_provider.default
 
+    def test_from_json_validate_providers(self):
+        """
+        Test that an invalid provider is ignored if validate providers is set to false
+        """
+        provider = 'invalid-provider'
+
+        FEATURES_WITH_PROCTORED_EXAMS = settings.FEATURES.copy()
+        FEATURES_WITH_PROCTORED_EXAMS['ENABLE_PROCTORED_EXAMS'] = True
+
+        with override_settings(FEATURES=FEATURES_WITH_PROCTORED_EXAMS):
+            provider_value = self.proctoring_provider.from_json(provider, validate_providers=False)
+            assert provider_value == provider
+
     def test_from_json_adds_platform_default_for_missing_provider(self):
         """
         Test that a value with no provider will inherit the default provider
diff --git a/xmodule/tests/test_item_bank.py b/xmodule/tests/test_item_bank.py
new file mode 100644
index 000000000000..c27412c8b709
--- /dev/null
+++ b/xmodule/tests/test_item_bank.py
@@ -0,0 +1,522 @@
+"""
+Unit tests for ItemBankBlock.
+"""
+from unittest.mock import MagicMock, Mock, patch
+from random import Random
+
+import ddt
+from fs.memoryfs import MemoryFS
+from lxml import etree
+from rest_framework import status
+from web_fragments.fragment import Fragment
+from xblock.runtime import Runtime as VanillaRuntime
+
+from openedx.core.djangolib.testing.utils import skip_unless_lms, skip_unless_cms
+from xmodule.modulestore.tests.factories import CourseFactory
+from xmodule.modulestore.tests.utils import MixedSplitTestCase
+from xmodule.tests import prepare_block_runtime
+from xmodule.validation import StudioValidationMessage
+from xmodule.x_module import AUTHOR_VIEW
+from xmodule.capa_block import ProblemBlock
+from common.djangoapps.student.tests.factories import UserFactory
+
+from ..item_bank_block import ItemBankBlock
+from .test_course_block import DummySystem as TestImportSystem
+
+dummy_render = lambda block, _: Fragment(block.data)  # pylint: disable=invalid-name
+
+
+class ItemBankTestBase(MixedSplitTestCase):
+    """
+    Base class for tests of ItemBankBlock
+    """
+    maxDiff = None  # We need all the diff we can get for some of these asserts.
+
+    def setUp(self):
+        super().setUp()
+        self.user_id = UserFactory().id
+        self.course = CourseFactory.create(modulestore=self.store)
+        self.chapter = self.make_block(category="chapter", parent_block=self.course, publish_item=True)
+        self.sequential = self.make_block(category="sequential", parent_block=self.chapter, publish_item=True)
+        self.vertical = self.make_block(category="vertical", parent_block=self.sequential, publish_item=True)
+        self.item_bank = self.make_block(
+            category="itembank", parent_block=self.vertical, max_count=1, display_name="My Item Bank", publish_item=True
+        )
+        self.items = [
+            self.make_block(
+                category="problem", parent_block=self.item_bank, display_name=f"My Item {i}",
+                data=f"<p>Hello world from problem {i}</p>",
+                publish_item=True,
+            )
+            for i in range(4)
+        ]
+        self.publisher = Mock()  # for tests that look at analytics
+        self._reload_item_bank()
+
+    def _bind_course_block(self, block):
+        """
+        Bind a block (part of self.course) so we can access student-specific data.
+
+        (Not clear if this is necessary since XModules are all removed now. It's possible that this
+         could be removed without breaking tests.)
+        """
+        prepare_block_runtime(block.runtime, course_id=block.context_key)
+
+        def get_block(descriptor):
+            """Mocks module_system get_block function"""
+            prepare_block_runtime(descriptor.runtime, course_id=block.context_key)
+            descriptor.runtime.get_block_for_descriptor = get_block
+            descriptor.bind_for_student(self.user_id)
+            return descriptor
+
+        block.runtime.get_block_for_descriptor = get_block
+
+    def _reload_item_bank(self):
+        """
+        Reload self.item_bank. Do this if you want its `.children` list to be updated with what's in the db.
+
+        HACK: These test cases don't persist student state, but some tests need `selected` to persist betweem item_bank
+        reloads. So, we just transfer it from the old item_bank object instance to the new one, as if it were persisted.
+        """
+        selected = self.item_bank.selected
+        self.item_bank = self.store.get_item(self.item_bank.usage_key)
+        self._bind_course_block(self.item_bank)
+        if selected:
+            self.item_bank.selected = selected
+        self.item_bank.runtime.publish = self.publisher
+
+
+@skip_unless_cms
+class TestItemBankForCms(ItemBankTestBase):
+    """
+    Test Studio ItemBank behaviors -- export/import, validation, author-facing views.
+    """
+    def test_xml_export_import_cycle(self):
+        """
+        Test the export-import cycle.
+        """
+        # Export self.item_bank to the virtual filesystem
+        export_fs = MemoryFS()
+        self.item_bank.runtime.export_fs = export_fs  # pylint: disable=protected-access
+        node = etree.Element("unknown_root")
+        self.item_bank.add_xml_to_node(node)
+
+        # Read back the itembank OLX
+        with export_fs.open('{dir}/{file_name}.xml'.format(
+            dir=self.item_bank.scope_ids.usage_id.block_type,
+            file_name=self.item_bank.scope_ids.usage_id.block_id
+        )) as f:
+            actual_olx_export = f.read()
+
+        # And compare.
+        expected_olx_export = (
+            '<itembank display_name="My Item Bank" max_count="1">\n'
+            '  <problem url_name="My_Item_0"/>\n'
+            '  <problem url_name="My_Item_1"/>\n'
+            '  <problem url_name="My_Item_2"/>\n'
+            '  <problem url_name="My_Item_3"/>\n'
+            '</itembank>\n'
+        )
+        assert actual_olx_export == expected_olx_export
+        olx_element = etree.fromstring(actual_olx_export)
+
+        # Re-import the OLX.
+        runtime = TestImportSystem(load_error_blocks=True, course_id=self.item_bank.context_key)
+        runtime.resources_fs = export_fs
+        imported_item_bank = ItemBankBlock.parse_xml(olx_element, runtime, None)
+
+        # And make sure the result looks right.
+        self._verify_xblock_properties(imported_item_bank)
+
+    def _verify_xblock_properties(self, imported_item_bank):
+        """
+        Check the new XBlock has the same properties as the old one.
+        """
+        assert imported_item_bank.display_name == self.item_bank.display_name
+        assert imported_item_bank.max_count == self.item_bank.max_count
+        assert len(imported_item_bank.children) == len(self.item_bank.children)
+
+    def test_max_count_validation(self):
+        """
+        Test that the validation method of ItemBankBlocks can warn the user about problems with settings (max_count).
+        """
+        # Ensure we're starting with clean validation
+        assert self.item_bank.validate()
+
+        # Ensure that setting the max_count too high (> than # of children) raises a validation warning.
+        self.item_bank.max_count = 50
+        assert len(self.item_bank.selected_children()) == 4
+        assert not (result := self.item_bank.validate())
+        assert StudioValidationMessage.WARNING == result.summary.type
+        assert 'configured to show 50 problems, but only 4 have been selected' in result.summary.text
+
+        # Now set max_count to valid value (<= than # of children), and ensure the validation error goes away.
+        self.item_bank.max_count = 3
+        assert len(self.item_bank.selected_children()) == 3
+        assert self.item_bank.validate()
+
+        # Ensure that setting max_count to 0 raises a validation error.
+        self.item_bank.max_count = 0
+        assert len(self.item_bank.selected_children()) == 0
+        assert not (result := self.item_bank.validate())
+        assert StudioValidationMessage.ERROR == result.summary.type
+        assert 'configured to show 0 problems. Please specify' in result.summary.text
+
+        # Finally, set max_count to -1, and ensure the validation error goes away.
+        self.item_bank.max_count = -1
+        assert len(self.item_bank.selected_children()) == 4
+        assert self.item_bank.validate()
+
+    @patch(
+        'xmodule.modulestore.split_mongo.caching_descriptor_system.CachingDescriptorSystem.render',
+        VanillaRuntime.render,
+    )
+    @patch('xmodule.capa_block.ProblemBlock.author_view', dummy_render, create=True)
+    @patch('xmodule.x_module.DescriptorSystem.applicable_aside_types', lambda self, block: [])
+    def test_preview_view(self):
+        """ Test preview view rendering """
+        self._bind_course_block(self.item_bank)
+        rendered = self.item_bank.render(AUTHOR_VIEW, {'root_xblock': self.item_bank})
+        assert '<p>Hello world from problem 0</p>' in rendered.content
+        assert '<p>Hello world from problem 1</p>' in rendered.content
+        assert '<p>Hello world from problem 2</p>' in rendered.content
+        assert '<p>Hello world from problem 3</p>' in rendered.content
+
+    @patch(
+        'xmodule.modulestore.split_mongo.caching_descriptor_system.CachingDescriptorSystem.render',
+        VanillaRuntime.render,
+    )
+    @patch('xmodule.capa_block.ProblemBlock.author_view', dummy_render, create=True)
+    @patch('xmodule.x_module.DescriptorSystem.applicable_aside_types', lambda self, block: [])
+    def test_author_view(self):
+        """ Test author view rendering """
+        self._bind_course_block(self.item_bank)
+        rendered = self.item_bank.render(AUTHOR_VIEW, {})
+        assert 'Learners will see 1 of the 4 selected components' in rendered.content
+        assert '<li>My Item 0</li>' in rendered.content
+        assert '<li>My Item 1</li>' in rendered.content
+        assert '<li>My Item 2</li>' in rendered.content
+        assert '<li>My Item 3</li>' in rendered.content
+
+
+@skip_unless_lms
+@ddt.ddt
+class TestItemBankForLms(ItemBankTestBase):
+    """
+    Test LMS ItemBank features: selection, analytics, resetting problems.
+    """
+
+    def _assert_event_was_published(self, event_type):
+        """
+        Check that a LegacyLibraryContentBlock analytics event was published by self.item_bank.
+        """
+        assert self.publisher.called
+        assert len(self.publisher.call_args[0]) == 3  # pylint:disable=unsubscriptable-object
+        _, event_name, event_data = self.publisher.call_args[0]  # pylint:disable=unsubscriptable-object
+        assert event_name == f'edx.itembankblock.content.{event_type}'
+        assert event_data['location'] == str(self.item_bank.usage_key)
+        return event_data
+
+    def test_children_seen_by_a_user(self):
+        """
+        Test that each student sees only one block as a child of the LibraryContent block.
+        """
+        self._bind_course_block(self.item_bank)
+        # Make sure the runtime knows that the block's children vary per-user:
+        assert self.item_bank.has_dynamic_children()
+
+        assert len(self.item_bank.children) == len(self.items)
+
+        # Check how many children each user will see:
+        assert len(self.item_bank.get_child_blocks()) == 1
+        # Check that get_content_titles() doesn't return titles for hidden/unused children
+        assert len(self.item_bank.get_content_titles()) == 1
+
+    def test_overlimit_blocks_chosen_randomly(self):
+        """
+        Tests that blocks to remove from selected children are chosen
+        randomly when len(selected) > max_count.
+        """
+        blocks_seen = set()
+        total_tries, max_tries = 0, 100
+
+        self._bind_course_block(self.item_bank)
+
+        # Eventually, we should see every child block selected
+        while len(blocks_seen) != len(self.items):
+            self._change_count_and_reselect_children(len(self.items))
+            # Now set the number of selections to 1
+            selected = self._change_count_and_reselect_children(1)
+            blocks_seen.update(selected)
+            total_tries += 1
+            if total_tries >= max_tries:
+                # The chance that this happens by accident is (4 * (3/4)^100) ~= 1/10^12
+                assert False, "Max tries exceeded before seeing all blocks."
+                break
+
+    def _change_count_and_reselect_children(self, count):
+        """
+        Helper method that changes the max_count of self.item_bank, reselects
+        children, and asserts that the number of selected children equals the count provided.
+        """
+        self.item_bank.max_count = count
+        selected = self.item_bank.get_child_blocks()
+        assert len(selected) == count
+        return selected
+
+    @ddt.data(
+        # User resets selected children with reset button on content block
+        (True, 5),
+        # User resets selected children without reset button on content block
+        (False, 5),
+        # User resets selected children with reset button on content block when all library blocks should be selected.
+        (True, -1),
+    )
+    @ddt.unpack
+    def test_reset_selected_children_capa_blocks(self, allow_resetting_children, max_count):
+        """
+        Tests that the `reset_selected_children` method of a content block resets only
+        XBlocks that have a `reset_problem` attribute when `allow_resetting_children` is True
+
+        This test block has 4 HTML XBlocks and 4 Problem XBlocks. Therefore, if we ensure
+        that the `reset_problem` has been called len(self.problem_types) times, then
+        it means that this is working correctly
+        """
+        # Add a non-ProblemBlock just to make sure that this setting doesn't break with it.
+        self.make_block(category="html", parent_block=self.item_bank)
+        self._reload_item_bank()
+
+        self.item_bank.allow_resetting_children = allow_resetting_children
+        self.item_bank.max_count = max_count
+
+        # Mock the student view to return an empty dict to be returned as response
+        self.item_bank.student_view = MagicMock()
+        self.item_bank.student_view.return_value.content = {}
+
+        with patch.object(ProblemBlock, 'reset_problem', return_value={'success': True}) as reset_problem:
+            response = self.item_bank.reset_selected_children(None, None)
+
+        if allow_resetting_children:
+            self.item_bank.student_view.assert_called_once_with({})
+            assert reset_problem.call_count == 4  # the # of problems in self.items
+            assert response.status_code == status.HTTP_200_OK
+            assert response.content_type == "text/html"
+            assert response.body == b"{}"
+        else:
+            reset_problem.assert_not_called()
+            assert response.status_code == status.HTTP_400_BAD_REQUEST
+
+    def test_assigned_event(self):
+        """
+        Test the "assigned" event emitted when a student is assigned specific blocks.
+        """
+        # In the beginning was the itembank and it assigned one child to the student:
+        child = self.item_bank.get_child_blocks()[0]
+        event_data = self._assert_event_was_published("assigned")
+        block_info = {
+            "usage_key": str(child.usage_key),
+        }
+        assert event_data ==\
+               {'location': str(self.item_bank.usage_key),
+                'added': [block_info],
+                'result': [block_info],
+                'previous_count': 0, 'max_count': 1}
+        self.publisher.reset_mock()
+
+        # Now increase max_count so that one more child will be added:
+        self.item_bank.max_count = 2
+        children = self.item_bank.get_child_blocks()
+        assert len(children) == 2
+        child, new_child = children if children[0].usage_key == child.usage_key else reversed(children)
+        event_data = self._assert_event_was_published("assigned")
+        assert event_data['added'][0]['usage_key'] == str(new_child.usage_key)
+        assert len(event_data['result']) == 2
+        assert event_data['previous_count'] == 1
+        assert event_data['max_count'] == 2
+
+    def test_removed_overlimit(self):
+        """
+        Test the "removed" event emitted when we un-assign blocks previously assigned to a student.
+        We go from one blocks assigned to none because max_count has been decreased.
+        """
+        # Decrease max_count to 1, causing the block to be overlimit:
+        self.item_bank.get_child_blocks()  # This line is needed in the test environment or the change has no effect
+        self.publisher.reset_mock()  # Clear the "assigned" event that was just published.
+        self.item_bank.max_count = 0
+
+        # Check that the event says that one block was removed, leaving no blocks left:
+        children = self.item_bank.get_child_blocks()
+        assert len(children) == 0
+        event_data = self._assert_event_was_published("removed")
+        assert len(event_data['removed']) == 1
+        assert event_data['result'] == []
+        assert event_data['reason'] == 'overlimit'
+
+    @ddt.data(
+        (
+            [("problem", "My_Item_1"), ("problem", "My_Item_2")],
+            ("problem", "My_Item_1"),
+            [("problem", "My_Item_2"), ("problem", "My_Item_3")],
+        ),
+        (
+            [("problem", "My_Item_1"), ("problem", "My_Item_2")],
+            ("problem", "My_Item_2"),
+            [("problem", "My_Item_1"), ("problem", "My_Item_3")],
+        ),
+        (
+            [("problem", "My_Item_3"), ("problem", "My_Item_0")],
+            ("problem", "My_Item_3"),
+            [("problem", "My_Item_2"), ("problem", "My_Item_3")],
+        ),
+        (
+            [("problem", "My_Item_3"), ("problem", "My_Item_0")],
+            ("problem", "My_Item_0"),
+            [("problem", "My_Item_3"), ("problem", "My_Item_2")],
+        ),
+    )
+    @ddt.unpack
+    def test_removed_invalid(self, to_select_initial, to_drop, to_select_new):
+        """
+        Test the "removed" event emitted when we un-assign blocks previously assigned to a student.
+
+        In this test, we keep `.max_count==2`, but do a series of two removals from `.children`.
+
+        * Initial condition: 4 children, 2 assigned.                       0  [1] [2]  3
+        * First deletion: one of the assigned blocks, e.g. block 1.
+        * New condition: 3 children, 2 assigned.                           0   _  [2] [3]
+        * Selecond deletion: the other two assigned blocks (2 and 3).
+        * Final condition:  1 child, 1 assigned.                          [0]  _   _   _
+
+        The grid on the right shows how the test should go for our first ddt case.
+        """
+        # pylint: disable=too-many-statements
+
+        # Start by assigning two blocks to the student:
+        self.item_bank.max_count = 2
+        self.store.update_item(self.item_bank, self.user_id)
+
+        # Initial selection
+        assert len(self.item_bank.children) == 4
+        children_initial = [(child.block_type, child.block_id) for child in self.item_bank.children]
+        with patch.object(Random, "sample", _make_mock_sample(children_initial, to_select_initial)):
+            with patch.object(Random, "shuffle", _make_mock_shuffle(to_select_initial)):
+                selected_initial = self.item_bank.selected_children()
+        assert len(selected_initial) == 2
+        self.publisher.reset_mock()  # Clear the "assigned" event that was just published.
+
+        # Now make sure that one of the assigned blocks will have to be un-assigned.
+        # To cause an "invalid" event, we delete exactly one of the currently-assigned children:
+        (to_keep,) = set(selected_initial) - set([to_drop])
+        to_keep_usage_key = self.course.context_key.make_usage_key(*to_keep)
+        to_drop_usage_key = self.course.context_key.make_usage_key(*to_drop)
+        self.store.delete_item(to_drop_usage_key, self.user_id)
+        self._reload_item_bank()
+        assert len(self.item_bank.children) == 3  # Sanity: We had 4 blocks, we deleted 1, should be 3 left.
+
+        # Because there are 3 available children and max_count==2, when we reselect children for assignment,
+        # we should get 2. To maximize stability from the student's perspective, we expect that one of those children
+        # was the one that was previously assigned (to_keep).
+        remaining_selectable = set(children_initial) - {to_keep, to_drop}
+        to_add = set(to_select_new) & remaining_selectable
+        assert len(to_add) == 1  # sanity check
+        with patch.object(Random, "sample", _make_mock_sample(remaining_selectable, to_add)):
+            with patch.object(Random, "shuffle", _make_mock_shuffle(to_select_new)):
+                selected_new = self.item_bank.selected_children()
+        assert len(selected_new) == 2
+        assert to_keep in selected_new
+        assert to_drop not in selected_new
+        selected_new_usage_keys = [self.course.context_key.make_usage_key(*sel) for sel in selected_new]
+
+        # and, obviously, the one block that was added to the selection should be one of the remaining 3 children.
+        (added_usage_key,) = set(selected_new_usage_keys) - set([to_keep_usage_key])
+        added = (added_usage_key.block_type, added_usage_key.block_id)
+        assert added_usage_key in self.item_bank.children
+
+        # Check that the event says that one block was removed and one was added
+        assert self.publisher.call_count == 2
+        _, removed_event_name, removed_event_data = self.publisher.call_args_list[0][0]
+        assert removed_event_name == "edx.itembankblock.content.removed"
+        assert removed_event_data == {
+            "location": str(self.item_bank.usage_key),
+            "result": [{"usage_key": str(uk)} for uk in selected_new_usage_keys],
+            "previous_count": 2,
+            "max_count": 2,
+            "removed": [{"usage_key": str(to_drop_usage_key)}],
+            "reason": "invalid",
+        }
+        _, assigned_event_name, assigned_event_data = self.publisher.call_args_list[1][0]
+        assert assigned_event_name == "edx.itembankblock.content.assigned"
+        assert assigned_event_data == {
+            "location": str(self.item_bank.usage_key),
+            "result": [{"usage_key": str(uk)} for uk in selected_new_usage_keys],
+            "previous_count": 2,
+            "max_count": 2,
+            "added": [{"usage_key": str(added_usage_key)}],
+        }
+        self.publisher.reset_mock()  # Clear these events
+
+        # Now drop both of the selected blocks, so that only 1 remains (less than max_count).
+        for selected in selected_new:
+            self.store.delete_item(self.course.id.make_usage_key(*selected), self.user_id)
+        self._reload_item_bank()
+        assert len(self.item_bank.children) == 1  # Sanity: We had 3 blocks, we deleted 2, should be 1 left.
+
+        # The remaining block should be one of the itembank's children, and it shouldn't be one of the ones that we had
+        # removed from the children.
+        (final,) = self.item_bank.selected_children()
+        final_usage_key = self.course.context_key.make_usage_key(*final)
+        assert final_usage_key in self.item_bank.children
+        assert final in children_initial
+        assert final not in {to_keep, to_drop, added}
+
+        # Check that the event says that two blocks were removed and one added
+        assert self.publisher.call_count == 2
+        _, removed_event_name, removed_event_data = self.publisher.call_args_list[0][0]
+        assert removed_event_name == "edx.itembankblock.content.removed"
+        assert removed_event_data == {
+            "location": str(self.item_bank.usage_key),
+            "result": [{"usage_key": str(final_usage_key)}],
+            "previous_count": 2,
+            "max_count": 2,
+            "removed": [{"usage_key": str(uk)} for uk in sorted(selected_new_usage_keys)],
+            "reason": "invalid",
+        }
+        _, assigned_event_name, assigned_event_data = self.publisher.call_args_list[1][0]
+        assert assigned_event_name == "edx.itembankblock.content.assigned"
+        assert assigned_event_data == {
+            "location": str(self.item_bank.usage_key),
+            "result": [{"usage_key": str(final_usage_key)}],
+            "previous_count": 1,
+            "max_count": 2,
+            "added": [{"usage_key": str(final_usage_key)}],
+        }
+
+
+def _make_mock_sample(expected_pool, mock_sample):
+    """
+    A replacement for Random.sample that confirms that the pool and sample size are as expected.
+    """
+    def sample(_self, pool, desired_sample_size):
+        """
+        The mock implementation.
+        """
+        assert set(pool) == set(expected_pool)
+        assert len(mock_sample) == desired_sample_size
+        return mock_sample
+
+    return sample
+
+
+def _make_mock_shuffle(mock_result):
+    """
+    A replacement for Random.shuffle which confirms that the provided mock_result has the same set of items as
+    the selection we're shuffling.
+    """
+    def shuffle(_self, selection):
+        """
+        The mock implementation.
+        """
+        assert set(selection) == set(mock_result)
+        return mock_result
+
+    return shuffle
diff --git a/xmodule/tests/test_library_content.py b/xmodule/tests/test_library_content.py
index e30e19922be5..092606142e1d 100644
--- a/xmodule/tests/test_library_content.py
+++ b/xmodule/tests/test_library_content.py
@@ -1,7 +1,5 @@
 """
-Basic unit tests for LibraryContentBlock
-
-Higher-level tests are in `cms/djangoapps/contentstore/tests/test_libraries.py`.
+Basic unit tests for LegacyLibraryContentBlock
 """
 from unittest.mock import MagicMock, Mock, patch
 
@@ -9,15 +7,15 @@
 from bson.objectid import ObjectId
 from fs.memoryfs import MemoryFS
 from lxml import etree
-from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
+from opaque_keys.edx.locator import LibraryLocator
 from rest_framework import status
 from search.search_engine_base import SearchEngine
 from web_fragments.fragment import Fragment
 from xblock.runtime import Runtime as VanillaRuntime
 
 from openedx.core.djangolib.testing.utils import skip_unless_cms
-from xmodule.library_content_block import ANY_CAPA_TYPE_VALUE, LibraryContentBlock
-from xmodule.library_tools import LibraryToolsService
+from xmodule.library_content_block import ANY_CAPA_TYPE_VALUE, LegacyLibraryContentBlock
+from xmodule.library_tools import LegacyLibraryToolsService
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.tests.factories import CourseFactory, LibraryFactory
 from xmodule.modulestore.tests.utils import MixedSplitTestCase
@@ -33,15 +31,15 @@
 
 
 @skip_unless_cms
-class LibraryContentTest(MixedSplitTestCase):
+class LegacyLibraryContentTest(MixedSplitTestCase):
     """
-    Base class for tests of LibraryContentBlock (library_content_block.py)
+    Base class for tests of LegacyLibraryContentBlock (library_content_block.py)
     """
 
     def setUp(self):
         super().setUp()
         self.user_id = UserFactory().id
-        self.tools = LibraryToolsService(self.store, self.user_id)
+        self.tools = LegacyLibraryToolsService(self.store, self.user_id)
         self.library = LibraryFactory.create(modulestore=self.store)
         self.lib_blocks = [
             self.make_block("html", self.library, data=f"Hello world from block {i}")
@@ -88,29 +86,22 @@ def get_block(descriptor):
 
 
 @ddt.ddt
-class LibraryContentGeneralTest(LibraryContentTest):
+class LegacyLibraryContentGeneralTest(LegacyLibraryContentTest):
     """
-    Test the base functionality of the LibraryContentBlock.
+    Test the base functionality of the LegacyLibraryContentBlock.
     """
 
-    @ddt.data(
-        ('library-v1:ProblemX+PR0B', LibraryLocator),
-        ('lib:ORG:test-1', LibraryLocatorV2)
-    )
-    @ddt.unpack
-    def test_source_library_key(self, library_key, expected_locator_type):
+    def test_source_library_key(self):
         """
         Test the source_library_key property of the xblock.
-
-        The method should correctly work either with V1 or V2 libraries.
         """
         library = self.make_block(
             "library_content",
             self.vertical,
             max_count=1,
-            source_library_id=library_key
+            source_library_id='library-v1:ProblemX+PR0B',
         )
-        assert isinstance(library.source_library_key, expected_locator_type)
+        assert isinstance(library.source_library_key, LibraryLocator)
 
     def test_initial_sync_from_library(self):
         """
@@ -133,9 +124,9 @@ def test_initial_sync_from_library(self):
         assert len(self.lc_block.children) == len(self.lib_blocks)
 
 
-class TestLibraryContentExportImport(LibraryContentTest):
+class TestLibraryContentExportImport(LegacyLibraryContentTest):
     """
-    Export and import tests for LibraryContentBlock
+    Export and import tests for LegacyLibraryContentBlock
     """
     def setUp(self):
         super().setUp()
@@ -173,7 +164,6 @@ def _verify_xblock_properties(self, imported_lc_block):
         assert imported_lc_block.display_name == self.lc_block.display_name
         assert imported_lc_block.source_library_id == self.lc_block.source_library_id
         assert imported_lc_block.source_library_version == self.lc_block.source_library_version
-        assert imported_lc_block.mode == self.lc_block.mode
         assert imported_lc_block.max_count == self.lc_block.max_count
         assert imported_lc_block.capa_type == self.lc_block.capa_type
         assert len(imported_lc_block.children) == len(self.lc_block.children)
@@ -195,13 +185,13 @@ def test_xml_export_import_cycle(self):
 
         # Now import it.
         olx_element = etree.fromstring(exported_olx)
-        imported_lc_block = LibraryContentBlock.parse_xml(olx_element, self.runtime, None)
+        imported_lc_block = LegacyLibraryContentBlock.parse_xml(olx_element, self.runtime, None)
 
         self._verify_xblock_properties(imported_lc_block)
 
     def test_xml_import_with_comments(self):
         """
-        Test that XML comments within LibraryContentBlock are ignored during the import.
+        Test that XML comments within LegacyLibraryContentBlock are ignored during the import.
         """
         olx_with_comments = (
             '<!-- Comment -->\n'
@@ -219,15 +209,15 @@ def test_xml_import_with_comments(self):
 
         # Import the olx.
         olx_element = etree.fromstring(olx_with_comments)
-        imported_lc_block = LibraryContentBlock.parse_xml(olx_element, self.runtime, None)
+        imported_lc_block = LegacyLibraryContentBlock.parse_xml(olx_element, self.runtime, None)
 
         self._verify_xblock_properties(imported_lc_block)
 
 
 @ddt.ddt
-class LibraryContentBlockTestMixin:
+class LegacyLibraryContentBlockTestMixin:
     """
-    Basic unit tests for LibraryContentBlock
+    Basic unit tests for LegacyLibraryContentBlock
     """
     problem_types = [
         ["multiplechoiceresponse"], ["optionresponse"], ["optionresponse", "coderesponse"],
@@ -424,8 +414,8 @@ def test_non_editable_settings(self):
         Test the settings that are marked as "non-editable".
         """
         non_editable_metadata_fields = self.lc_block.non_editable_metadata_fields
-        assert LibraryContentBlock.mode in non_editable_metadata_fields
-        assert LibraryContentBlock.display_name not in non_editable_metadata_fields
+        assert LegacyLibraryContentBlock.source_library_version in non_editable_metadata_fields
+        assert LegacyLibraryContentBlock.display_name not in non_editable_metadata_fields
 
     def test_overlimit_blocks_chosen_randomly(self):
         """
@@ -503,7 +493,7 @@ def test_reset_selected_children_capa_blocks(self, allow_resetting_children, max
 
 
 @patch.object(SearchEngine, 'get_search_engine', Mock(return_value=None, autospec=True))
-class TestLibraryContentBlockWithSearchIndex(LibraryContentBlockTestMixin, LibraryContentTest):
+class TestLegacyLibraryContentBlockWithSearchIndex(LegacyLibraryContentBlockTestMixin, LegacyLibraryContentTest):
     """
     Tests for library container with mocked search engine response.
     """
@@ -532,9 +522,9 @@ def setUp(self):
 )
 @patch('xmodule.html_block.HtmlBlock.author_view', dummy_render, create=True)
 @patch('xmodule.x_module.DescriptorSystem.applicable_aside_types', lambda self, block: [])
-class TestLibraryContentRender(LibraryContentTest):
+class TestLibraryContentRender(LegacyLibraryContentTest):
     """
-    Rendering unit tests for LibraryContentBlock
+    Rendering unit tests for LegacyLibraryContentBlock
     """
 
     def setUp(self):
@@ -559,9 +549,9 @@ def test_author_view(self):
         # but some js initialization should happen
 
 
-class TestLibraryContentAnalytics(LibraryContentTest):
+class TestLibraryContentAnalytics(LegacyLibraryContentTest):
     """
-    Test analytics features of LibraryContentBlock
+    Test analytics features of LegacyLibraryContentBlock
     """
 
     def setUp(self):
@@ -573,7 +563,7 @@ def setUp(self):
 
     def _assert_event_was_published(self, event_type):
         """
-        Check that a LibraryContentBlock analytics event was published by self.lc_block.
+        Check that a LegacyLibraryContentBlock analytics event was published by self.lc_block.
         """
         assert self.publisher.called
         assert len(self.publisher.call_args[0]) == 3  # pylint:disable=unsubscriptable-object
diff --git a/xmodule/tests/test_library_tools.py b/xmodule/tests/test_library_tools.py
index f93066cd5c63..30b007c3d963 100644
--- a/xmodule/tests/test_library_tools.py
+++ b/xmodule/tests/test_library_tools.py
@@ -1,23 +1,20 @@
 """
-Tests for library tools service (only used by CMS)
+Tests for legacy library tools service (only used by CMS)
 
-Currently, the only known user of the LibraryToolsService is the
-LibraryContentBlock, so these tests are all written with only that
+The only known user of the LegacyLibraryToolsService is the
+LegacyLibraryContentBlock, so these tests are all written with only that
 block type in mind.
 """
 
 from unittest import mock
 
 import ddt
-from django.conf import settings
-from django.test import override_settings
-from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
+from opaque_keys.edx.locator import LibraryLocator
 
-from common.djangoapps.student.roles import CourseInstructorRole
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangolib.testing.utils import skip_unless_cms
 from openedx.core.djangoapps.content_libraries.tests.base import ContentLibrariesRestApiTest
-from xmodule.library_tools import LibraryToolsService
+from xmodule.library_tools import LegacyLibraryToolsService
 from xmodule.modulestore.tests.factories import CourseFactory, LibraryFactory
 from xmodule.modulestore.tests.utils import MixedSplitTestCase
 
@@ -26,34 +23,23 @@
 @ddt.ddt
 class ContentLibraryToolsTest(MixedSplitTestCase, ContentLibrariesRestApiTest):
     """
-    Tests for LibraryToolsService.
-
-    Tests interaction with learning-core-based (V2) and mongo-based (V1) content libraries.
+    Tests for LegacyLibraryToolsService.
     """
     def setUp(self):
         super().setUp()
         UserFactory(is_staff=True, id=self.user_id)
-        self.tools = LibraryToolsService(self.store, self.user_id)
+        self.tools = LegacyLibraryToolsService(self.store, self.user_id)
 
     def test_list_available_libraries(self):
         """
-        Test listing of libraries.
-
-        Collects Only V2 Libaries if the FEATURES[ENABLE_LIBRARY_AUTHORING_MICROFRONTEND] setting is True.
-        Otherwise, return all v1 and v2 libraries.
+        Test listing of v1 libraries.
         """
         # create V1 library
         _ = LibraryFactory.create(modulestore=self.store)
-        # create V2 library
+        # create V2 library (should not be included in this list)
         self._create_library(slug="testlib1_preview", title="Test Library 1", description="Testing XBlocks")
         all_libraries = self.tools.list_available_libraries()
-        assert all_libraries
-        assert len(all_libraries) == 2
-
-        with override_settings(FEATURES={**settings.FEATURES, "ENABLE_LIBRARY_AUTHORING_MICROFRONTEND": True}):
-            all_libraries = self.tools.list_available_libraries()
-            assert all_libraries
-            assert len(all_libraries) == 1
+        assert len(all_libraries) == 1
 
     @mock.patch('xmodule.modulestore.split_mongo.split.SplitMongoModuleStore.get_library_summaries')
     def test_list_available_libraries_fetch(self, mock_get_library_summaries):
@@ -63,7 +49,7 @@ def test_list_available_libraries_fetch(self, mock_get_library_summaries):
         _ = self.tools.list_available_libraries()
         assert mock_get_library_summaries.called
 
-    def test_get_latest_v1_library_version(self):
+    def test_get_latest_library_version(self):
         """
         Test get_v1_library_version for V1 libraries.
 
@@ -84,49 +70,16 @@ def test_get_latest_v1_library_version(self):
         assert result == str(lib.location.library_key.version_guid)
 
     @ddt.data(
-        'library-v1:Fake+Key',  # V1 library key
-        'lib:Fake:V-2',         # V2 library key
+        'library-v1:Fake+Key',
         LibraryLocator.from_string('library-v1:Fake+Key'),
-        LibraryLocatorV2.from_string('lib:Fake:V-2'),
     )
     def test_get_latest_library_version_no_library(self, lib_key):
         """
         Test get_latest_library_version result when the library does not exist.
-
-        Provided lib_key's are valid V1 or V2 keys.
         """
         assert self.tools.get_latest_library_version(lib_key) is None
 
-    def test_update_children_for_v2_lib(self):
-        """
-        Test update_children with V2 library as a source.
-        """
-        library = self._create_library(
-            slug="cool-v2-lib", title="The best Library", description="Spectacular description"
-        )
-        self._add_block_to_library(library["id"], "unit", "unit1_id")
-
-        course = CourseFactory.create(modulestore=self.store, user_id=self.user.id)
-        CourseInstructorRole(course.id).add_users(self.user)
-
-        content_block = self.make_block(
-            "library_content",
-            course,
-            max_count=1,
-            source_library_id=library['id']
-        )
-        assert len(content_block.children) == 0
-
-        # Populate children from library
-        self.tools.trigger_library_sync(content_block, library_version=None)
-
-        # The updates happen in a Celery task, so this particular content_block instance is no updated.
-        # We must re-instantiate it from modulstore in order to see the updated children list.
-        content_block = self.store.get_item(content_block.location)
-
-        assert len(content_block.children) == 1
-
-    def test_update_children_for_v1_lib(self):
+    def test_update_children(self):
         """
         Test update_children with V1 library as a source.
 
diff --git a/xmodule/tests/test_randomize_block.py b/xmodule/tests/test_randomize_block.py
index deebdfe4f1d6..52413faad3b7 100644
--- a/xmodule/tests/test_randomize_block.py
+++ b/xmodule/tests/test_randomize_block.py
@@ -16,7 +16,7 @@
 
 class RandomizeBlockTest(MixedSplitTestCase):
     """
-    Base class for tests of LibraryContentBlock (library_content_block.py)
+    Base class for tests of RandomizeBlock (randomize_block.py)
     """
     maxDiff = None
 
diff --git a/xmodule/tests/test_resource_templates.py b/xmodule/tests/test_resource_templates.py
index 742a7e9da199..470be9551489 100644
--- a/xmodule/tests/test_resource_templates.py
+++ b/xmodule/tests/test_resource_templates.py
@@ -18,7 +18,6 @@ class ResourceTemplatesTests(unittest.TestCase):
     def test_templates(self):
         expected = {
             'latex_html.yaml',
-            'zooming_image.yaml',
             'announcement.yaml',
             'anon_user_id.yaml'}
         got = {t['template_id'] for t in TestClass.templates()}
@@ -38,7 +37,6 @@ def test_get_custom_template(self):
     def test_custom_templates(self):
         expected = {
             'latex_html.yaml',
-            'zooming_image.yaml',
             'announcement.yaml',
             'anon_user_id.yaml'}
         got = {t['template_id'] for t in TestClassResourceTemplate.templates()}
diff --git a/xmodule/tests/test_util_builtin_assets.py b/xmodule/tests/test_util_builtin_assets.py
index bc26bed3d6be..b922ec4b6a65 100644
--- a/xmodule/tests/test_util_builtin_assets.py
+++ b/xmodule/tests/test_util_builtin_assets.py
@@ -10,32 +10,23 @@
 from xmodule.util import builtin_assets
 
 
-class AddSassToFragmentTests(TestCase):
+class AddCssToFragmentTests(TestCase):
     """
-    Tests for add_sass_to_fragment.
-
-    We would have liked to also test two additional cases:
-    * When a theme is enabled, and add_sass_to_fragment is called with a
-      theme-overriden Sass file, then a URL to themed CSS is added.
-    * When a theme is enabled, but add_sass_to_fragment is called with a Sass
-      file that the theme doesn't override, then a URL to the original (unthemed)
-      CSS is added.
-    Unfortunately, under edx-platform tests, settings.STATICFILES_STORAGE does not
-    include the ThemeStorage class, so themed URL generation doesn't work.
+    Tests for add_css_to_fragment.
     """
 
     def test_absolute_path_raises_value_error(self):
         fragment = Fragment()
         with self.assertRaises(ValueError):
-            builtin_assets.add_sass_to_fragment(
+            builtin_assets.add_css_to_fragment(
                 fragment,
-                "/openedx/edx-platform/xmodule/assets/ProblemBlockDisplay.scss",
+                "/openedx/edx-platform/xmodule/assets/VideoBlockEditor.css",
             )
 
-    def test_not_scss_raises_value_error(self):
+    def test_not_css_raises_value_error(self):
         fragment = Fragment()
         with self.assertRaises(ValueError):
-            builtin_assets.add_sass_to_fragment(
+            builtin_assets.add_css_to_fragment(
                 fragment,
                 "vertical/public/js/vertical_student_view.js"
             )
@@ -43,26 +34,26 @@ def test_not_scss_raises_value_error(self):
     def test_misspelled_path_raises_not_found(self):
         fragment = Fragment()
         with self.assertRaises(FileNotFoundError):
-            builtin_assets.add_sass_to_fragment(
+            builtin_assets.add_css_to_fragment(
                 fragment,
-                "ProblemBlockDisplayyyy.scss",
+                "VideoBlockEditorrrrr.css",
             )
 
     def test_static_file_missing_raises_improperly_configured(self):
         fragment = Fragment()
         with patch.object(builtin_assets, 'get_static_file_url', lambda _path: None):
             with self.assertRaises(ImproperlyConfigured):
-                builtin_assets.add_sass_to_fragment(
+                builtin_assets.add_css_to_fragment(
                     fragment,
-                    "ProblemBlockDisplay.scss",
+                    "VideoBlockEditor.css",
                 )
 
     def test_happy_path(self):
         fragment = Fragment()
-        builtin_assets.add_sass_to_fragment(fragment, "ProblemBlockDisplay.scss")
+        builtin_assets.add_css_to_fragment(fragment, "VideoBlockEditor.css")
         assert fragment.resources[0] == FragmentResource(
             kind='url',
-            data='/static/css/ProblemBlockDisplay.css',
+            data='/static/css-builtin-blocks/VideoBlockEditor.css',
             mimetype='text/css',
             placement='head',
         )
diff --git a/xmodule/util/builtin_assets.py b/xmodule/util/builtin_assets.py
index aaedc44cc649..cb1fca721414 100644
--- a/xmodule/util/builtin_assets.py
+++ b/xmodule/util/builtin_assets.py
@@ -12,35 +12,30 @@
 from openedx.core.djangoapps.theming.helpers_static import get_static_file_url
 
 
-def add_sass_to_fragment(fragment, sass_relative_path):
+def add_css_to_fragment(fragment, css_relative_path):
     """
-    Given a Sass path relative to xmodule/assets, add a compiled CSS URL to the fragment.
+    Given a css path relative to xmodule/static/css-builtin-blocks, add the CSS URL to the fragment.
 
     Raises:
-    * ValueError if {sass_relative_path} is absolute or does not end in '.scss'.
-    * FileNotFoundError if edx-platform/xmodule/assets/{sass_relative_path} is missing.
+    * ValueError if {css_relative_path} is absolute or does not end in '.css'.
+    * FileNotFoundError if edx-platform/xmodule/static/css-builtin-blocks/{css_relative_path} is missing.
     * ImproperlyConfigured if the lookup of the static CSS URL fails. This could happen
-      if Sass wasn't compiled, CSS wasn't collected, or the staticfiles app is misconfigured.
-
-    Notes:
-    * This function is theme-aware. That is: If a theme is enabled which provides a compiled
-      CSS file of the same name, then that CSS file will be used instead.
+      if CSS wasn't collected, or the staticfiles app is misconfigured.
     """
-    if not isinstance(sass_relative_path, Path):
-        sass_relative_path = Path(sass_relative_path)
-    if sass_relative_path.is_absolute():
-        raise ValueError(f"sass_relative_path should be relative; is absolute: {sass_relative_path}")
-    if sass_relative_path.suffix != '.scss':
-        raise ValueError(f"sass_relative_path should be .scss file; is: {sass_relative_path}")
-    sass_absolute_path = Path(settings.REPO_ROOT) / "xmodule" / "assets" / sass_relative_path
-    if not sass_absolute_path.is_file():
-        raise FileNotFoundError(f"Sass not found: {sass_absolute_path}")
-    css_static_path = Path('css') / sass_relative_path.with_suffix('.css')
-    css_url = get_static_file_url(str(css_static_path))  # get_static_file_url is theme-aware.
+    if not isinstance(css_relative_path, Path):
+        css_relative_path = Path(css_relative_path)
+    if css_relative_path.is_absolute():
+        raise ValueError(f"css_file_name should be relative; is absolute: {css_relative_path}")
+    if css_relative_path.suffix != '.css':
+        raise ValueError(f"css_file_name should be .css file; is: {css_relative_path}")
+    css_absolute_path = Path(settings.REPO_ROOT) / "xmodule" / "static" / "css-builtin-blocks" / css_relative_path
+    if not css_absolute_path.is_file():
+        raise FileNotFoundError(f"css file not found: {css_absolute_path}")
+    css_static_path = Path('css-builtin-blocks') / css_relative_path.with_suffix('.css')
+    css_url = get_static_file_url(str(css_static_path))
     if not css_url:
         raise ImproperlyConfigured(
-            f"Did not find CSS file {css_static_path} (compiled from {sass_absolute_path}) "
-            f"in staticfiles storage. Perhaps it wasn't collected?"
+            f"Did not find static CSS file {css_static_path} in staticfiles storage. Perhaps it wasn't collected?"
         )
     fragment.add_css_url(css_url)
 
diff --git a/xmodule/vertical_block.py b/xmodule/vertical_block.py
index 2a10ae44497f..150e6310853e 100644
--- a/xmodule/vertical_block.py
+++ b/xmodule/vertical_block.py
@@ -9,6 +9,7 @@
 from functools import reduce
 
 import pytz
+from django.conf import settings
 from lxml import etree
 from openedx_filters.learning.filters import VerticalBlockChildRenderStarted, VerticalBlockRenderCompleted
 from web_fragments.fragment import Fragment
@@ -43,7 +44,7 @@ class VerticalFields:
     discussion_enabled = Boolean(
         display_name=_("Enable in-context discussions for the Unit"),
         help=_("Add discussion for the Unit."),
-        default=True,
+        default=settings.FEATURES.get('IN_CONTEXT_DISCUSSION_ENABLED_DEFAULT', True),
         scope=Scope.settings,
     )
 
@@ -188,7 +189,7 @@ def block_has_access_error(self, block):
         if has_access_error:
             return True
 
-        # Check child nodes if they exist (e.g. randomized library question aka LibraryContentBlock)
+        # Check child nodes if they exist (e.g. randomized library question aka LegacyLibraryContentBlock)
         for child in block.get_children():
             has_access_error = getattr(child, 'has_access_error', False)
             if has_access_error:
diff --git a/xmodule/video_block/transcripts_utils.py b/xmodule/video_block/transcripts_utils.py
index e41f925295f0..866edf596812 100644
--- a/xmodule/video_block/transcripts_utils.py
+++ b/xmodule/video_block/transcripts_utils.py
@@ -8,17 +8,20 @@
 import html
 import logging
 import os
+import pathlib
 import re
 from functools import wraps
 
 import requests
 import simplejson as json
 from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
 from lxml import etree
 from opaque_keys.edx.keys import UsageKeyV2
 from pysrt import SubRipFile, SubRipItem, SubRipTime
 from pysrt.srtexc import Error
 
+from openedx.core.djangoapps.xblock.api import get_component_from_usage_key
 from xmodule.contentstore.content import StaticContent
 from xmodule.contentstore.django import contentstore
 from xmodule.exceptions import NotFoundError
@@ -1039,27 +1042,29 @@ def get_transcript_from_contentstore(video, language, output_format, transcripts
 
 def get_transcript_from_learning_core(video_block, language, output_format, transcripts_info):
     """
-    Get video transcript from Learning Core.
-
-    HISTORIC INFORMATION FROM WHEN THIS FUNCTION WAS `get_transcript_from_blockstore`:
-
-      Blockstore expects video transcripts to be placed into the 'static/'
-      subfolder of the XBlock's folder in a Blockstore bundle. For example, if the
-      video XBlock's definition is in the standard location of
-          video/video1/definition.xml
-      Then the .srt files should be placed at e.g.
-          video/video1/static/video1-en.srt
-      This is the same place where other public static files are placed for other
-      XBlocks, such as image files used by HTML blocks.
-
-      Video XBlocks in Blockstore must set the 'transcripts' XBlock field to a
-      JSON dictionary listing the filename of the transcript for each language:
-          <video
-              youtube_id_1_0="3_yD_cEKoCk"
-              transcripts='{"en": "3_yD_cEKoCk-en.srt"}'
-              display_name="Welcome Video with Transcript"
-              download_track="true"
-          />
+    Get video transcript from Learning Core (used for Content Libraries)
+
+    Limitation: This is only going to grab from the Draft version.
+
+    Learning Core models a VideoBlock's data in a more generic thing it calls a
+    Component. Each Component has its own virtual space for file-like data. The
+    OLX for the VideoBlock itself is stored at the root of that space, as
+    ``block.xml``. Static assets that are meant to be user-downloadable are
+    placed in a `static/` directory for that Component, and this is where we
+    expect to store transcript files.
+
+    So if there is a ``video1-en.srt`` file for a particular VideoBlock, we
+    expect that to be stored as ``static/video1-en.srt`` in the Component. Any
+    other downloadable files would be here as well, such as thumbnails.
+
+    Video XBlocks in Blockstore must set the 'transcripts' XBlock field to a
+    JSON dictionary listing the filename of the transcript for each language:
+        <video
+            youtube_id_1_0="3_yD_cEKoCk"
+            transcripts='{"en": "3_yD_cEKoCk-en.srt"}'
+            display_name="Welcome Video with Transcript"
+            download_track="true"
+        />
 
       This method is tested in openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
 
@@ -1072,9 +1077,71 @@ def get_transcript_from_learning_core(video_block, language, output_format, tran
     Returns:
         tuple containing content, filename, mimetype
     """
-    # TODO: Update to use Learning Core data models once static assets support
-    # has been added.
-    raise NotImplementedError("Transcripts not supported.")
+    usage_key = video_block.usage_key
+
+    # Validate that the format is something we even support...
+    if output_format not in (Transcript.SRT, Transcript.SJSON, Transcript.TXT):
+        raise NotFoundError(f'Invalid transcript format `{output_format}`')
+
+    # See if the requested language exists.
+    transcripts = transcripts_info['transcripts']
+    if language not in transcripts:
+        raise NotFoundError(
+            f"Video {usage_key} does not have a transcript file defined for the "
+            f"'{language}' language in its OLX."
+        )
+
+    # Grab the underlying Component. There's no version parameter to this call,
+    # so we're just going to grab the file associated with the latest draft
+    # version for now.
+    component = get_component_from_usage_key(usage_key)
+    component_version = component.versioning.draft
+    if not component_version:
+        raise NotFoundError(
+            f"No transcript for {usage_key} because Component {component.uuid} "
+            "was soft-deleted."
+        )
+
+    file_path = pathlib.Path(f"static/{transcripts[language]}")
+    if file_path.suffix != '.srt':
+        # We want to standardize on .srt
+        raise NotFoundError(
+            "Video XBlocks in Content Libraries only support storing .srt "
+            f"transcript files, but we tried to look up {file_path} for {usage_key}"
+        )
+
+    # TODO: There should be a Learning Core API call for this:
+    try:
+        content = (
+            component_version
+            .componentversioncontent_set
+            .filter(content__has_file=True)
+            .select_related('content')
+            .get(key=file_path)
+            .content
+        )
+        data = content.read_file().read()
+    except ObjectDoesNotExist as exc:
+        raise NotFoundError(
+            f"No file {file_path} found for {usage_key} "
+            f"(ComponentVersion {component_version.uuid})"
+        ) from exc
+
+    # Now convert the transcript data to the requested format:
+    output_filename = f'{file_path.stem}.{output_format}'
+    output_transcript = Transcript.convert(
+        data.decode('utf-8'),
+        input_format=Transcript.SRT,
+        output_format=output_format,
+    )
+    if not output_transcript.strip():
+        raise NotFoundError(
+            f"Transcript file {file_path} found for {usage_key} "
+            f"(ComponentVersion {component_version.uuid}), but it has no "
+            "content or is malformed."
+        )
+
+    return output_transcript, output_filename, Transcript.mime_types[output_format]
 
 
 def get_transcript(video, lang=None, output_format=Transcript.SRT, youtube_id=None):
diff --git a/xmodule/video_block/video_block.py b/xmodule/video_block/video_block.py
index b4fddb63fa7a..84d7edcf7263 100644
--- a/xmodule/video_block/video_block.py
+++ b/xmodule/video_block/video_block.py
@@ -29,6 +29,7 @@
 from xblock.core import XBlock
 from xblock.fields import ScopeIds
 from xblock.runtime import KvsFieldData
+from xblocks_contrib.video import VideoBlock as _ExtractedVideoBlock
 
 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
@@ -47,8 +48,8 @@
 from xmodule.mako_block import MakoTemplateBlockBase
 from xmodule.modulestore.inheritance import InheritanceKeyValueStore, own_metadata
 from xmodule.raw_block import EmptyDataRawMixin
+from xmodule.util.builtin_assets import add_css_to_fragment, add_webpack_js_to_fragment
 from xmodule.validation import StudioValidation, StudioValidationMessage
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
 from xmodule.video_block import manage_video_subtitles_save
 from xmodule.x_module import (
     PUBLIC_VIEW, STUDENT_VIEW,
@@ -56,7 +57,6 @@
     XModuleMixin, XModuleToXBlockMixin,
 )
 from xmodule.xml_block import XmlMixin, deserialize_field, is_pointer_tag, name_to_pathname
-
 from .bumper_utils import bumperize
 from .sharing_sites import sharing_sites_info_for_video
 from .transcripts_utils import (
@@ -119,7 +119,7 @@
 
 @XBlock.wants('settings', 'completion', 'i18n', 'request_cache')
 @XBlock.needs('mako', 'user')
-class VideoBlock(
+class _BuiltInVideoBlock(
         VideoFields, VideoTranscriptsMixin, VideoStudioViewHandlers, VideoStudentViewHandlers,
         EmptyDataRawMixin, XmlMixin, EditingMixin, XModuleToXBlockMixin,
         ResourceTemplates, XModuleMixin, LicenseMixin):
@@ -134,6 +134,7 @@ class VideoBlock(
             <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.ogv"/>
         </video>
     """
+    is_extracted = False
     has_custom_completion = True
     completion_mode = XBlockCompletionMode.COMPLETABLE
 
@@ -242,7 +243,7 @@ def student_view(self, context):
         Return the student view.
         """
         fragment = Fragment(self.get_html(context=context))
-        add_sass_to_fragment(fragment, 'VideoBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'VideoBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'VideoBlockDisplay')
         shim_xmodule_js(fragment, 'Video')
         return fragment
@@ -260,7 +261,7 @@ def studio_view(self, _context):
         fragment = Fragment(
             self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
         )
-        add_sass_to_fragment(fragment, 'VideoBlockEditor.scss')
+        add_css_to_fragment(fragment, 'VideoBlockEditor.css')
         add_webpack_js_to_fragment(fragment, 'VideoBlockEditor')
         shim_xmodule_js(fragment, 'TabsEditingDescriptor')
         return fragment
@@ -276,7 +277,7 @@ def public_view(self, context):
             return self.student_view(context)
 
         fragment = Fragment(self.get_html(view=PUBLIC_VIEW, context=context))
-        add_sass_to_fragment(fragment, 'VideoBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'VideoBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'VideoBlockDisplay')
         shim_xmodule_js(fragment, 'Video')
         return fragment
@@ -482,7 +483,7 @@ def get_html(self, view=STUDENT_VIEW, context=None):  # lint-amnesty, pylint: di
             'hide_downloads': is_public_view or is_embed,
             'id': self.location.html_id(),
             'block_id': str(self.location),
-            'course_id': str(self.location.course_key),
+            'course_id': str(self.context_key),
             'video_id': str(self.edx_video_id),
             'user_id': self.get_user_id(),
             'is_embed': is_embed,
@@ -510,8 +511,10 @@ def get_course_video_sharing_override(self):
         """
         Return course video sharing options override or None
         """
+        if not self.context_key.is_course:
+            return False  # Only courses support this feature at all (not libraries)
         try:
-            course = get_course_by_id(self.course_id)
+            course = get_course_by_id(self.context_key)
             return getattr(course, 'video_sharing_options', None)
 
         # In case the course / modulestore does something weird
@@ -523,11 +526,13 @@ def is_public_sharing_enabled(self):
         """
         Is public sharing enabled for this video?
         """
+        if not self.context_key.is_course:
+            return False  # Only courses support this feature at all (not libraries)
         try:
             # Video share feature must be enabled for sharing settings to take effect
-            feature_enabled = PUBLIC_VIDEO_SHARE.is_enabled(self.location.course_key)
+            feature_enabled = PUBLIC_VIDEO_SHARE.is_enabled(self.context_key)
         except Exception as err:  # pylint: disable=broad-except
-            log.exception(f"Error retrieving course for course ID: {self.location.course_key}")
+            log.exception(f"Error retrieving course for course ID: {self.context_key}")
             return False
         if not feature_enabled:
             return False
@@ -552,11 +557,13 @@ def is_transcript_feedback_enabled(self):
         """
         Is transcript feedback enabled for this video?
         """
+        if not self.context_key.is_course:
+            return False  # Only courses support this feature at all (not libraries)
         try:
             # Video transcript feedback must be enabled in order to show the widget
-            feature_enabled = TRANSCRIPT_FEEDBACK.is_enabled(self.location.course_key)
+            feature_enabled = TRANSCRIPT_FEEDBACK.is_enabled(self.context_key)
         except Exception as err:  # pylint: disable=broad-except
-            log.exception(f"Error retrieving course for course ID: {self.location.course_key}")
+            log.exception(f"Error retrieving course for course ID: {self.context_key}")
             return False
         return feature_enabled
 
@@ -1254,3 +1261,10 @@ def _poster(self):
                 edx_video_id=self.edx_video_id.strip()
             )
         return None
+
+
+VideoBlock = (
+    _ExtractedVideoBlock if settings.USE_EXTRACTED_VIDEO_BLOCK
+    else _BuiltInVideoBlock
+)
+VideoBlock.__name__ = "VideoBlock"
diff --git a/xmodule/video_block/video_handlers.py b/xmodule/video_block/video_handlers.py
index cdda2da65b65..b7857e881ece 100644
--- a/xmodule/video_block/video_handlers.py
+++ b/xmodule/video_block/video_handlers.py
@@ -467,6 +467,7 @@ def validate_transcript_upload_data(self, data):
 
         return error
 
+    # pylint: disable=too-many-statements
     @XBlock.handler
     def studio_transcript(self, request, dispatch):
         """
@@ -534,6 +535,10 @@ def studio_transcript(self, request, dispatch):
                             'edx_video_id': edx_video_id,
                             'language_code': new_language_code
                         }
+                        # If a new transcript is added, then both new_language_code and
+                        # language_code fields will have the same value.
+                        if language_code != new_language_code:
+                            self.transcripts.pop(language_code, None)
                         self.transcripts[new_language_code] = f'{edx_video_id}-{new_language_code}.srt'
                         response = Response(json.dumps(payload), status=201)
                     except (TranscriptsGenerationException, UnicodeDecodeError):
diff --git a/xmodule/word_cloud_block.py b/xmodule/word_cloud_block.py
index 26a2c38c5cfc..37e82400df78 100644
--- a/xmodule/word_cloud_block.py
+++ b/xmodule/word_cloud_block.py
@@ -6,23 +6,27 @@
 If student have answered - words he entered and cloud.
 """
 
+from xblocks_contrib.word_cloud import WordCloudBlock as _ExtractedWordCloudBlock
 
 import json
 import logging
 
+from django.conf import settings
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.fields import Boolean, Dict, Integer, List, Scope, String
+
 from xmodule.editing_block import EditingMixin
 from xmodule.raw_block import EmptyDataRawMixin
-from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
-from xmodule.xml_block import XmlMixin
+from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
 from xmodule.x_module import (
     ResourceTemplates,
     shim_xmodule_js,
     XModuleMixin,
     XModuleToXBlockMixin,
 )
+from xmodule.xml_block import XmlMixin
+
 log = logging.getLogger(__name__)
 
 # Make '_' a no-op so we can scrape strings. Using lambda instead of
@@ -41,7 +45,7 @@ def pretty_bool(value):
 
 
 @XBlock.needs('mako')
-class WordCloudBlock(  # pylint: disable=abstract-method
+class _BuiltInWordCloudBlock(  # pylint: disable=abstract-method
     EmptyDataRawMixin,
     XmlMixin,
     EditingMixin,
@@ -53,6 +57,8 @@ class WordCloudBlock(  # pylint: disable=abstract-method
     Word Cloud XBlock.
     """
 
+    is_extracted = False
+
     display_name = String(
         display_name=_("Display Name"),
         help=_("The display name for this component."),
@@ -262,7 +268,7 @@ def student_view(self, context):  # lint-amnesty, pylint: disable=unused-argumen
             'num_inputs': self.num_inputs,
             'submitted': self.submitted,
         }))
-        add_sass_to_fragment(fragment, 'WordCloudBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'WordCloudBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'WordCloudBlockDisplay')
         shim_xmodule_js(fragment, 'WordCloud')
 
@@ -308,3 +314,10 @@ def index_dictionary(self):
         xblock_body["content_type"] = "Word Cloud"
 
         return xblock_body
+
+
+WordCloudBlock = (
+    _ExtractedWordCloudBlock if settings.USE_EXTRACTED_WORD_CLOUD_BLOCK
+    else _BuiltInWordCloudBlock
+)
+WordCloudBlock.__name__ = "WordCloudBlock"
diff --git a/xmodule/xml_block.py b/xmodule/xml_block.py
index 2753d455adc7..63dbedb17e1e 100644
--- a/xmodule/xml_block.py
+++ b/xmodule/xml_block.py
@@ -123,7 +123,11 @@ class XmlMixin:
                          # places in the platform rely on it.
                          'course', 'org', 'url_name', 'filename',
                          # Used for storing xml attributes between import and export, for roundtrips
-                         'xml_attributes')
+                         'xml_attributes',
+                         # Used by _import_xml_node_to_parent in cms/djangoapps/contentstore/helpers.py to prevent
+                         # XmlMixin from treating some XML nodes as "pointer nodes".
+                         "x-is-pointer-node",
+                         )
 
     # This is a categories to fields map that contains the block category specific fields which should not be
     # cleaned and/or override while adding xml to node.