diff --git a/.github/actions/verify-tests-count/action.yml b/.github/actions/verify-tests-count/action.yml
index 6357a4158c84..80df31b1a174 100644
--- a/.github/actions/verify-tests-count/action.yml
+++ b/.github/actions/verify-tests-count/action.yml
@@ -6,8 +6,8 @@ runs:
     - name: collect tests from all modules
       shell: bash
       run: |
-        echo "root_cms_unit_tests_count=$(pytest --collect-only --ds=cms.envs.test cms/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
-        echo "root_lms_unit_tests_count=$(pytest --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ common/lib/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
+        echo "root_cms_unit_tests_count=$(pytest --collect-only --ds=cms.envs.test -p no:warnings cms/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
+        echo "root_lms_unit_tests_count=$(pytest --collect-only --ds=lms.envs.test -p no:warnings lms/ openedx/ common/djangoapps/ common/lib/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV
 
     - name: get GHA unit test paths
       shell: bash
@@ -19,8 +19,8 @@ runs:
     - name: collect tests from GHA unit test shards
       shell: bash
       run: |
-        echo "cms_unit_tests_count=$(pytest --collect-only --ds=cms.envs.test ${{ env.cms_unit_test_paths }} -q | head -n -2 | wc -l)" >> $GITHUB_ENV
-        echo "lms_unit_tests_count=$(pytest --collect-only --ds=lms.envs.test ${{ env.lms_unit_test_paths }} -q | head -n -2 | wc -l)" >> $GITHUB_ENV
+        echo "cms_unit_tests_count=$(pytest --collect-only --ds=cms.envs.test -p no:warnings ${{ env.cms_unit_test_paths }} -q | head -n -2 | wc -l)" >> $GITHUB_ENV
+        echo "lms_unit_tests_count=$(pytest --collect-only --ds=lms.envs.test -p no:warnings ${{ env.lms_unit_test_paths }} -q | head -n -2 | wc -l)" >> $GITHUB_ENV
 
 
     - name: add unit tests count
diff --git a/cms/__init__.py b/cms/__init__.py
index f9ed0bb3cea1..d1bf27534315 100644
--- a/cms/__init__.py
+++ b/cms/__init__.py
@@ -6,6 +6,12 @@
 isort:skip_file
 """
 
+# FAL-2248: Monkey patch django's get_storage_engine to work around long migrations times.
+# This fixes a performance issue with database migrations in Ocim. We will need to keep
+# this patch in our opencraft-release/* branches until edx-platform upgrades to Django 4.*
+# which will include this commit:
+# https://github.com/django/django/commit/518ce7a51f994fc0585d31c4553e2072bf816f76
+import django.db.backends.mysql.introspection
 
 # We monkey patch Kombu's entrypoints listing because scanning through this
 # accounts for the majority of LMS/Studio startup time for tests, and we don't
@@ -22,3 +28,23 @@
 # that shared_task will use this app, and also ensures that the celery
 # singleton is always configured for the CMS.
 from .celery import APP as CELERY_APP  # lint-amnesty, pylint: disable=wrong-import-position
+
+
+def get_storage_engine(self, cursor, table_name):
+    """
+    This is a patched version of `get_storage_engine` that fixes a
+    performance issue with migrations. For more info see FAL-2248 and
+    https://github.com/django/django/pull/14766
+    """
+    cursor.execute("""
+        SELECT engine
+        FROM information_schema.tables
+        WHERE table_name = %s
+            AND table_schema = DATABASE()""", [table_name])
+    result = cursor.fetchone()
+    if not result:
+        return self.connection.features._mysql_storage_engine  # pylint: disable=protected-access
+    return result[0]
+
+
+django.db.backends.mysql.introspection.DatabaseIntrospection.get_storage_engine = get_storage_engine
diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index 3dc567a14f0e..db1a50dd888f 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -4,12 +4,13 @@
 """
 
 
-from edx_toggles.toggles import LegacyWaffleFlag, LegacyWaffleFlagNamespace, LegacyWaffleSwitchNamespace
+from edx_toggles.toggles import LegacyWaffleFlag, LegacyWaffleFlagNamespace, LegacyWaffleSwitchNamespace, WaffleFlag
 
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
 
 # Namespace
 WAFFLE_NAMESPACE = 'studio'
+LOG_PREFIX = 'Studio: '
 
 # Switches
 # TODO: Replace with WaffleSwitch(). See waffle() docstring.
@@ -81,3 +82,13 @@ def waffle_flags():
 # .. toggle_warnings: Flag course_experience.relative_dates should also be active for relative dates functionalities to work.
 # .. toggle_tickets: https://openedx.atlassian.net/browse/AA-844
 CUSTOM_RELATIVE_DATES = CourseWaffleFlag(WAFFLE_NAMESPACE, 'custom_relative_dates', module_name=__name__,)
+
+# .. toggle_name: studio.prevent_staff_structure_deletion
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Prevents staff from deleting course structures
+# .. toggle_use_cases: opt_in
+# .. toggle_creation_date: 2021-06-25
+PREVENT_STAFF_STRUCTURE_DELETION = WaffleFlag(
+    f'{WAFFLE_NAMESPACE}.prevent_staff_structure_deletion', __name__, LOG_PREFIX
+)
diff --git a/cms/djangoapps/contentstore/permissions.py b/cms/djangoapps/contentstore/permissions.py
new file mode 100644
index 000000000000..14fe40c09ca7
--- /dev/null
+++ b/cms/djangoapps/contentstore/permissions.py
@@ -0,0 +1,10 @@
+"""
+Permission definitions for the contentstore djangoapp
+"""
+
+from bridgekeeper import perms
+
+from lms.djangoapps.courseware.rules import HasRolesRule
+
+DELETE_COURSE_CONTENT = 'contentstore.delete_course_content'
+perms[DELETE_COURSE_CONTENT] = HasRolesRule('instructor')
diff --git a/cms/djangoapps/contentstore/views/certificates.py b/cms/djangoapps/contentstore/views/certificates.py
index 6c704197739d..915cc0cf1b9a 100644
--- a/cms/djangoapps/contentstore/views/certificates.py
+++ b/cms/djangoapps/contentstore/views/certificates.py
@@ -231,6 +231,8 @@ def serialize_certificate(certificate):
         # Some keys are not required, such as the title override...
         if certificate_data.get('course_title'):
             certificate_response["course_title"] = certificate_data['course_title']
+        if certificate_data.get('course_description'):
+            certificate_response['course_description'] = certificate_data['course_description']
 
         return certificate_response
 
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 7643a6a1e29b..e7467ca5b7f3 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -66,6 +66,7 @@
 from openedx.core.djangoapps.credit.tasks import update_credit_course_requirements
 from openedx.core.djangoapps.models.course_details import CourseDetails
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx.core.djangoapps.user_api.models import UserPreference
 from openedx.core.djangolib.js_utils import dump_js_escaped_json
 from openedx.core.lib.course_tabs import CourseTabPluginManager
 from openedx.core.lib.courses import course_image_url
@@ -1156,6 +1157,13 @@ def settings_handler(request, course_key_string):  # lint-amnesty, pylint: disab
             verified_mode = CourseMode.verified_mode_for_course(course_key, include_expired=True)
             upgrade_deadline = (verified_mode and verified_mode.expiration_datetime and
                                 verified_mode.expiration_datetime.isoformat())
+
+            date_placeholder_format = configuration_helpers.get_value_for_org(
+                course_module.location.org,
+                'SCHEDULE_DETAIL_FORMAT',
+                settings.SCHEDULE_DETAIL_FORMAT
+            ).upper()
+
             settings_context = {
                 'context_course': course_module,
                 'course_locator': course_key,
@@ -1180,6 +1188,7 @@ def settings_handler(request, course_key_string):  # lint-amnesty, pylint: disab
                 'enable_extended_course_details': enable_extended_course_details,
                 'upgrade_deadline': upgrade_deadline,
                 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id),
+                'date_placeholder_format': date_placeholder_format,
             }
             if is_prerequisite_courses_enabled():
                 courses, in_process_course_actions = get_courses_accessible_to_user(request)
@@ -1214,6 +1223,12 @@ def settings_handler(request, course_key_string):  # lint-amnesty, pylint: disab
         elif 'application/json' in request.META.get('HTTP_ACCEPT', ''):
             if request.method == 'GET':
                 course_details = CourseDetails.fetch(course_key)
+
+                # Fetch the prefered timezone setup by the user
+                # and pass it as part of Json response
+                user_timezone = UserPreference.get_value(request.user, 'time_zone')
+                course_details.user_timezone = user_timezone
+
                 return JsonResponse(
                     course_details,
                     # encoder serializes dates, old locations, and instances
diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index 69c31174179a..4364134aa4dc 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -29,7 +29,8 @@
 from xblock.core import XBlock
 from xblock.fields import Scope
 
-from cms.djangoapps.contentstore.config.waffle import SHOW_REVIEW_RULES_FLAG
+from cms.djangoapps.contentstore.config.waffle import PREVENT_STAFF_STRUCTURE_DELETION, SHOW_REVIEW_RULES_FLAG
+from cms.djangoapps.contentstore.permissions import DELETE_COURSE_CONTENT
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.lib.xblock.authoring_mixin import VISIBILITY_VIEW
 from common.djangoapps.edxmako.services import MakoService
@@ -1356,6 +1357,12 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F
             else:
                 xblock_info['staff_only_message'] = False
 
+            xblock_info['show_delete_button'] = True
+            if PREVENT_STAFF_STRUCTURE_DELETION.is_enabled():
+                xblock_info['show_delete_button'] = (
+                    user.has_perm(DELETE_COURSE_CONTENT, xblock) if user is not None else False
+                )
+
             xblock_info['has_partition_group_components'] = has_children_visible_to_specific_partition_groups(
                 xblock
             )
diff --git a/cms/djangoapps/contentstore/views/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py
index 399027042a31..42becdfc922e 100644
--- a/cms/djangoapps/contentstore/views/tests/test_item.py
+++ b/cms/djangoapps/contentstore/views/tests/test_item.py
@@ -13,6 +13,7 @@
 from django.test.client import RequestFactory
 from django.urls import reverse
 from edx_proctoring.exceptions import ProctoredExamNotFoundException
+from edx_toggles.toggles.testutils import override_waffle_flag
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.asides import AsideUsageKeyV2
 from opaque_keys.edx.keys import CourseKey, UsageKey
@@ -46,6 +47,8 @@
 from cms.djangoapps.contentstore.tests.utils import CourseTestCase
 from cms.djangoapps.contentstore.utils import reverse_course_url, reverse_usage_url
 from cms.djangoapps.contentstore.views import item as item_module
+from cms.djangoapps.contentstore.config.waffle import PREVENT_STAFF_STRUCTURE_DELETION
+from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole, CourseCreatorRole
 from common.djangoapps.student.tests.factories import UserFactory
 from common.djangoapps.xblock_django.models import (
     XBlockConfiguration,
@@ -3430,3 +3433,147 @@ def test_self_paced_item_visibility_state(self, store_type):
         # Check that in self paced course content has live state now
         xblock_info = self._get_xblock_info(chapter.location)
         self._verify_visibility_state(xblock_info, VisibilityState.live)
+
+    def test_staff_show_delete_button(self):
+        """
+        Test delete button is *not visible* to user with CourseStaffRole
+        """
+        # Add user as course staff
+        CourseStaffRole(self.course_key).add_users(self.user)
+
+        # Get xblock outline
+        xblock_info = create_xblock_info(
+            self.course,
+            include_child_info=True,
+            course_outline=True,
+            include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+            user=self.user
+        )
+        self.assertTrue(xblock_info['show_delete_button'])
+
+    def test_staff_show_delete_button_with_waffle(self):
+        """
+        Test delete button is *not visible* to user with CourseStaffRole and
+        PREVENT_STAFF_STRUCTURE_DELETION waffle set
+        """
+        # Add user as course staff
+        CourseStaffRole(self.course_key).add_users(self.user)
+
+        with override_waffle_flag(PREVENT_STAFF_STRUCTURE_DELETION, active=True):
+            # Get xblock outline
+            xblock_info = create_xblock_info(
+                self.course,
+                include_child_info=True,
+                course_outline=True,
+                include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+                user=self.user
+            )
+
+        self.assertFalse(xblock_info['show_delete_button'])
+
+    def test_no_user_show_delete_button(self):
+        """
+        Test delete button is *visible* when user attribute is not set on
+        xblock. This happens with ajax requests.
+        """
+        # Get xblock outline
+        xblock_info = create_xblock_info(
+            self.course,
+            include_child_info=True,
+            course_outline=True,
+            include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+            user=None
+        )
+        self.assertTrue(xblock_info['show_delete_button'])
+
+    def test_no_user_show_delete_button_with_waffle(self):
+        """
+        Test delete button is *visible* when user attribute is not set on
+        xblock (this happens with ajax requests) and PREVENT_STAFF_STRUCTURE_DELETION waffle set.
+        """
+
+        with override_waffle_flag(PREVENT_STAFF_STRUCTURE_DELETION, active=True):
+            # Get xblock outline
+            xblock_info = create_xblock_info(
+                self.course,
+                include_child_info=True,
+                course_outline=True,
+                include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+                user=None
+            )
+
+        self.assertFalse(xblock_info['show_delete_button'])
+
+    def test_instructor_show_delete_button(self):
+        """
+        Test delete button is *visible* to user with CourseInstructorRole only
+        """
+        # Add user as course instructor
+        CourseInstructorRole(self.course_key).add_users(self.user)
+
+        # Get xblock outline
+        xblock_info = create_xblock_info(
+            self.course,
+            include_child_info=True,
+            course_outline=True,
+            include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+            user=self.user
+        )
+        self.assertTrue(xblock_info['show_delete_button'])
+
+    def test_instructor_show_delete_button_with_waffle(self):
+        """
+        Test delete button is *visible* to user with CourseInstructorRole only
+        and PREVENT_STAFF_STRUCTURE_DELETION waffle set
+        """
+        # Add user as course instructor
+        CourseInstructorRole(self.course_key).add_users(self.user)
+
+        with override_waffle_flag(PREVENT_STAFF_STRUCTURE_DELETION, active=True):
+            # Get xblock outline
+            xblock_info = create_xblock_info(
+                self.course,
+                include_child_info=True,
+                course_outline=True,
+                include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+                user=self.user
+            )
+
+        self.assertTrue(xblock_info['show_delete_button'])
+
+    def test_creator_show_delete_button(self):
+        """
+        Test delete button is *visible* to user with CourseInstructorRole only
+        """
+        # Add user as course creator
+        CourseCreatorRole(self.course_key).add_users(self.user)
+
+        # Get xblock outline
+        xblock_info = create_xblock_info(
+            self.course,
+            include_child_info=True,
+            course_outline=True,
+            include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+            user=self.user
+        )
+        self.assertTrue(xblock_info['show_delete_button'])
+
+    def test_creator_show_delete_button_with_waffle(self):
+        """
+        Test delete button is *visible* to user with CourseInstructorRole only
+        and PREVENT_STAFF_STRUCTURE_DELETION waffle set
+        """
+        # Add user as course creator
+        CourseCreatorRole(self.course_key).add_users(self.user)
+
+        with override_waffle_flag(PREVENT_STAFF_STRUCTURE_DELETION, active=True):
+            # Get xblock outline
+            xblock_info = create_xblock_info(
+                self.course,
+                include_child_info=True,
+                course_outline=True,
+                include_children_predicate=lambda xblock: not xblock.category == 'vertical',
+                user=self.user
+            )
+
+        self.assertFalse(xblock_info['show_delete_button'])
diff --git a/cms/envs/common.py b/cms/envs/common.py
index bfecbffcaadf..99227e011833 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -179,6 +179,11 @@
 #   templates.
 STUDIO_NAME = _("Your Platform Studio")
 STUDIO_SHORT_NAME = _("Studio")
+
+# .. setting_name: SCHEDULE_DETAIL_FORMAT
+# .. setting_default: MM/DD/YYYY'
+# .. setting_description: Settings to configure the date format in Schedule & Details page
+SCHEDULE_DETAIL_FORMAT = 'MM/DD/YYYY'
 FEATURES = {
     'GITHUB_PUSH': False,
 
@@ -501,6 +506,29 @@
     # .. toggle_warnings: For consistency in user-experience, keep the value in sync with the setting of the same name
     #   in the LMS and CMS.
     'MARK_LIBRARY_CONTENT_BLOCK_COMPLETE_ON_VIEW': False,
+
+    # .. toggle_name: FEATURES['DISABLE_UNENROLLMENT']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Set to True to disable self-unenrollments via REST API.
+    #   This also hides the "Unenroll" button on the Learner Dashboard.
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2021-10-11
+    # .. toggle_warnings: For consistency in user experience, keep the value in sync with the setting of the same name
+    #   in the LMS and CMS.
+    # .. toggle_tickets: 'https://github.com/open-craft/edx-platform/pull/429'
+    'DISABLE_UNENROLLMENT': False,
+
+    # .. toggle_name: FEATURES['ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Whether to enable the legacy MD5 hashing algorithm to generate anonymous user id
+    #   instead of the newer SHAKE128 hashing algorithm
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2022-08-08
+    # .. toggle_target_removal_date: None
+    # .. toggle_tickets: 'https://github.com/openedx/edx-platform/pull/30832'
+    'ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID': False,
 }
 
 # .. toggle_name: ENABLE_COPPA_COMPLIANCE
@@ -2105,6 +2133,16 @@
 # .. toggle_creation_date: 2016-06-30
 ENABLE_COMPREHENSIVE_THEMING = False
 
+# .. setting_name: CUSTOM_RESOURCE_TEMPLATES_DIRECTORY
+# .. setting_default: None
+# .. setting_description: Path to an existing directory of YAML files containing
+#    html content to be used with the subclasses of xmodule.x_module.ResourceTemplates.
+#    Default example templates can be found in xmodule/templates/html.
+#    Note that the extension used is ".yaml" and not ".yml".
+#    See xmodule.x_module.ResourceTemplates for usage.
+#   "CUSTOM_RESOURCE_TEMPLATES_DIRECTORY" : null
+CUSTOM_RESOURCE_TEMPLATES_DIRECTORY = None
+
 ############################ Global Database Configuration #####################
 
 DATABASE_ROUTERS = [
diff --git a/cms/static/cms/js/spec/main.js b/cms/static/cms/js/spec/main.js
index f5aa089b0438..384eb7b83350 100644
--- a/cms/static/cms/js/spec/main.js
+++ b/cms/static/cms/js/spec/main.js
@@ -47,6 +47,7 @@
             'jquery.simulate': 'xmodule_js/common_static/js/vendor/jquery.simulate',
             'datepair': 'xmodule_js/common_static/js/vendor/timepicker/datepair',
             'date': 'xmodule_js/common_static/js/vendor/date',
+            'moment-timezone': 'common/js/vendor/moment-timezone-with-data',
             moment: 'common/js/vendor/moment-with-locales',
             'text': 'xmodule_js/common_static/js/vendor/requirejs/text',
             'underscore': 'common/js/vendor/underscore',
diff --git a/cms/static/js/certificates/models/certificate.js b/cms/static/js/certificates/models/certificate.js
index a440d569d606..cecdd26f071f 100644
--- a/cms/static/js/certificates/models/certificate.js
+++ b/cms/static/js/certificates/models/certificate.js
@@ -18,6 +18,7 @@ define([
             defaults: {
                 // Metadata fields currently displayed in web forms
                 course_title: '',
+                course_description: '',
 
                 // Metadata fields not currently displayed in web forms
                 name: 'Name of the certificate',
diff --git a/cms/static/js/certificates/views/certificate_editor.js b/cms/static/js/certificates/views/certificate_editor.js
index fa19bd2de258..bc2b0f85ed5f 100644
--- a/cms/static/js/certificates/views/certificate_editor.js
+++ b/cms/static/js/certificates/views/certificate_editor.js
@@ -24,6 +24,7 @@ function($, _, Backbone, gettext,
             'change .collection-name-input': 'setName',
             'change .certificate-description-input': 'setDescription',
             'change .certificate-course-title-input': 'setCourseTitle',
+            'change .certificate-course-description-input': 'setCourseDescription',
             'focus .input-text': 'onFocus',
             'blur .input-text': 'onBlur',
             submit: 'setAndClose',
@@ -103,6 +104,7 @@ function($, _, Backbone, gettext,
                 name: this.model.get('name'),
                 description: this.model.get('description'),
                 course_title: this.model.get('course_title'),
+                course_description: this.model.get('course_description'),
                 org_logo_path: this.model.get('org_logo_path'),
                 is_active: this.model.get('is_active'),
                 isNew: this.model.isNew()
@@ -143,11 +145,22 @@ function($, _, Backbone, gettext,
             );
         },
 
+        setCourseDescription: function(event) {
+            // Updates the indicated model field (still requires persistence on server)
+            if (event && event.preventDefault) { event.preventDefault(); }
+            this.model.set(
+                'course_description',
+                this.$('.certificate-course-description-input').val(),
+                {silent: true}
+            );
+        },
+
         setValues: function() {
             // Update the specified values in the local model instance
             this.setName();
             this.setDescription();
             this.setCourseTitle();
+            this.setCourseDescription();
             return this;
         }
     });
diff --git a/cms/static/js/spec/views/pages/course_outline_spec.js b/cms/static/js/spec/views/pages/course_outline_spec.js
index 332e9849f9d3..0df3534aa72e 100644
--- a/cms/static/js/spec/views/pages/course_outline_spec.js
+++ b/cms/static/js/spec/views/pages/course_outline_spec.js
@@ -41,7 +41,8 @@ describe('CourseOutlinePage', function() {
             user_partitions: [],
             user_partition_info: {},
             highlights_enabled: true,
-            highlights_enabled_for_messaging: false
+            highlights_enabled_for_messaging: false,
+            show_delete_button: true
         }, options, {child_info: {children: children}});
     };
 
@@ -68,7 +69,8 @@ describe('CourseOutlinePage', function() {
             show_review_rules: true,
             user_partition_info: {},
             highlights_enabled: true,
-            highlights_enabled_for_messaging: false
+            highlights_enabled_for_messaging: false,
+            show_delete_button: true
         }, options, {child_info: {children: children}});
     };
 
@@ -93,7 +95,8 @@ describe('CourseOutlinePage', function() {
             group_access: {},
             user_partition_info: {},
             highlights: [],
-            highlights_enabled: true
+            highlights_enabled: true,
+            show_delete_button: true
         }, options, {child_info: {children: children}});
     };
 
@@ -123,7 +126,8 @@ describe('CourseOutlinePage', function() {
             },
             user_partitions: [],
             group_access: {},
-            user_partition_info: {}
+            user_partition_info: {},
+            show_delete_button: true
         }, options, {child_info: {children: children}});
     };
 
@@ -141,7 +145,8 @@ describe('CourseOutlinePage', function() {
             edited_by: 'MockUser',
             user_partitions: [],
             group_access: {},
-            user_partition_info: {}
+            user_partition_info: {},
+            show_delete_button: true
         }, options);
     };
 
@@ -862,6 +867,13 @@ describe('CourseOutlinePage', function() {
             expect(outlinePage.$('[data-locator="mock-section-2"]')).toExist();
         });
 
+        it('remains un-visible if show_delete_button is false ', function() {
+            createCourseOutlinePage(this, createMockCourseJSON({show_delete_button: false}, [
+                createMockSectionJSON({show_delete_button: false})
+            ]));
+            expect(getItemHeaders('section').find('.delete-button').first()).not.toExist();
+        });
+
         it('can be deleted if it is the only section', function() {
             var promptSpy = EditHelpers.createPromptSpy();
             createCourseOutlinePage(this, mockSingleSectionCourseJSON);
diff --git a/cms/static/js/utils/date_utils.js b/cms/static/js/utils/date_utils.js
index 0c91e6347e72..540eaca6d42a 100644
--- a/cms/static/js/utils/date_utils.js
+++ b/cms/static/js/utils/date_utils.js
@@ -1,5 +1,5 @@
-define(['jquery', 'date', 'js/utils/change_on_enter', 'jquery.ui', 'jquery.timepicker'],
-function($, date, TriggerChangeEventOnEnter) {
+define(['jquery', 'date', 'js/utils/change_on_enter', 'moment-timezone', 'jquery.ui', 'jquery.timepicker'],
+function($, date, TriggerChangeEventOnEnter, moment) {
     'use strict';
 
     function getDate(datepickerInput, timepickerInput) {
@@ -67,14 +67,54 @@ function($, date, TriggerChangeEventOnEnter) {
         return obj;
     }
 
+    /**
+     * Calculates the utc offset in miliseconds for given
+     * timezone and subtracts it from given localized time
+     * to get time in UTC
+     * 
+     * @param {Date} localTime JS Date object in Local Time
+     * @param {string} timezone IANA timezone name ex. "Australia/Brisbane"
+     * @returns JS Date object in UTC
+     */
+    function convertLocalizedDateToUTC(localTime, timezone) {
+        const localTimeMS = localTime.getTime();
+        const utcOffset = moment.tz(localTime, timezone)._offset;
+        return new Date(localTimeMS - (utcOffset * 60 *1000));
+    }
+
+    /**
+     * Returns the timezone abbreviation for given
+     * timezone name
+     * 
+     * @param {string} timezone IANA timezone name ex. "Australia/Brisbane"
+     * @returns Timezone abbreviation ex. "AEST"
+     */
+    function getTZAbbreviation(timezone) {
+        return moment(new Date()).tz(timezone).format('z');
+    }
+
+    /**
+     * Converts the given datetime string from UTC to localized time
+     * 
+     * @param {string} utcDateTime JS Date object with UTC datetime
+     * @param {string} timezone IANA timezone name ex. "Australia/Brisbane"
+     * @returns Formatted datetime string with localized timezone
+     */
+    function getLocalizedCurrentDate(utcDateTime, timezone) {
+        const localDateTime = moment(utcDateTime).tz(timezone);
+        return localDateTime.format('YYYY-MM-DDTHH[:]mm[:]ss');
+    }
+
     function setupDatePicker(fieldName, view, index) {
         var cacheModel;
         var div;
         var datefield;
         var timefield;
+        var tzfield;
         var cacheview;
         var setfield;
         var currentDate;
+        var timezone;
         if (typeof index !== 'undefined' && view.hasOwnProperty('collection')) {
             cacheModel = view.collection.models[index];
             div = view.$el.find('#' + view.collectionSelector(cacheModel.cid));
@@ -84,10 +124,18 @@ function($, date, TriggerChangeEventOnEnter) {
         }
         datefield = $(div).find('input.date');
         timefield = $(div).find('input.time');
+        tzfield = $(div).find('span.timezone');
         cacheview = view;
+        
+        timezone = cacheModel.get('user_timezone');
+
         setfield = function(event) {
             var newVal = getDate(datefield, timefield);
 
+            if (timezone) {
+                newVal = convertLocalizedDateToUTC(newVal, timezone);
+            }
+
             // Setting to null clears the time as well, as date and time are linked.
             // Note also that the validation logic prevents us from clearing the start date
             // (start date is required by the back end).
@@ -97,7 +145,12 @@ function($, date, TriggerChangeEventOnEnter) {
 
         // instrument as date and time pickers
         timefield.timepicker({timeFormat: 'H:i'});
-        datefield.datepicker();
+        var placeholder = datefield.attr('placeholder');
+        if (placeholder == 'DD/MM/YYYY') {
+            datefield.datepicker({dateFormat: 'dd/mm/yy'});
+        } else {
+            datefield.datepicker();
+        }
 
         // Using the change event causes setfield to be triggered twice, but it is necessary
         // to pick up when the date is typed directly in the field.
@@ -109,8 +162,17 @@ function($, date, TriggerChangeEventOnEnter) {
         if (cacheModel) {
             currentDate = cacheModel.get(fieldName);
         }
+
+        if (timezone) {
+            const tz = getTZAbbreviation(timezone);
+            $(tzfield).text("("+tz+")");
+        }
+
         // timepicker doesn't let us set null, so check that we have a time
         if (currentDate) {
+            if (timezone) {
+                currentDate = getLocalizedCurrentDate(currentDate, timezone);
+            }
             setDate(datefield, timefield, currentDate);
         } else {
              // but reset fields either way
diff --git a/cms/static/js/views/xblock_outline.js b/cms/static/js/views/xblock_outline.js
index badf43dc1fa9..2d63ec774909 100644
--- a/cms/static/js/views/xblock_outline.js
+++ b/cms/static/js/views/xblock_outline.js
@@ -109,7 +109,8 @@ define(['jquery', 'underscore', 'gettext', 'js/views/baseview', 'common/js/compo
                     includesChildren: this.shouldRenderChildren(),
                     hasExplicitStaffLock: this.model.get('has_explicit_staff_lock'),
                     staffOnlyMessage: this.model.get('staff_only_message'),
-                    course: course
+                    course: course,
+                    showDeleteButton: this.model.get('show_delete_button')
                 };
             },
 
diff --git a/cms/templates/js/certificate-details.underscore b/cms/templates/js/certificate-details.underscore
index a09a3baf897c..3401fd175a39 100644
--- a/cms/templates/js/certificate-details.underscore
+++ b/cms/templates/js/certificate-details.underscore
@@ -29,6 +29,12 @@
                             <span class="certificate-value"><%- course_title %></span>
                         </p>
                     <% } %>
+                    <% if (course_description) { %>
+                        <p class="course-description">
+                            <span class="certificate-label"><b><%- gettext('Course Description') %>: </b></span>
+                            <span class="certificate-value"><%- course_description %></span>
+                        </p>
+                    <% } %>
                  </div>
 
                 <div class='course-number-section pull-left'>
diff --git a/cms/templates/js/certificate-editor.underscore b/cms/templates/js/certificate-editor.underscore
index 513113b80500..3b1d90969b5a 100644
--- a/cms/templates/js/certificate-editor.underscore
+++ b/cms/templates/js/certificate-editor.underscore
@@ -31,6 +31,11 @@
                 <input id="certificate-course-title-<%- uniqueId %>" class="certificate-course-title-input input-text" name="certificate-course-title" type="text" placeholder="<%- gettext("Course title") %>" value="<%- course_title %>" aria-describedby="certificate-course-title-<%-uniqueId %>-tip" />
                 <span id="certificate-course-title-<%- uniqueId %>-tip" class="tip tip-stacked"><%- gettext("Specify an alternative to the official course title to display on certificates. Leave blank to use the official course title.") %></span>
             </div>
+            <div class="input-wrap field text add-certification-course-description">
+                <label for="certificate-course-description-<%- uniqueId %>"><%- gettext("Course Description") %></label>
+                <input id="certificate-course-description-<%- uniqueId %>" class="certificate-course-description-input input-text" name="certificate-course-description" type="text" placeholder="<%- gettext("Course Description") %>" value="<%- course_description %>" aria-describedby="certificate-course-description-<%-uniqueId %>-tip" />
+                <span id="certificate-course-description-<%- uniqueId %>-tip" class="tip tip-stacked"><%- gettext("Specify an alternative to the official course description to display on certificates. Leave blank to use default text.") %></span>
+            </div>
         </fieldset>
          <header>
             <h2 class="title title-2"><%- gettext("Certificate Signatories") %></h2>
diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore
index df43d0913bba..23dd9f8efff7 100644
--- a/cms/templates/js/course-outline.underscore
+++ b/cms/templates/js/course-outline.underscore
@@ -161,7 +161,7 @@ if (is_proctored_exam) {
                         </a>
                     </li>
                 <% } %>
-                <% if (xblockInfo.isDeletable()) { %>
+                <% if (xblockInfo.isDeletable() && showDeleteButton) { %>
                     <li class="action-item action-delete">
                         <a href="#" data-tooltip="<%- gettext('Delete') %>" class="delete-button action-button">
                             <span class="icon fa fa-trash-o" aria-hidden="true"></span>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index c3ed1afb9957..1b5d75d9901b 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -223,7 +223,7 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
             <li class="field-group field-group-course-start" id="course-start">
               <div class="field date" id="field-course-start-date">
                 <label for="course-start-date">${_("Course Start Date")}</label>
-                <input type="text" class="start-date date start datepicker" id="course-start-date" placeholder="MM/DD/YYYY" autocomplete="off" />
+                <input type="text" class="start-date date start datepicker" id="course-start-date" placeholder="${date_placeholder_format}" autocomplete="off" />
                 <span class="icon icon-inline fa fa-calendar-check-o datepicker-icon" aria-hidden="true"></span>
                 <span class="tip tip-stacked">${_("First day the course begins")}</span>
               </div>
@@ -238,7 +238,7 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
             <li class="field-group field-group-course-end" id="course-end">
               <div class="field date" id="field-course-end-date">
                 <label for="course-end-date">${_("Course End Date")}</label>
-                <input type="text" class="end-date date end" id="course-end-date" placeholder="MM/DD/YYYY" autocomplete="off" />
+                <input type="text" class="end-date date end" id="course-end-date" placeholder="${date_placeholder_format}" autocomplete="off" />
                 <span class="icon icon-inline fa fa-calendar-check-o datepicker-icon" aria-hidden="true"></span>
                 <span class="tip tip-stacked">${_("Last day your course is active")}</span>
               </div>
@@ -304,8 +304,9 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
                 <div class="field date" id="field-certificate-available-date" >
               % endif
                 <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" />
+                <input type="text" class="certificate-available-date date start datepicker" id="certificate-available-date" placeholder="${date_placeholder_format}" autocomplete="off" />
                 <span class="icon icon-inline fa fa-calendar-check-o datepicker-icon" aria-hidden="true"></span>
+                <span class="tip tip-stacked">${_("By default, 48 hours after course end date")}</span>
               </div>
             </li>
           </ol>
@@ -315,7 +316,7 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
             <li class="field-group field-group-enrollment-start" id="enrollment-start">
               <div class="field date" id="field-enrollment-start-date">
                 <label for="course-enrollment-start-date">${_("Enrollment Start Date")}</label>
-                <input type="text" class="start-date date start" id="course-enrollment-start-date" placeholder="MM/DD/YYYY" autocomplete="off" />
+                <input type="text" class="start-date date start" id="course-enrollment-start-date" placeholder="${date_placeholder_format}" autocomplete="off" />
                 <span class="icon icon-inline fa fa-calendar-check-o datepicker-icon" aria-hidden="true"></span>
                 <span class="tip tip-stacked">${_("First day students can enroll")}</span>
               </div>
@@ -333,7 +334,7 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
             <li class="field-group field-group-enrollment-end" id="enrollment-end">
               <div class="field date ${enrollment_end_editable_class}" id="field-enrollment-end-date">
                 <label for="course-enrollment-end-date">${_("Enrollment End Date")}</label>
-                <input type="text" class="end-date date end" id="course-enrollment-end-date" placeholder="MM/DD/YYYY" autocomplete="off" ${enrollment_end_readonly} />
+                <input type="text" class="end-date date end" id="course-enrollment-end-date" placeholder="${date_placeholder_format}" autocomplete="off" ${enrollment_end_readonly} />
                 <span class="icon icon-inline fa fa-calendar-check-o datepicker-icon" aria-hidden="true"></span>
                 <span class="tip tip-stacked">
                   ${_("Last day students can enroll.")}
@@ -356,7 +357,7 @@ <h2 class="title-2">${_('Course Schedule')}</h2>
             <li class="field-group field-group-upgrade-deadline" id="upgrade-deadline">
               <div class="field date is-not-editable" id="field-upgrade-deadline-date">
                 <label for="course-upgrade-deadline-date">${_("Upgrade Deadline Date")}</label>
-                <input type="text" class="date upgrade-deadline" id="course-upgrade-deadline-date" placeholder="MM/DD/YYYY" autocomplete="off" readonly aria-readonly="true" />
+                <input type="text" class="date upgrade-deadline" id="course-upgrade-deadline-date" placeholder="${date_placeholder_format}" autocomplete="off" readonly aria-readonly="true" />
                 <span class="tip tip-stacked">
                   ${_("Last day students can upgrade to a verified enrollment.")}
                   ${_("Contact your {platform_name} partner manager to update these settings.").format(platform_name=settings.PLATFORM_NAME)}
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index b243083f7936..c6b5e24666ad 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -231,12 +231,22 @@ def anonymous_id_for_user(user, course_id, save='DEPRECATED'):
         # function: Rotate at will, since the hashes are stored and
         # will not change.
         # include the secret key as a salt, and to make the ids unique across different LMS installs.
-        hasher = hashlib.shake_128()
+        legacy_hash_enabled = settings.FEATURES.get('ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID', False)
+        if legacy_hash_enabled:
+            # Use legacy MD5 algorithm if flag enabled
+            hasher = hashlib.md5()
+        else:
+            hasher = hashlib.shake_128()
+
         hasher.update(settings.SECRET_KEY.encode('utf8'))
         hasher.update(str(user.id).encode('utf8'))
         if course_id:
             hasher.update(str(course_id).encode('utf-8'))
-        anonymous_user_id = hasher.hexdigest(16)  # pylint: disable=too-many-function-args
+
+        if legacy_hash_enabled:
+            anonymous_user_id = hasher.hexdigest()
+        else:
+            anonymous_user_id = hasher.hexdigest(16)  # pylint: disable=too-many-function-args
 
         try:
             AnonymousUserId.objects.create(
diff --git a/common/djangoapps/student/tests/test_enrollment.py b/common/djangoapps/student/tests/test_enrollment.py
index bc0264322a16..520f5a594e5e 100644
--- a/common/djangoapps/student/tests/test_enrollment.py
+++ b/common/djangoapps/student/tests/test_enrollment.py
@@ -357,6 +357,22 @@ def test_with_invalid_course_id(self):
         resp = self._change_enrollment('unenroll', course_id="edx/")
         assert resp.status_code == 400
 
+    @patch.dict(settings.FEATURES, {'DISABLE_UNENROLLMENT': True})
+    def test_unenroll_when_unenrollment_disabled(self):
+        """
+        Tests that a user cannot unenroll when unenrollment has been disabled.
+        """
+        # Enroll the student in the course
+        CourseEnrollment.enroll(self.user, self.course.id, mode="honor")
+
+        # Attempt to unenroll
+        resp = self._change_enrollment('unenroll')
+        assert resp.status_code == 400
+
+        # Verify that user is still enrolled
+        is_enrolled = CourseEnrollment.is_enrolled(self.user, self.course.id)
+        assert is_enrolled
+
     def test_enrollment_limit(self):
         """
         Assert that in a course with max student limit set to 1, we can enroll staff and instructor along with
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index a2e4c8a5decc..8d490712fdd3 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -1057,6 +1057,17 @@ def test_anonymous_id_secret_key_changes_result_in_diff_values_for_same_new_user
             assert anonymous_id != new_anonymous_id
             assert self.user == user_by_anonymous_id(new_anonymous_id)
 
+    def test_enable_legacy_hash_flag(self):
+        """Test that different anonymous id returned if ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID enabled."""
+        CourseEnrollment.enroll(self.user, self.course.id)
+        anonymous_id = anonymous_id_for_user(self.user, self.course.id)
+        with patch.dict(settings.FEATURES, ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID=True):
+            # Recreate user object to clear cached anonymous id.
+            self.user = User.objects.get(pk=self.user.id)
+            AnonymousUserId.objects.filter(user=self.user).filter(course_id=self.course.id).delete()
+            new_anonymous_id = anonymous_id_for_user(self.user, self.course.id)
+            assert anonymous_id != new_anonymous_id
+
 
 @skip_unless_lms
 @patch('openedx.core.djangoapps.programs.utils.get_programs')
diff --git a/common/djangoapps/student/views/dashboard.py b/common/djangoapps/student/views/dashboard.py
index a5d9cf02a465..35814a5ba2d5 100644
--- a/common/djangoapps/student/views/dashboard.py
+++ b/common/djangoapps/student/views/dashboard.py
@@ -532,6 +532,10 @@ def student_dashboard(request):  # lint-amnesty, pylint: disable=too-many-statem
     empty_dashboard_message = configuration_helpers.get_value(
         'EMPTY_DASHBOARD_MESSAGE', None
     )
+    disable_unenrollment = configuration_helpers.get_value(
+        'DISABLE_UNENROLLMENT',
+        settings.FEATURES.get('DISABLE_UNENROLLMENT')
+    )
 
     disable_course_limit = request and 'course_limit' in request.GET
     course_limit = get_dashboard_course_limit() if not disable_course_limit else None
@@ -810,6 +814,7 @@ def student_dashboard(request):  # lint-amnesty, pylint: disable=too-many-statem
         # TODO START: clean up as part of REVEM-199 (START)
         'course_info': get_dashboard_course_info(user, course_enrollments),
         # TODO START: clean up as part of REVEM-199 (END)
+        'disable_unenrollment': disable_unenrollment,
     }
 
     # Include enterprise learner portal metadata and messaging
diff --git a/common/djangoapps/student/views/management.py b/common/djangoapps/student/views/management.py
index 261d814ba371..66b9d6109432 100644
--- a/common/djangoapps/student/views/management.py
+++ b/common/djangoapps/student/views/management.py
@@ -403,6 +403,12 @@ def change_enrollment(request, check_access=True):
         # Otherwise, there is only one mode available (the default)
         return HttpResponse()
     elif action == "unenroll":
+        if configuration_helpers.get_value(
+            "DISABLE_UNENROLLMENT",
+            settings.FEATURES.get("DISABLE_UNENROLLMENT")
+        ):
+            return HttpResponseBadRequest(_("Unenrollment is currently disabled"))
+
         enrollment = CourseEnrollment.get_enrollment(user, course_id)
         if not enrollment:
             return HttpResponseBadRequest(_("You are not enrolled in this course"))
diff --git a/common/lib/xmodule/xmodule/assets/library_content/public/js/library_content_reset.js b/common/lib/xmodule/xmodule/assets/library_content/public/js/library_content_reset.js
new file mode 100644
index 000000000000..e985d3c2a692
--- /dev/null
+++ b/common/lib/xmodule/xmodule/assets/library_content/public/js/library_content_reset.js
@@ -0,0 +1,18 @@
+/* JavaScript for reset option that can be done on a randomized LibraryContentBlock */
+function LibraryContentReset(runtime, element) {
+  $('.problem-reset-btn', element).click((e) => {
+    e.preventDefault();
+    $.post({
+      url: runtime.handlerUrl(element, 'reset_selected_children'),
+      success(data) {
+        edx.HtmlUtils.setHtml(element, edx.HtmlUtils.HTML(data));
+        // Rebind the reset button for the block
+        XBlock.initializeBlock(element);
+        // Render the new set of problems (XBlocks)
+        $(".xblock", element).each(function(i, child) {
+          XBlock.initializeBlock(child);
+        });
+      },
+    });
+  });
+}
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index efff7e9011b9..60e6b99a98a9 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -559,14 +559,22 @@ def index_dictionary(self):
         # Make optioninput's options index friendly by replacing the actual tag with the values
         capa_content = re.sub(r'<optioninput options="\(([^"]+)\)".*?>\s*|\S*<\/optioninput>', r'\1', self.data)
 
-        # Removing solutions and hints, as well as script and style
+        # Remove the following tags with content that can leak hints or solutions:
+        # - `solution` (with optional attributes) and `solutionset`.
+        # - `targetedfeedback` (with optional attributes) and `targetedfeedbackset`.
+        # - `answer` (with optional attributes).
+        # - `script` (with optional attributes).
+        # - `style` (with optional attributes).
+        # - various types of hints (with optional attributes) and `hintpart`.
         capa_content = re.sub(
             re.compile(
                 r"""
-                    <solution>.*?</solution> |
-                    <script>.*?</script> |
-                    <style>.*?</style> |
-                    <[a-z]*hint.*?>.*?</[a-z]*hint>
+                    <solution.*?>.*?</solution.*?> |
+                    <targetedfeedback.*?>.*?</targetedfeedback.*?> |
+                    <answer.*?>.*?</answer> |
+                    <script.*?>.*?</script> |
+                    <style.*?>.*?</style> |
+                    <[a-z]*hint.*?>.*?</[a-z]*hint.*?>
                 """,
                 re.DOTALL |
                 re.VERBOSE),
diff --git a/common/lib/xmodule/xmodule/library_content_module.py b/common/lib/xmodule/xmodule/library_content_module.py
index e2b43387a893..61855ea9839f 100644
--- a/common/lib/xmodule/xmodule/library_content_module.py
+++ b/common/lib/xmodule/xmodule/library_content_module.py
@@ -8,6 +8,7 @@
 import random
 from copy import copy
 from gettext import ngettext
+from rest_framework import status
 
 import bleach
 from django.conf import settings
@@ -21,7 +22,7 @@
 from webob import Response
 from xblock.completable import XBlockCompletionMode
 from xblock.core import XBlock
-from xblock.fields import Integer, List, Scope, String
+from xblock.fields import Integer, List, Scope, String, Boolean
 
 from capa.responsetypes import registry
 from xmodule.mako_module import MakoTemplateBlockBase
@@ -178,6 +179,14 @@ def completion_mode(cls):  # pylint: disable=no-self-argument
         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):
@@ -348,6 +357,27 @@ def selected_children(self):
 
         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
@@ -385,7 +415,11 @@ def student_view(self, context):  # lint-amnesty, pylint: disable=missing-functi
             '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 author_view(self, context):
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index 2b2b8e342899..26ff575f81de 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -2562,25 +2562,32 @@ def test_response_types_multiple_tags(self):
     def test_solutions_not_indexed(self):
         xml = textwrap.dedent("""
             <problem>
-                <solution>
-                <div class="detailed-solution">
-                <p>Explanation</p>
-
-                <p>This is what the 1st solution.</p>
-
-                </div>
-                </solution>
-
-                <solution>
-                <div class="detailed-solution">
-                <p>Explanation</p>
-
-                <p>This is the 2nd solution.</p>
-
-                </div>
-                </solution>
-
-
+                <solution>Test solution.</solution>
+                <solution explanation-id="solution0">Test solution with attribute.</solution>
+                <solutionset>
+                    Test solutionset.
+                    <solution explanation-id="solution1">Test solution within solutionset.</solution>
+                </solutionset>
+
+                <targetedfeedback>Test feedback.</targetedfeedback>
+                <targetedfeedback explanation-id="feedback0">Test feedback with attribute.</targetedfeedback>
+                <targetedfeedbackset>
+                    Test FeedbackSet.
+                    <targetedfeedback explanation-id="feedback1">Test feedback within feedbackset.</targetedfeedback>
+                </targetedfeedbackset>
+
+                <answer>Test answer.</answer>
+                <answer type="loncapa/python">Test answer with attribute.</answer>
+
+                <script>Test script.</script>
+                <script type="loncapa/python">Test script with attribute.</script>
+
+                <style>Test style.</style>
+                <style media="all and (max-width: 1920px)">Test style with attribute.</style>
+
+                <choicehint>Test choicehint.</choicehint>
+                <hint>Test hint.</hint>
+                <hintpart>Test hintpart.</hintpart>
             </problem>
         """)
         name = "Blank Common Capa Problem"
@@ -2695,7 +2702,7 @@ def test_indexing_non_latin_problem(self):
         """)
         name = "Non latin Input"
         descriptor = self._create_descriptor(sample_text_input_problem_xml, name=name)
-        capa_content = " FX1_VAL='Καλημέρα' Δοκιμή με μεταβλητές με Ελληνικούς χαρακτήρες μέσα σε python: $FX1_VAL "
+        capa_content = " Δοκιμή με μεταβλητές με Ελληνικούς χαρακτήρες μέσα σε python: $FX1_VAL "
 
         descriptor_dict = descriptor.index_dictionary()
         assert descriptor_dict['content']['capa_content'] == smart_str(capa_content)
diff --git a/common/lib/xmodule/xmodule/tests/test_library_content.py b/common/lib/xmodule/xmodule/tests/test_library_content.py
index 628f471e88eb..748a962f1d65 100644
--- a/common/lib/xmodule/xmodule/tests/test_library_content.py
+++ b/common/lib/xmodule/xmodule/tests/test_library_content.py
@@ -3,7 +3,8 @@
 
 Higher-level tests are in `cms/djangoapps/contentstore/tests/test_libraries.py`.
 """
-from unittest.mock import Mock, patch
+import ddt
+from unittest.mock import MagicMock, Mock, patch
 
 from bson.objectid import ObjectId
 from fs.memoryfs import MemoryFS
@@ -11,6 +12,7 @@
 from search.search_engine_base import SearchEngine
 from web_fragments.fragment import Fragment
 from xblock.runtime import Runtime as VanillaRuntime
+from rest_framework import status
 
 from xmodule.library_content_module import ANY_CAPA_TYPE_VALUE, LibraryContentBlock
 from xmodule.library_tools import LibraryToolsService
@@ -20,6 +22,7 @@
 from xmodule.tests import get_test_system
 from xmodule.validation import StudioValidationMessage
 from xmodule.x_module import AUTHOR_VIEW
+from xmodule.capa_module import ProblemBlock
 
 from .test_course_module import DummySystem as TestImportSystem
 
@@ -30,6 +33,7 @@ class LibraryContentTest(MixedSplitTestCase):
     """
     Base class for tests of LibraryContentBlock (library_content_block.py)
     """
+
     def setUp(self):
         super().setUp()
 
@@ -164,6 +168,7 @@ def test_xml_import_with_comments(self):
         self._verify_xblock_properties(imported_lc_block)
 
 
+@ddt.ddt
 class LibraryContentBlockTestMixin:
     """
     Basic unit tests for LibraryContentBlock
@@ -378,6 +383,45 @@ def _change_count_and_refresh_children(self, count):
         assert len(selected) == count
         return selected
 
+    @ddt.data(
+        # User resets selected children with reset button on content block
+        (True, 8),
+        # User resets selected children without reset button on content block
+        (False, 8),
+    )
+    @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
+        """
+        self.lc_block.allow_resetting_children = allow_resetting_children
+        self.lc_block.max_count = max_count
+        # Add some capa blocks
+        self._create_capa_problems()
+        self.lc_block.refresh_children()
+        self.lc_block = self.store.get_item(self.lc_block.location)
+        # Mock the student view to return an empty dict to be returned as response
+        self.lc_block.student_view = MagicMock()
+        self.lc_block.student_view.return_value.content = {}
+
+        with patch.object(ProblemBlock, 'reset_problem', return_value={'success': True}) as reset_problem:
+            response = self.lc_block.reset_selected_children(None, None)
+
+        if allow_resetting_children:
+            self.lc_block.student_view.assert_called_once_with({})
+            assert reset_problem.call_count == len(self.problem_types)
+            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
+
 
 @patch('xmodule.library_tools.SearchEngine.get_search_engine', Mock(return_value=None, autospec=True))
 class TestLibraryContentBlockNoSearchIndex(LibraryContentBlockTestMixin, LibraryContentTest):
@@ -396,6 +440,7 @@ class TestLibraryContentBlockWithSearchIndex(LibraryContentBlockTestMixin, Libra
     """
     Tests for library container with mocked search engine response.
     """
+
     def _get_search_response(self, field_dictionary=None):
         """ Mocks search response as returned by search engine """
         target_type = field_dictionary.get('problem_types')
diff --git a/common/lib/xmodule/xmodule/tests/test_resource_templates.py b/common/lib/xmodule/xmodule/tests/test_resource_templates.py
index e51f69ed30d5..742a7e9da199 100644
--- a/common/lib/xmodule/xmodule/tests/test_resource_templates.py
+++ b/common/lib/xmodule/xmodule/tests/test_resource_templates.py
@@ -1,12 +1,14 @@
 """
 Tests for xmodule.x_module.ResourceTemplates
 """
-
-
+import pathlib
 import unittest
 
+from django.test import override_settings
 from xmodule.x_module import ResourceTemplates
 
+CUSTOM_RESOURCE_TEMPLATES_DIRECTORY = pathlib.Path(__file__).parent.parent / "templates/"
+
 
 class ResourceTemplatesTests(unittest.TestCase):
     """
@@ -28,6 +30,20 @@ def test_templates_no_suchdir(self):
     def test_get_template(self):
         assert TestClass.get_template('latex_html.yaml')['template_id'] == 'latex_html.yaml'
 
+    @override_settings(CUSTOM_RESOURCE_TEMPLATES_DIRECTORY=CUSTOM_RESOURCE_TEMPLATES_DIRECTORY)
+    def test_get_custom_template(self):
+        assert TestClassResourceTemplate.get_template('latex_html.yaml')['template_id'] == 'latex_html.yaml'
+
+    @override_settings(CUSTOM_RESOURCE_TEMPLATES_DIRECTORY=CUSTOM_RESOURCE_TEMPLATES_DIRECTORY)
+    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()}
+        assert expected == got
+
 
 class TestClass(ResourceTemplates):
     """
@@ -55,3 +71,14 @@ class TestClass2(TestClass):
     @classmethod
     def get_template_dir(cls):
         return 'foo'
+
+
+class TestClassResourceTemplate(ResourceTemplates):
+    """
+    Like TestClass, but `template_packages` contains a module that doesn't
+    have any templates.
+
+    See `TestClass`.
+    """
+    template_packages = ['capa.checker']
+    template_dir_name = 'test'
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index fb59a44f03cb..7234c6b8f629 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -10,11 +10,12 @@
 
 import yaml
 
+from django.conf import settings
 from lazy import lazy
 from lxml import etree
 from opaque_keys.edx.asides import AsideDefinitionKeyV2, AsideUsageKeyV2
 from opaque_keys.edx.keys import UsageKey
-from pkg_resources import resource_exists, resource_isdir, resource_listdir, resource_string
+from pkg_resources import resource_isdir, resource_string, resource_filename
 from web_fragments.fragment import Fragment
 from webob import Response
 from webob.multidict import MultiDict
@@ -1041,11 +1042,48 @@ def policy_key(location):
 
 class ResourceTemplates:
     """
-    Gets the templates associated w/ a containing cls. The cls must have a 'template_dir_name' attribute.
-    It finds the templates as directly in this directory under 'templates'.
+    Gets the yaml templates associated with a containing cls for display in the Studio.
+
+    The cls must have a 'template_dir_name' attribute. It finds the templates as directly
+    in this directory under 'templates'.
+
+    Additional templates can be loaded by setting the
+    CUSTOM_RESOURCE_TEMPLATES_DIRECTORY configuration setting.
+
+    Note that a template must end with ".yaml" extension otherwise it will not be
+    loaded.
     """
     template_packages = [__name__]
 
+    @classmethod
+    def _load_template(cls, template_path, template_id):
+        """
+        Reads an loads the yaml content provided in the template_path and
+        return the content as a dictionary.
+        """
+        if not os.path.exists(template_path):
+            return None
+
+        with open(template_path) as file_object:
+            template = yaml.safe_load(file_object)
+            template['template_id'] = template_id
+            return template
+
+    @classmethod
+    def _load_templates_in_dir(cls, dirpath):
+        """
+        Lists every resource template found in the provided dirpath.
+        """
+        templates = []
+        for template_file in os.listdir(dirpath):
+            if not template_file.endswith('.yaml'):
+                log.warning("Skipping unknown template file %s", template_file)
+                continue
+
+            template = cls._load_template(os.path.join(dirpath, template_file), template_file)
+            templates.append(template)
+        return templates
+
     @classmethod
     def templates(cls):
         """
@@ -1053,23 +1091,15 @@ def templates(cls):
         to seed a module of this type.
 
         Expects a class attribute template_dir_name that defines the directory
-        inside the 'templates' resource directory to pull templates from
+        inside the 'templates' resource directory to pull templates from.
         """
-        templates = []
-        dirname = cls.get_template_dir()
-        if dirname is not None:
-            for pkg in cls.template_packages:
-                if not resource_isdir(pkg, dirname):
-                    continue
-                for template_file in resource_listdir(pkg, dirname):
-                    if not template_file.endswith('.yaml'):
-                        log.warning("Skipping unknown template file %s", template_file)
-                        continue
-                    template_content = resource_string(pkg, os.path.join(dirname, template_file))
-                    template = yaml.safe_load(template_content)
-                    template['template_id'] = template_file
-                    templates.append(template)
-        return templates
+        templates = {}
+
+        for dirpath in cls.get_template_dirpaths():
+            for template in cls._load_templates_in_dir(dirpath):
+                templates[template['template_id']] = template
+
+        return list(templates.values())
 
     @classmethod
     def get_template_dir(cls):  # lint-amnesty, pylint: disable=missing-function-docstring
@@ -1086,22 +1116,53 @@ def get_template_dir(cls):  # lint-amnesty, pylint: disable=missing-function-doc
         else:
             return None
 
+    @classmethod
+    def get_template_dirpaths(cls):
+        """
+        Returns of list of directories containing resource templates.
+        """
+        template_dirpaths = []
+        template_dirname = cls.get_template_dir()
+        if template_dirname and resource_isdir(__name__, template_dirname):
+            template_dirpaths.append(resource_filename(__name__, template_dirname))
+
+        custom_template_dir = cls.get_custom_template_dir()
+        if custom_template_dir:
+            template_dirpaths.append(custom_template_dir)
+        return template_dirpaths
+
+    @classmethod
+    def get_custom_template_dir(cls):
+        """
+        If settings.CUSTOM_RESOURCE_TEMPLATES_DIRECTORY is defined, check if it has a
+        subdirectory named as the class's template_dir_name and return the full path.
+        """
+        template_dir_name = getattr(cls, 'template_dir_name', None)
+
+        if template_dir_name is None:
+            return
+
+        resource_dir = settings.CUSTOM_RESOURCE_TEMPLATES_DIRECTORY
+
+        if not resource_dir:
+            return None
+
+        template_dir_path = os.path.join(resource_dir, template_dir_name)
+
+        if os.path.exists(template_dir_path):
+            return template_dir_path
+        return None
+
     @classmethod
     def get_template(cls, template_id):
         """
         Get a single template by the given id (which is the file name identifying it w/in the class's
         template_dir_name)
-
         """
-        dirname = cls.get_template_dir()
-        if dirname is not None:
-            path = os.path.join(dirname, template_id)
-            for pkg in cls.template_packages:
-                if resource_exists(pkg, path):
-                    template_content = resource_string(pkg, path)
-                    template = yaml.safe_load(template_content)
-                    template['template_id'] = template_id
-                    return template
+        for directory in sorted(cls.get_template_dirpaths(), reverse=True):
+            abs_path = os.path.join(directory, template_id)
+            if os.path.exists(abs_path):
+                return cls._load_template(abs_path, template_id)
 
 
 class XModuleDescriptorToXBlockMixin:
diff --git a/lms/__init__.py b/lms/__init__.py
index 008640ac7147..05a30f4ffad4 100644
--- a/lms/__init__.py
+++ b/lms/__init__.py
@@ -18,3 +18,30 @@
 # that shared_task will use this app, and also ensures that the celery
 # singleton is always configured for the LMS.
 from .celery import APP as CELERY_APP  # lint-amnesty, pylint: disable=wrong-import-position
+
+# FAL-2248: Monkey patch django's get_storage_engine to work around long migrations times.
+# This fixes a performance issue with database migrations in Ocim. We will need to keep
+# this patch in our opencraft-release/* branches until edx-platform upgrades to Django 4.*
+# which will include this commit:
+# https://github.com/django/django/commit/518ce7a51f994fc0585d31c4553e2072bf816f76
+import django.db.backends.mysql.introspection
+
+
+def get_storage_engine(self, cursor, table_name):
+    """
+    This is a patched version of `get_storage_engine` that fixes a
+    performance issue with migrations. For more info see FAL-2248 and
+    https://github.com/django/django/pull/14766
+    """
+    cursor.execute("""
+        SELECT engine
+        FROM information_schema.tables
+        WHERE table_name = %s
+            AND table_schema = DATABASE()""", [table_name])
+    result = cursor.fetchone()
+    if not result:
+        return self.connection.features._mysql_storage_engine  # pylint: disable=protected-access
+    return result[0]
+
+
+django.db.backends.mysql.introspection.DatabaseIntrospection.get_storage_engine = get_storage_engine
diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index fb6625daf0f9..0c9732244cb6 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -140,6 +140,7 @@ def _add_course_certificates(self, count=1, signatory_count=0, is_active=True):
                 'name': 'Name ' + str(i),
                 'description': 'Description ' + str(i),
                 'course_title': 'course_title_' + str(i),
+                'course_description': 'course_description_' + str(i),
                 'org_logo_path': f'/t4x/orgX/testX/asset/org-logo-{i}.png',
                 'signatories': signatories,
                 'version': 1,
@@ -460,11 +461,6 @@ def test_rendering_course_organization_data(self):
             uuid=self.cert.verify_uuid
         )
         response = self.client.get(test_url)
-        self.assertContains(
-            response,
-            'a course of study offered by test_organization, an online learning initiative of test organization',
-        )
-        self.assertNotContains(response, 'a course of study offered by testorg')
         self.assertContains(response, f'<title>test_organization {self.course.number} Certificate |')
         self.assertContains(response, 'logo_test1.png')
 
@@ -549,21 +545,13 @@ def test_rendering_maximum_data(self):
         self.assertContains(response, '<a class="logo" href="http://test_site.localhost">')
         # Test an item from course info
         self.assertContains(response, 'course_title_0')
+        # Test an item from course description
+        self.assertContains(response, 'course_description_0')
         # Test an item from user info
         self.assertContains(response, f"{self.user.profile.name}, you earned a certificate!")
         # Test an item from social info
         self.assertContains(response, "Post on Facebook")
         self.assertContains(response, "Share on Twitter")
-        # Test an item from certificate/org info
-        self.assertContains(
-            response,
-            "a course of study offered by {partner_short_name}, "
-            "an online learning initiative of "
-            "{partner_long_name}.".format(
-                partner_short_name=short_org_name,
-                partner_long_name=long_org_name,
-            ),
-        )
         # Test item from badge info
         self.assertContains(response, "Add to Mozilla Backpack")
         # Test item from site configuration
diff --git a/lms/djangoapps/certificates/views/webview.py b/lms/djangoapps/certificates/views/webview.py
index 730b4526457b..85a57e2d3c56 100644
--- a/lms/djangoapps/certificates/views/webview.py
+++ b/lms/djangoapps/certificates/views/webview.py
@@ -254,7 +254,10 @@ def _update_course_context(request, context, course, platform_name):
     course_number = course.display_coursenumber if course.display_coursenumber else course.number
     context['course_number'] = course_number
     context['is_integrity_signature_enabled_for_course'] = settings.FEATURES.get('ENABLE_INTEGRITY_SIGNATURE')
-    if context['organization_long_name']:
+    course_description_override = context['certificate_data'].get('course_description', '')
+    if course_description_override:
+        context['accomplishment_copy_course_description'] = course_description_override
+    elif context['organization_long_name']:
         # Translators:  This text represents the description of course
         context['accomplishment_copy_course_description'] = _('a course of study offered by {partner_short_name}, '
                                                               'an online learning initiative of '
diff --git a/lms/djangoapps/courseware/access_utils.py b/lms/djangoapps/courseware/access_utils.py
index 059a11e5b308..e855a69885ec 100644
--- a/lms/djangoapps/courseware/access_utils.py
+++ b/lms/djangoapps/courseware/access_utils.py
@@ -9,23 +9,21 @@
 
 from django.conf import settings
 from pytz import UTC
+from xmodule.course_module import COURSE_VISIBILITY_PUBLIC
+from xmodule.util.xmodule_django import get_current_request_hostname
+
+from common.djangoapps.student.models import CourseEnrollment
+from common.djangoapps.student.roles import CourseBetaTesterRole
 from lms.djangoapps.courseware.access_response import (
     AccessResponse,
-    StartDateError,
-    EnrollmentRequiredAccessError,
     AuthenticationRequiredAccessError,
+    EnrollmentRequiredAccessError,
+    StartDateError
 )
 from lms.djangoapps.courseware.masquerade import get_course_masquerade, is_masquerading_as_student
 from openedx.core.djangoapps.util.user_messages import PageLevelMessages  # lint-amnesty, pylint: disable=unused-import
 from openedx.core.djangolib.markup import HTML  # lint-amnesty, pylint: disable=unused-import
-from openedx.features.course_experience import (
-    COURSE_PRE_START_ACCESS_FLAG,
-    COURSE_ENABLE_UNENROLLED_ACCESS_FLAG,
-)
-from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.student.roles import CourseBetaTesterRole
-from xmodule.util.xmodule_django import get_current_request_hostname  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.course_module import COURSE_VISIBILITY_PUBLIC  # lint-amnesty, pylint: disable=wrong-import-order
+from openedx.features.course_experience import COURSE_ENABLE_UNENROLLED_ACCESS_FLAG, COURSE_PRE_START_ACCESS_FLAG
 
 DEBUG_ACCESS = False
 log = getLogger(__name__)
@@ -75,7 +73,7 @@ def check_start_date(user, days_early_for_beta, start, course_key, display_error
     Returns:
         AccessResponse: Either ACCESS_GRANTED or StartDateError.
     """
-    start_dates_disabled = settings.FEATURES['DISABLE_START_DATES']
+    start_dates_disabled = settings.FEATURES.get('DISABLE_START_DATES', False)
     masquerading_as_student = is_masquerading_as_student(user, course_key)
 
     if start_dates_disabled and not masquerading_as_student:
diff --git a/lms/envs/common.py b/lms/envs/common.py
index acd86c3e90eb..fb0bbe150cf1 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -985,6 +985,29 @@
     # .. toggle_warnings: For consistency in user-experience, keep the value in sync with the setting of the same name
     #   in the LMS and CMS.
     'MARK_LIBRARY_CONTENT_BLOCK_COMPLETE_ON_VIEW': False,
+
+    # .. toggle_name: FEATURES['DISABLE_UNENROLLMENT']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Set to True to disable self-unenrollments via REST API.
+    #   This also hides the "Unenroll" button on the Learner Dashboard.
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2021-10-11
+    # .. toggle_warnings: For consistency in user experience, keep the value in sync with the setting of the same name
+    #   in the LMS and CMS.
+    # .. toggle_tickets: 'https://github.com/open-craft/edx-platform/pull/429'
+    'DISABLE_UNENROLLMENT': False,
+
+    # .. toggle_name: FEATURES['ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Whether to enable the legacy MD5 hashing algorithm to generate anonymous user id
+    #   instead of the newer SHAKE128 hashing algorithm
+    # .. toggle_use_cases: open_edx
+    # .. toggle_creation_date: 2022-08-08
+    # .. toggle_target_removal_date: None
+    # .. toggle_tickets: 'https://github.com/openedx/edx-platform/pull/30832'
+    'ENABLE_LEGACY_MD5_HASH_FOR_ANONYMOUS_USER_ID': False,
 }
 
 # Specifies extra XBlock fields that should available when requested via the Course Blocks API
@@ -4417,6 +4440,16 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 # .. toggle_creation_date: 2016-06-30
 ENABLE_COMPREHENSIVE_THEMING = False
 
+# .. setting_name: CUSTOM_RESOURCE_TEMPLATES_DIRECTORY
+# .. setting_default: None
+# .. setting_description: Path to an existing directory of YAML files containing
+#    html content to be used with the subclasses of xmodule.x_module.ResourceTemplates.
+#    Default example templates can be found in xmodule/templates/html.
+#    Note that the extension used is ".yaml" and not ".yml".
+#    See xmodule.x_module.ResourceTemplates for usage.
+#   "CUSTOM_RESOURCE_TEMPLATES_DIRECTORY" : null
+CUSTOM_RESOURCE_TEMPLATES_DIRECTORY = None
+
 # API access management
 API_ACCESS_MANAGER_EMAIL = 'api-access@example.com'
 API_ACCESS_FROM_EMAIL = 'api-requests@example.com'
diff --git a/lms/envs/test.py b/lms/envs/test.py
index b50f3e5e8a05..f98af9a089ac 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -636,3 +636,17 @@
 #################### Network configuration ####################
 # Tests are not behind any proxies
 CLOSEST_CLIENT_IP_FROM_HEADERS = []
+
+COURSE_ENROLLMENT_MODES['test'] = {
+    "id": 13,
+    "slug": "test",
+    "display_name": "Test",
+    "min_price": 0
+}
+
+COURSE_ENROLLMENT_MODES['test_mode'] = {
+    "id": 14,
+    "slug": "test_mode",
+    "display_name": "Test Mode",
+    "min_price": 0
+}
diff --git a/lms/static/js/student_account/views/AccessView.js b/lms/static/js/student_account/views/AccessView.js
index c460f3b907da..295b355b4038 100644
--- a/lms/static/js/student_account/views/AccessView.js
+++ b/lms/static/js/student_account/views/AccessView.js
@@ -173,7 +173,7 @@
                         this.listenTo(this.subview.login, 'password-help', this.resetPassword);
 
                     // Listen for 'auth-complete' event so we can enroll/redirect the user appropriately.
-                        if (!isTpaSaml) {
+                        if (this.isEnterpriseEnable == true && !isTpaSaml) {
                             this.listenTo(this.subview.login, 'auth-complete', this.loginComplete);
                         } else {
                             this.listenTo(this.subview.login, 'auth-complete', this.authComplete);
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 67a5a704050b..33f8dae798ad 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -635,6 +635,17 @@ html.video-fullscreen {
         border-bottom: 1px solid #ddd;
         margin-bottom: ($baseline*0.75);
         padding: 0 0 15px;
+
+        .problem-reset-btn-wrapper {
+          position: relative;
+          .problem-reset-btn {
+            &:hover,
+            &:focus,
+            &:active {
+              color: $primary;
+            }
+          }
+        }
       }
 
       .vert > .xblock-student_view.is-hidden,
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 59c5a77e58e5..c7fa05bde948 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -209,7 +209,12 @@
                 cert_status = cert_statuses.get(session_id)
                 can_refund_entitlement = entitlement and entitlement.is_entitlement_refundable()
                 partner_managed_enrollment = enrollment.mode == 'masters'
-                can_unenroll = False if partner_managed_enrollment else (not cert_status) or cert_status.get('can_unenroll') if not unfulfilled_entitlement else False
+                # checks if we can unenroll based on the value of partner_managed_enrollment
+                can_unenroll_partner_managed_enrollment = False if partner_managed_enrollment else (not cert_status)
+                # checks if we can unenroll based on the value of unfulfilled_entitlement
+                can_unenroll_unfulfilled_entitlement = cert_status.get('can_unenroll') if cert_status and not unfulfilled_entitlement else False
+                # compares the three different parameters by which we can unenroll
+                can_unenroll = (can_unenroll_partner_managed_enrollment or can_unenroll_unfulfilled_entitlement) and not disable_unenrollment
                 credit_status = credit_statuses.get(session_id)
                 course_mode_info = all_course_modes.get(session_id)
                 is_paid_course = True if entitlement else (session_id in enrolled_courses_either_paid)
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index 9d0cd188d28e..b9ab15659fb7 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -257,11 +257,11 @@ <h3 class="course-title" id="course-title-${enrollment.course_id}">
                 % endif
 
                 ## We should only show the gear dropdown if the user is able to refund/unenroll from their entitlement
-                ## and/or if they have selected a course run and email_settings are enabled
+                ## and/or if they have selected a course run, unenrollment is not disabled, and email_settings are enabled
                 ## as these are the only actions currently available
                 % if entitlement and (can_refund_entitlement or show_email_settings):
                     <%include file='_dashboard_entitlement_actions.html' args='course_overview=course_overview,entitlement=entitlement,dashboard_index=dashboard_index, can_refund_entitlement=can_refund_entitlement, show_email_settings=show_email_settings'/>
-                % elif not entitlement:
+                % elif not entitlement and (can_unenroll or partner_managed_enrollment or show_email_settings):
                     <div class="wrapper-action-more" data-course-key="${enrollment.course_id}">
                       <button type="button" class="action action-more" id="actions-dropdown-link-${dashboard_index}" aria-haspopup="true" aria-expanded="false" aria-controls="actions-dropdown-${dashboard_index}" data-course-number="${course_overview.number}" data-course-name="${course_overview.display_name_with_default}" data-dashboard-index="${dashboard_index}">
                         <span class="sr">${_('Course options for')}</span>
diff --git a/lms/templates/vert_module.html b/lms/templates/vert_module.html
index 131bbfc8cadc..0e52e3c7f426 100644
--- a/lms/templates/vert_module.html
+++ b/lms/templates/vert_module.html
@@ -69,6 +69,12 @@ <h2 class="hd hd-2 unit-title">${unit_title}</h2>
 % endfor
 </div>
 
+% if reset_button:
+  <div class="problem-reset-btn-wrapper">
+    <button type="button" class="problem-reset-btn btn-link" data-value="${_('Reset Problems')}"><span aria-hidden="true">${_('Reset Problems')}</span><span class="sr">${_("Reset Problems")}</span></button>
+  </div>
+% endif
+
 <%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">
     DateUtilFactory.transform('.localized-datetime');
 </%static:require_module_async>
diff --git a/openedx/core/djangoapps/content/block_structure/store.py b/openedx/core/djangoapps/content/block_structure/store.py
index 2342079bdc6e..2391a79b7bd8 100644
--- a/openedx/core/djangoapps/content/block_structure/store.py
+++ b/openedx/core/djangoapps/content/block_structure/store.py
@@ -6,7 +6,6 @@
 
 from logging import getLogger
 
-
 from openedx.core.lib.cache_utils import zpickle, zunpickle
 
 from . import config
@@ -230,10 +229,8 @@ def _encode_root_cache_key(bs_model):
         """
         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),
-        )
+        else:
+            return f"v{BlockStructureBlockData.VERSION}.root.key.{bs_model.data_usage_key}"
 
     @staticmethod
     def _version_data_of_block(root_block):
diff --git a/openedx/core/djangoapps/enrollments/serializers.py b/openedx/core/djangoapps/enrollments/serializers.py
index 9fde7c04033a..94c02f49c151 100644
--- a/openedx/core/djangoapps/enrollments/serializers.py
+++ b/openedx/core/djangoapps/enrollments/serializers.py
@@ -5,10 +5,13 @@
 
 import logging
 
+from django.core.exceptions import PermissionDenied
 from rest_framework import serializers
+from xmodule.modulestore.django import modulestore
 
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.models import CourseEnrollment
+from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
 
 log = logging.getLogger(__name__)
 
@@ -83,15 +86,49 @@ class CourseEnrollmentSerializer(serializers.ModelSerializer):
 
     """
     course_details = CourseSerializer(source="course_overview")
-    user = serializers.SerializerMethodField('get_username')
+    user = serializers.SerializerMethodField("get_username")
+    finished = serializers.SerializerMethodField()
+    grading = serializers.SerializerMethodField()
 
     def get_username(self, model):
         """Retrieves the username from the associated model."""
         return model.username
 
-    class Meta:
+    def get_finished(self, model):
+        """Retrieve finished course."""
+        course = modulestore().get_course(model.course_id)
+        if course:
+            try:
+                coursegrade = CourseGradeFactory().read(model.user, course).passed
+            except PermissionDenied:
+                return False
+            return coursegrade
+        return False
+
+    def get_grading(self, model):
+        """Retrieve course grade."""
+        course = modulestore().get_course(model.course_id)
+        course_grade = None
+        summary = []
+        current_grade = 0
+        if course:
+            try:
+                course_grade = CourseGradeFactory().read(model.user, course)
+                current_grade = int(course_grade.percent * 100)
+                for section in course_grade.summary.get('section_breakdown'):
+                    if section.get('prominent'):
+                        summary.append(section)
+            except PermissionDenied:
+                pass
+        return [
+            {'current_grade': current_grade,
+             'certificate_eligible': course_grade.passed if course_grade else False,
+             'summary': summary}
+        ]
+
+    class Meta(object):
         model = CourseEnrollment
-        fields = ('created', 'mode', 'is_active', 'course_details', 'user')
+        fields = ('created', 'mode', 'is_active', 'course_details', 'user', 'finished', 'grading')
         lookup_field = 'username'
 
 
diff --git a/openedx/core/djangoapps/enrollments/tests/fixtures/course-enrollments-api-list-valid-data.json b/openedx/core/djangoapps/enrollments/tests/fixtures/course-enrollments-api-list-valid-data.json
index 7822ad562626..3232d836f856 100644
--- a/openedx/core/djangoapps/enrollments/tests/fixtures/course-enrollments-api-list-valid-data.json
+++ b/openedx/core/djangoapps/enrollments/tests/fixtures/course-enrollments-api-list-valid-data.json
@@ -9,14 +9,74 @@
                 "is_active": true,
                 "mode": "honor",
                 "user": "student1",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:e+d+X",
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             }
         ]
     ],
@@ -30,21 +90,111 @@
                 "is_active": true,
                 "mode": "verified",
                 "user": "staff",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "verified",
                 "user": "student3",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             }
         ]
     ],
@@ -59,14 +209,74 @@
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "verified",
                 "user": "student3",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             }
         ]
     ],
@@ -81,7 +291,37 @@
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             }
         ]
     ],
@@ -95,21 +335,111 @@
                 "is_active": true,
                 "mode": "verified",
                 "user": "staff",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:e+d+X",
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             }
         ]
 
@@ -122,35 +452,185 @@
                 "is_active": true,
                 "mode": "honor",
                 "user": "student1",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:e+d+X",
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "verified",
                 "user": "student3",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "honor",
                 "user": "student2",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             },
             {
                 "course_id": "course-v1:x+y+Z",
                 "is_active": true,
                 "mode": "verified",
                 "user": "staff",
-                "created": "2018-01-01T00:00:01Z"
+                "created": "2018-01-01T00:00:01Z",
+                "finished": false,
+                "grading": [{
+                    "certificate_eligible": false,
+                    "current_grade": 0,
+                    "summary": [{
+                        "category": "Homework",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Homework Average = 0%",
+                        "label": "HW Avg"
+                    },{
+                        "category": "Lab",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Lab Average = 0%",
+                        "label": "Lab Avg"
+                    },{
+                        "category": "Midterm Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Midterm Exam = 0%",
+                        "label": "Midterm"
+                    },{
+                        "category": "Final Exam",
+                        "prominent": true,
+                        "percent": 0.0,
+                        "detail": "Final Exam = 0%",
+                        "label": "Final"
+                    }]
+                }]
             }
         ]
     ]
diff --git a/openedx/core/djangoapps/enrollments/tests/test_views.py b/openedx/core/djangoapps/enrollments/tests/test_views.py
index fca14e9c8475..65fa01e8029b 100644
--- a/openedx/core/djangoapps/enrollments/tests/test_views.py
+++ b/openedx/core/djangoapps/enrollments/tests/test_views.py
@@ -11,10 +11,11 @@
 from unittest.mock import patch
 from urllib.parse import quote
 
-import pytest
 import ddt
 import httpretty
+import pytest
 import pytz
+import six
 from django.conf import settings
 from django.core.cache import cache
 from django.core.exceptions import ImproperlyConfigured
@@ -30,6 +31,11 @@
 
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.course_modes.tests.factories import CourseModeFactory
+from common.djangoapps.student.models import CourseEnrollment
+from common.djangoapps.student.roles import CourseStaffRole
+from common.djangoapps.student.tests.factories import AdminFactory, SuperuserFactory, UserFactory
+from common.djangoapps.util.models import RateLimitConfiguration
+from common.djangoapps.util.testing import UrlResetMixin
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.course_groups import cohorts
 from openedx.core.djangoapps.embargo.models import Country, CountryAccessRule, RestrictedCourse
@@ -42,11 +48,6 @@
 from openedx.core.lib.django_test_client_utils import get_absolute_url
 from openedx.features.enterprise_support.tests import FAKE_ENTERPRISE_CUSTOMER
 from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseServiceMockMixin
-from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.student.roles import CourseStaffRole
-from common.djangoapps.student.tests.factories import AdminFactory, SuperuserFactory, UserFactory
-from common.djangoapps.util.models import RateLimitConfiguration
-from common.djangoapps.util.testing import UrlResetMixin
 
 
 class EnrollmentTestMixin:
@@ -64,7 +65,7 @@ def assert_enrollment_status(
             is_active=None,
             enrollment_attributes=None,
             min_mongo_calls=0,
-            max_mongo_calls=0,
+            max_mongo_calls=12,
             linked_enterprise_customer=None,
             cohort=None,
     ):
@@ -380,10 +381,7 @@ def test_enrollment_list_permissions(self):
                 mode_slug=CourseMode.DEFAULT_MODE_SLUG,
                 mode_display_name=CourseMode.DEFAULT_MODE_SLUG,
             )
-            self.assert_enrollment_status(
-                course_id=str(course.id),
-                max_mongo_calls=0,
-            )
+            self.assert_enrollment_status(course_id=six.text_type(course.id))
         # Verify the user himself can see both of his enrollments.
         self._assert_enrollments_visible_in_list([self.course, other_course])
         # Verify that self.other_user can't see any of the enrollments.
diff --git a/openedx/core/djangoapps/enrollments/urls.py b/openedx/core/djangoapps/enrollments/urls.py
index 6b875ec72df0..d0a84904bcea 100644
--- a/openedx/core/djangoapps/enrollments/urls.py
+++ b/openedx/core/djangoapps/enrollments/urls.py
@@ -13,6 +13,7 @@
     EnrollmentListView,
     EnrollmentUserRolesView,
     EnrollmentView,
+    SubmissionHistoryView,
     UnenrollmentView
 )
 
@@ -29,4 +30,5 @@
             EnrollmentCourseDetailView.as_view(), name='courseenrollmentdetails'),
     path('unenroll/', UnenrollmentView.as_view(), name='unenrollment'),
     path('roles/', EnrollmentUserRolesView.as_view(), name='roles'),
+    path('submission_history', SubmissionHistoryView.as_view(), name='submissionhistory'),
 ]
diff --git a/openedx/core/djangoapps/enrollments/views.py b/openedx/core/djangoapps/enrollments/views.py
index 01d4b58d6229..4ad47a714ab8 100644
--- a/openedx/core/djangoapps/enrollments/views.py
+++ b/openedx/core/djangoapps/enrollments/views.py
@@ -5,6 +5,7 @@
 """
 
 
+import json
 import logging
 
 from django.core.exceptions import (  # lint-amnesty, pylint: disable=wrong-import-order
@@ -17,6 +18,7 @@
 from edx_rest_framework_extensions.auth.session.authentication import \
     SessionAuthenticationAllowInactiveUser  # lint-amnesty, pylint: disable=wrong-import-order
 from opaque_keys import InvalidKeyError  # lint-amnesty, pylint: disable=wrong-import-order
+from opaque_keys.edx.locator import CourseLocator
 from opaque_keys.edx.keys import CourseKey  # lint-amnesty, pylint: disable=wrong-import-order
 from rest_framework import permissions, status  # lint-amnesty, pylint: disable=wrong-import-order
 from rest_framework.generics import ListAPIView  # lint-amnesty, pylint: disable=wrong-import-order
@@ -29,6 +31,8 @@
 from common.djangoapps.student.models import CourseEnrollment, User
 from common.djangoapps.student.roles import CourseStaffRole, GlobalStaff
 from common.djangoapps.util.disable_rate_limit import can_disable_rate_limit
+from lms.djangoapps.courseware.courses import get_course
+from lms.djangoapps.courseware.models import BaseStudentModuleHistory, StudentModule
 from openedx.core.djangoapps.cors_csrf.authentication import SessionAuthenticationCrossDomainCsrf
 from openedx.core.djangoapps.cors_csrf.decorators import ensure_csrf_cookie_cross_domain
 from openedx.core.djangoapps.course_groups.cohorts import CourseUserGroup, add_user_to_cohort, get_cohort_by_name
@@ -45,7 +49,10 @@
 from openedx.core.djangoapps.user_api.accounts.permissions import CanRetireUser
 from openedx.core.djangoapps.user_api.models import UserRetirementStatus
 from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in
-from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
+from openedx.core.lib.api.authentication import (
+    BearerAuthenticationAllowInactiveUser,
+    OAuth2AuthenticationAllowInactiveUser
+)
 from openedx.core.lib.api.permissions import ApiKeyHeaderPermission, ApiKeyHeaderPermissionIsAuthenticated
 from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin
 from openedx.core.lib.exceptions import CourseNotFoundError
@@ -973,3 +980,164 @@ def get_queryset(self):
         if usernames:
             queryset = queryset.filter(user__username__in=usernames)
         return queryset
+
+
+@can_disable_rate_limit
+class SubmissionHistoryView(APIView, ApiKeyPermissionMixIn):
+    """
+    Submission history view.
+    """
+    authentication_classes = (OAuth2AuthenticationAllowInactiveUser, EnrollmentCrossDomainSessionAuth)
+    permission_classes = (ApiKeyHeaderPermissionIsAuthenticated, )
+
+    def get(self, request):
+        """
+        Get submission history details.
+
+        **Usecases**:
+
+            Regular users can only retrieve their own submission history and users with GlobalStaff status
+            can retrieve everyone's submission history.
+
+        **Example Requests**:
+
+            GET /api/enrollment/v1/submission_history?course_id=course_id
+            GET /api/enrollment/v1/submission_history?course_id=course_id&user=username
+            GET /api/enrollment/v1/submission_history?course_id=course_id&all_users=true
+
+        **Query Parameters for GET**
+
+            * course_id: Course id to retrieve submission history.
+            * username: Single username for which this view will retrieve the submission history details.
+                If no username specified the requester's username will be used.
+            * all_users: If true and if the requester has the correct permissions,
+                retrieve history submission from every user in a course id.
+
+        **Response Values**:
+
+            If there's an error while getting the submission history an empty response will
+            be returned.
+            The submission history response has the following attributes:
+
+                * Results: A list of submission history:
+                    * course_id: Course id
+                    * course_name: Course name
+                    * user: Username
+                    * problems: List of problems
+                        * location: problem location
+                        * name: problem's display name
+                        * submission_history: List of submission history
+                            * state: State of submission.
+                            * grade: Grade.
+                            * max_grade: Maximum possible grade.
+                        * data: problem's data.
+        """
+        username = request.GET.get('username', request.user.username)
+        data = []
+        if GlobalStaff().has_user(request.user):
+            all_users = bool(request.GET.get('all', False))
+        else:
+            all_users = False
+        course_id = request.GET.get('course_id')
+
+        if not (all_users or username == request.user.username or GlobalStaff().has_user(request.user) or
+                self.has_api_key_permissions(request)):
+            return Response(data)
+
+        course_enrollments = CourseEnrollment.objects.select_related('user').filter(is_active=True)
+        if course_id:
+            if not course_id.startswith("course-v1:"):
+                course_id = "course-v1:{}".format(course_id)
+            try:
+                course_enrollments = course_enrollments.filter(
+                    course_id=CourseLocator.from_string(course_id.replace(' ', '+'))
+                ).order_by('created')
+            except KeyError:
+                return Response(data)
+
+        if not all_users:
+            course_enrollments = course_enrollments.filter(user__username=username).order_by('created')
+
+        courses = {}
+        for course_enrollment in course_enrollments:
+            try:
+                course_list = courses.get(course_enrollment.course_id)
+                if course_list:
+                    course, course_children = course_list
+                else:
+                    course = get_course(course_enrollment.course_id, depth=4)
+                    course_children = course.get_children()
+                    courses[course_enrollment.course_id] = [course, course_children]
+            except ValueError:
+                continue
+            course_data = self._get_course_data(course_enrollment, course, course_children)
+            data.append(course_data)
+
+        return Response({'results': data})
+
+    def _get_problem_data(self, course_enrollment, component):
+        """
+        Get problem data from a course enrollment.
+
+        Args:
+        -----
+        course_enrollment: Course Enrollment.
+        component: Component to analyze.
+        """
+        problem_data = {
+            'location': str(component.location),
+            'name': component.display_name,
+            'submission_history': [],
+            'data': component.data
+        }
+
+        csm = StudentModule.objects.filter(
+            module_state_key=component.location,
+            student__username=course_enrollment.user.username,
+            course_id=course_enrollment.course_id)
+
+        scores = BaseStudentModuleHistory.get_history(csm)
+        for i, score in enumerate(scores):
+            if i % 2 == 1:
+                continue
+
+            state = score.state
+            if state is not None:
+                state = json.loads(state)
+
+            history_data = {
+                'state': state,
+                'grade': score.grade,
+                'max_grade': score.max_grade
+            }
+            problem_data['submission_history'].append(history_data)
+
+        return problem_data
+
+    def _get_course_data(self, course_enrollment, course, course_children):
+        """
+        Get course data.
+
+        Params:
+        --------
+
+        course_enrollment (CourseEnrollment): course enrollment
+        course: course
+        course_children: course children
+        """
+
+        course_data = {
+            'course_id': str(course_enrollment.course_id),
+            'course_name': course.display_name_with_default,
+            'user': course_enrollment.user.username,
+            'problems': []
+        }
+        for section in course_children:
+            for subsection in section.get_children():
+                for vertical in subsection.get_children():
+                    for component in vertical.get_children():
+                        if component.location.category == 'problem' and getattr(component, 'has_score', False):
+                            problem_data = self._get_problem_data(course_enrollment, component)
+                            course_data['problems'].append(problem_data)
+
+        return course_data
diff --git a/openedx/core/djangoapps/password_policy/forms.py b/openedx/core/djangoapps/password_policy/forms.py
index 389669c370e1..7651583053b7 100644
--- a/openedx/core/djangoapps/password_policy/forms.py
+++ b/openedx/core/djangoapps/password_policy/forms.py
@@ -6,6 +6,7 @@
 from django.forms import ValidationError
 
 from openedx.core.djangoapps.password_policy import compliance as password_policy_compliance
+from openedx.core.djangolib.markup import HTML
 
 
 class PasswordPolicyAwareAdminAuthForm(AdminAuthenticationForm):
@@ -24,9 +25,9 @@ def clean(self):
                 password_policy_compliance.enforce_compliance_on_login(self.user_cache, cleaned_data['password'])
             except password_policy_compliance.NonCompliantPasswordWarning as e:
                 # Allow login, but warn the user that they will be required to reset their password soon.
-                messages.warning(self.request, str(e))
+                messages.warning(self.request, HTML(str(e)))
             except password_policy_compliance.NonCompliantPasswordException as e:
                 # Prevent the login attempt.
-                raise ValidationError(str(e))  # lint-amnesty, pylint: disable=raise-missing-from
+                raise ValidationError(HTML(str(e)))  # lint-amnesty, pylint: disable=raise-missing-from
 
         return cleaned_data
diff --git a/openedx/core/djangoapps/user_authn/views/login.py b/openedx/core/djangoapps/user_authn/views/login.py
index 111a7ae3e800..4bcc4226f3c6 100644
--- a/openedx/core/djangoapps/user_authn/views/login.py
+++ b/openedx/core/djangoapps/user_authn/views/login.py
@@ -187,7 +187,7 @@ def _enforce_password_policy_compliance(request, user):  # lint-amnesty, pylint:
         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, str(e))
+        PageLevelMessages.register_warning_message(request, HTML(str(e)))
     except password_policy_compliance.NonCompliantPasswordException as e:
         # Increment the lockout counter to safguard from further brute force requests
         # if user's password has been compromised.
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index f26b826acf2c..6bf6cb7c5dd4 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -517,7 +517,7 @@ edx-rest-api-client==5.5.0
     #   -r requirements/edx/base.in
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.2.0
+edx-search==3.4.0
     # via -r requirements/edx/base.in
 edx-sga==0.18.0
     # via -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 2c07fd2c7ad2..ff321a3f5349 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -634,7 +634,7 @@ edx-rest-api-client==5.5.0
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.2.0
+edx-search==3.4.0
     # via -r requirements/edx/testing.txt
 edx-sga==0.18.0
     # via -r requirements/edx/testing.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 6d2b8392d650..0f319f998884 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -616,7 +616,7 @@ edx-rest-api-client==5.5.0
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==3.2.0
+edx-search==3.4.0
     # via -r requirements/edx/base.txt
 edx-sga==0.18.0
     # via -r requirements/edx/base.txt