diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml
index 4f95444df5..e64999afb4 100644
--- a/.github/workflows/pylint-checks.yml
+++ b/.github/workflows/pylint-checks.yml
@@ -21,7 +21,7 @@ jobs:
           - module-name: openedx-1
             path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/demographics/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/tests/ openedx/core/djangoapps/course_live/"
           - module-name: openedx-2
-            path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/self_paced/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/learner_pathway/"
+            path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/learner_pathway/"
           - module-name: common
             path: "common"
           - module-name: cms
diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json
index 838d0fe261..d106c71e04 100644
--- a/.github/workflows/unit-test-shards.json
+++ b/.github/workflows/unit-test-shards.json
@@ -132,7 +132,6 @@
       "openedx/core/djangoapps/programs/",
       "openedx/core/djangoapps/safe_sessions/",
       "openedx/core/djangoapps/schedules/",
-      "openedx/core/djangoapps/self_paced/",
       "openedx/core/djangoapps/service_status/",
       "openedx/core/djangoapps/session_inactivity_timeout/",
       "openedx/core/djangoapps/signals/",
@@ -212,7 +211,6 @@
       "openedx/core/djangoapps/programs/",
       "openedx/core/djangoapps/safe_sessions/",
       "openedx/core/djangoapps/schedules/",
-      "openedx/core/djangoapps/self_paced/",
       "openedx/core/djangoapps/service_status/",
       "openedx/core/djangoapps/session_inactivity_timeout/",
       "openedx/core/djangoapps/signals/",
diff --git a/cms/djangoapps/contentstore/management/commands/edit_course_tabs.py b/cms/djangoapps/contentstore/management/commands/edit_course_tabs.py
index feb624ce49..0381d638d8 100644
--- a/cms/djangoapps/contentstore/management/commands/edit_course_tabs.py
+++ b/cms/djangoapps/contentstore/management/commands/edit_course_tabs.py
@@ -33,7 +33,7 @@ def print_course(course):
 
 
 # course.tabs looks like this
-# [{u'type': u'courseware'}, {u'type': u'course_info', u'name': u'Course Info'}, {u'type': u'textbooks'},
+# [{u'type': u'courseware'}, {u'type': u'textbooks'},
 # {u'type': u'discussion', u'name': u'Discussion'}, {u'type': u'wiki', u'name': u'Wiki'},
 # {u'type': u'progress', u'name': u'Progress'}]
 
@@ -53,7 +53,7 @@ command again, adding --insert or --delete to edit the list.
 
     course_help = '--course <id> required, e.g. Stanford/CS99/2013_spring'
     delete_help = '--delete <tab-number>'
-    insert_help = '--insert <tab-number> <type> <name>, e.g. 4 "course_info" "Course Info"'
+    insert_help = '--insert <tab-number> <type> <name>, e.g. 4 "discussion" "Discussion"'
 
     def add_arguments(self, parser):
         parser.add_argument('--course',
diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_backfill_course_tabs.py b/cms/djangoapps/contentstore/management/commands/tests/test_backfill_course_tabs.py
index 258f00a133..a83eb621b3 100644
--- a/cms/djangoapps/contentstore/management/commands/tests/test_backfill_course_tabs.py
+++ b/cms/djangoapps/contentstore/management/commands/tests/test_backfill_course_tabs.py
@@ -40,13 +40,13 @@ class BackfillCourseTabsTest(ModuleStoreTestCase):
         course = CourseFactory()
         course.tabs = [tab for tab in course.tabs if tab.type != 'dates']
         self.update_course(course, ModuleStoreEnum.UserID.test)
-        assert len(course.tabs) == 6
+        assert len(course.tabs) == 5
         assert 'dates' not in {tab.type for tab in course.tabs}
 
         call_command('backfill_course_tabs')
 
         course = self.store.get_course(course.id)
-        assert len(course.tabs) == 7
+        assert len(course.tabs) == 6
         assert 'dates' in {tab.type for tab in course.tabs}
         mock_logger.info.assert_any_call(f'Updating tabs for {course.id}.')
         mock_logger.info.assert_any_call(f'Successfully updated tabs for {course.id}.')
@@ -66,16 +66,16 @@ class BackfillCourseTabsTest(ModuleStoreTestCase):
         CourseFactory()
         CourseFactory()
         course = CourseFactory()
-        course.tabs = [tab for tab in course.tabs if tab.type in ('course_info', 'courseware')]
+        course.tabs = [tab for tab in course.tabs if tab.type == 'courseware']
         self.update_course(course, ModuleStoreEnum.UserID.test)
-        assert len(course.tabs) == 2
+        assert len(course.tabs) == 1
         assert 'dates' not in {tab.type for tab in course.tabs}
         assert 'progress' not in {tab.type for tab in course.tabs}
 
         call_command('backfill_course_tabs')
 
         course = self.store.get_course(course.id)
-        assert len(course.tabs) == 7
+        assert len(course.tabs) == 6
         assert 'dates' in {tab.type for tab in course.tabs}
         assert 'progress' in {tab.type for tab in course.tabs}
         mock_logger.info.assert_any_call('4 courses read from modulestore. Processing 0 to 4.')
@@ -99,8 +99,8 @@ class BackfillCourseTabsTest(ModuleStoreTestCase):
         course_2 = CourseFactory()
         course_2.tabs = [tab for tab in course_2.tabs if tab.type != 'progress']
         self.update_course(course_2, ModuleStoreEnum.UserID.test)
-        assert len(course_1.tabs) == 6
-        assert len(course_2.tabs) == 6
+        assert len(course_1.tabs) == 5
+        assert len(course_2.tabs) == 5
         assert 'dates' not in {tab.type for tab in course_1.tabs}
         assert 'progress' not in {tab.type for tab in course_2.tabs}
 
@@ -108,8 +108,8 @@ class BackfillCourseTabsTest(ModuleStoreTestCase):
 
         course_1 = self.store.get_course(course_1.id)
         course_2 = self.store.get_course(course_2.id)
-        assert len(course_1.tabs) == 7
-        assert len(course_2.tabs) == 7
+        assert len(course_1.tabs) == 6
+        assert len(course_2.tabs) == 6
         assert 'dates' in {tab.type for tab in course_1.tabs}
         assert 'progress' in {tab.type for tab in course_2.tabs}
         mock_logger.info.assert_any_call('2 courses read from modulestore. Processing 0 to 2.')
@@ -168,13 +168,13 @@ class BackfillCourseTabsTest(ModuleStoreTestCase):
     def test_arguments_batching(self, start, count, expected_tabs_modified):
         courses = CourseFactory.create_batch(4)
         for course in courses:
-            course.tabs = [tab for tab in course.tabs if tab.type in ('course_info', 'courseware')]
+            course.tabs = [tab for tab in course.tabs if tab.type == 'courseware']
             course = self.update_course(course, ModuleStoreEnum.UserID.test)
-            assert len(course.tabs) == 2
+            assert len(course.tabs) == 1
 
         BackfillCourseTabsConfig.objects.create(enabled=True, start_index=start, count=count)
         call_command('backfill_course_tabs')
 
         for i, course in enumerate(courses):
             course = self.store.get_course(course.id)
-            assert len(course.tabs) == (7 if expected_tabs_modified[i] else 2), f'Wrong tabs for course index {i}'
+            assert len(course.tabs) == (6 if expected_tabs_modified[i] else 1), f'Wrong tabs for course index {i}'
diff --git a/cms/djangoapps/contentstore/tests/test_course_listing.py b/cms/djangoapps/contentstore/tests/test_course_listing.py
index 3c9705fdf2..9baa1c044f 100644
--- a/cms/djangoapps/contentstore/tests/test_course_listing.py
+++ b/cms/djangoapps/contentstore/tests/test_course_listing.py
@@ -315,24 +315,24 @@ class TestCourseListing(ModuleStoreTestCase):
         all of them.
         """
         org_course_one = self.store.make_course_key('AwesomeOrg', 'Course1', 'RunBabyRun')
-        CourseFactory.create(
+        course_1 = CourseFactory.create(
             org=org_course_one.org,
             number=org_course_one.course,
             run=org_course_one.run
         )
+        CourseOverviewFactory.create(id=course_1.id, org='AwesomeOrg')
 
         org_course_two = self.store.make_course_key('AwesomeOrg', 'Course2', 'RunBabyRun')
-        CourseFactory.create(
+        course_2 = CourseFactory.create(
             org=org_course_two.org,
             number=org_course_two.course,
             run=org_course_two.run
         )
+        CourseOverviewFactory.create(id=course_2.id, org='AwesomeOrg')
 
         # Two types of org-wide roles have edit permissions: staff and instructor.  We test both
         role.add_users(self.user)
 
-        with self.assertRaises(AccessListFallback):
-            _accessible_courses_list_from_groups(self.request)
         courses_list, __ = get_courses_accessible_to_user(self.request)
 
         # Verify fetched accessible courses list is a list of CourseSummery instances and test expacted
@@ -340,6 +340,17 @@ class TestCourseListing(ModuleStoreTestCase):
         self.assertEqual(len(list(courses_list)), 2)
         self.assertTrue(all(isinstance(course, CourseOverview) for course in courses_list))
 
+    @ddt.data(OrgStaffRole(), OrgInstructorRole())
+    def test_course_listing_org_permissions_exception(self, role):
+        """
+        Create roles with no course_id neither org to make sure AccessListFallback is raised for
+        platform-wide permissions
+        """
+        role.add_users(self.user)
+
+        with self.assertRaises(AccessListFallback):
+            _accessible_courses_list_from_groups(self.request)
+
     def test_course_listing_with_actions_in_progress(self):
         sourse_course_key = CourseLocator('source-Org', 'source-Course', 'source-Run')
 
diff --git a/cms/djangoapps/contentstore/tests/test_import.py b/cms/djangoapps/contentstore/tests/test_import.py
index 41b06729ac..4c63ecd735 100644
--- a/cms/djangoapps/contentstore/tests/test_import.py
+++ b/cms/djangoapps/contentstore/tests/test_import.py
@@ -173,7 +173,7 @@ class ContentStoreImportTest(ModuleStoreTestCase):
     def test_tab_name_imports_correctly(self):
         _module_store, _content_store, course = self.load_test_import_course()
         print(f"course tabs = {course.tabs}")
-        self.assertEqual(course.tabs[2]['name'], 'Syllabus')
+        self.assertEqual(course.tabs[1]['name'], 'Syllabus')
 
     def test_import_performance_mongo(self):
         store = modulestore()._get_modulestore_by_type(ModuleStoreEnum.Type.mongo)
diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py
index d0c76125e9..b166de0ef9 100644
--- a/cms/djangoapps/contentstore/tests/test_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_utils.py
@@ -738,32 +738,41 @@ class ValidateCourseOlxTests(CourseTestCase):
             )
 
 
-class DetermineLabelTestCase(TestCase):
-    """Tests for xblock Title quirks"""
+class DetermineLabelTests(TestCase):
+    """Tests for xblock Title"""
 
-    def validate_html_replaced_with_text(self):
+    def test_html_replaced_with_text_for_none(self):
         """
-        Tests that display names for "html" xblocks are repleaced with "Text" when the display name is otherwise unset.
+        Tests that display names for "html" xblocks are replaced with "Text" when the display name is otherwise unset.
         """
         display_name = None
         block_type = "html"
         result = utils.determine_label(display_name, block_type)
-        self.assertEqual(result, display_name)
+        self.assertEqual(result, "Text")
 
-    def validate_set_titles_not_replaced(self):
+    def test_html_replaced_with_text_for_empty(self):
         """
-        Tests that display names for "html" xblocks are not repleaced with "Text" when the display name is set.
+        Tests that display names for "html" xblocks are replaced with "Text" when the display name is empty.
+        """
+        display_name = ""
+        block_type = "html"
+        result = utils.determine_label(display_name, block_type)
+        self.assertEqual(result, "Text")
+
+    def test_set_titles_not_replaced(self):
+        """
+        Tests that display names for "html" xblocks are not replaced with "Text" when the display name is set.
         """
         display_name = "Something"
         block_type = "html"
         result = utils.determine_label(display_name, block_type)
-        self.assertEqual(result, display_name)
+        self.assertEqual(result, "Something")
 
-    def validate_non_html_blocks_titles_not_replaced(self):
+    def test_non_html_blocks_titles_not_replaced(self):
         """
-        Tests that display names for non-"html" xblocks are not repleaced with "Text" when the display name is set.
+        Tests that display names for non-"html" xblocks are not replaced with "Text" when the display name is set.
         """
         display_name = None
         block_type = "something else"
         result = utils.determine_label(display_name, block_type)
-        self.assertEqual(result, display_name)
+        self.assertEqual(result, "something else")
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index bb5a53fb94..3aa171c922 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -708,10 +708,13 @@ def determine_label(display_name, block_type):
     Returns the name of the xblock to display in studio.
     Please see TNL-9838.
     """
-    label = display_name
-    if block_type == 'html':
-        label = _("Text")
-    return label
+    if display_name in {"", None}:
+        if block_type == 'html':
+            return _("Text")
+        else:
+            return block_type
+    else:
+        return display_name
 
 
 @contextmanager
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 10b78596ae..b8db950d74 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -483,10 +483,20 @@ def _accessible_courses_list_from_groups(request):
     courses_list = []
     course_keys = {}
 
+    user_global_orgs = set()
     for course_access in all_courses:
-        if course_access.course_id is None:
+        if course_access.course_id is not None:
+            course_keys[course_access.course_id] = course_access.course_id
+        elif course_access.org:
+            user_global_orgs.add(course_access.org)
+        else:
             raise AccessListFallback
-        course_keys[course_access.course_id] = course_access.course_id
+
+    if user_global_orgs:
+        # Getting courses from user global orgs
+        overviews = CourseOverview.get_all_courses(orgs=list(user_global_orgs))
+        overviews_course_keys = {overview.id: overview.id for overview in overviews}
+        course_keys.update(overviews_course_keys)
 
     course_keys = list(course_keys.values())
 
diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index b64a77ddb2..0d7e8786b4 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -212,7 +212,6 @@ def _preview_module_system(request, descriptor, field_data):
         # TODO (cpennington): Do we want to track how instructors are using the preview problems?
         track_function=lambda event_type, event: None,
         get_module=partial(_load_preview_module, request),
-        debug=True,
         mixins=settings.XBLOCK_MIXINS,
         course_id=course_id,
 
diff --git a/cms/djangoapps/contentstore/views/tabs.py b/cms/djangoapps/contentstore/views/tabs.py
index 5482be63dc..85f6b89850 100644
--- a/cms/djangoapps/contentstore/views/tabs.py
+++ b/cms/djangoapps/contentstore/views/tabs.py
@@ -220,8 +220,8 @@ def get_tab_by_locator(tab_list: List[CourseTab], tab_location: Union[str, Usage
 
 def validate_args(num, tab_type):
     "Throws for the disallowed cases."
-    if num <= 1:
-        raise ValueError('Tabs 1 and 2 cannot be edited')
+    if num < 1:
+        raise ValueError('Tab 1 cannot be edited')
     if tab_type == 'static_tab':
         raise ValueError('Tabs of type static_tab cannot be edited here (use Studio)')
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_tabs.py b/cms/djangoapps/contentstore/views/tests/test_tabs.py
index e366420d22..58a6393585 100644
--- a/cms/djangoapps/contentstore/views/tests/test_tabs.py
+++ b/cms/djangoapps/contentstore/views/tests/test_tabs.py
@@ -113,7 +113,7 @@ class TabsPageTests(CourseTestCase):
     def test_reorder_tabs_invalid_tab(self):
         """Test re-ordering of tabs with invalid tab"""
 
-        invalid_tab_ids = ['courseware', 'info', 'invalid_tab_id']
+        invalid_tab_ids = ['courseware', 'invalid_tab_id']
 
         # post the request
         resp = self.client.ajax_post(
@@ -189,16 +189,14 @@ class PrimitiveTabEdit(ModuleStoreTestCase):
         course = CourseFactory.create()
         with self.assertRaises(ValueError):
             tabs.primitive_delete(course, 0)
-        with self.assertRaises(ValueError):
-            tabs.primitive_delete(course, 1)
         with self.assertRaises(IndexError):
-            tabs.primitive_delete(course, 7)
+            tabs.primitive_delete(course, 6)
 
-        assert course.tabs[2] != {'type': 'dates', 'name': 'Dates'}
-        tabs.primitive_delete(course, 2)
+        assert course.tabs[1] != {'type': 'dates', 'name': 'Dates'}
+        tabs.primitive_delete(course, 1)
         assert {'type': 'progress'} not in course.tabs
         # Check that dates has shifted up
-        assert course.tabs[2] == {'type': 'dates', 'name': 'Dates'}
+        assert course.tabs[1] == {'type': 'dates', 'name': 'Dates'}
 
     def test_insert(self):
         """Test primitive tab insertion."""
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 876fe559aa..d932f61c47 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1112,10 +1112,10 @@ COURSES_WITH_UNSAFE_CODE = []
 # Cojail REST service
 ENABLE_CODEJAIL_REST_SERVICE = False
 # .. setting_name: CODE_JAIL_REST_SERVICE_REMOTE_EXEC
-# .. setting_default: 'common.lib.capa.capa.safe_exec.remote_exec.send_safe_exec_request_v0'
+# .. setting_default: 'capa.safe_exec.remote_exec.send_safe_exec_request_v0'
 # .. setting_description: Set the python package.module.function that is reponsible of
 #   calling the remote service in charge of jailed code execution
-CODE_JAIL_REST_SERVICE_REMOTE_EXEC = 'common.lib.capa.capa.safe_exec.remote_exec.send_safe_exec_request_v0'
+CODE_JAIL_REST_SERVICE_REMOTE_EXEC = 'capa.safe_exec.remote_exec.send_safe_exec_request_v0'
 # .. setting_name: CODE_JAIL_REST_SERVICE_HOST
 # .. setting_default: 'http://127.0.0.1:8550'
 # .. setting_description: Set the codejail remote service host
@@ -1661,9 +1661,6 @@ INSTALLED_APPS = [
     # edx-milestones service
     'milestones',
 
-    # Self-paced course configuration
-    'openedx.core.djangoapps.self_paced',
-
     # Coursegraph
     'cms.djangoapps.coursegraph.apps.CoursegraphConfig',
 
diff --git a/cms/envs/production.py b/cms/envs/production.py
index 82244acbde..8a20a6ba12 100644
--- a/cms/envs/production.py
+++ b/cms/envs/production.py
@@ -110,8 +110,8 @@ EDX_PLATFORM_REVISION = REVISION_CONFIG.get('EDX_PLATFORM_REVISION', EDX_PLATFOR
 BROKER_POOL_LIMIT = 0
 BROKER_CONNECTION_TIMEOUT = 1
 
-# For the Result Store, use the django cache named 'celery'
-CELERY_RESULT_BACKEND = 'django-cache'
+# Allow env to configure celery result backend with default set to django-cache
+CELERY_RESULT_BACKEND = ENV_TOKENS.get('CELERY_RESULT_BACKEND', 'django-cache')
 
 # When the broker is behind an ELB, use a heartbeat to refresh the
 # connection and to detect if it has been dropped.
diff --git a/cms/lib/xblock/test/test_authoring_mixin.py b/cms/lib/xblock/test/test_authoring_mixin.py
index 9d848b06ba..6028f39614 100644
--- a/cms/lib/xblock/test/test_authoring_mixin.py
+++ b/cms/lib/xblock/test/test_authoring_mixin.py
@@ -14,9 +14,9 @@ from xmodule.partitions.partitions import (
     Group,
     UserPartition
 )
+from xmodule.tests.test_export import PureXBlock
 
 from common.djangoapps.course_modes.tests.factories import CourseModeFactory
-from common.lib.xmodule.xmodule.tests.test_export import PureXBlock
 
 
 class AuthoringMixinTestCase(ModuleStoreTestCase):
diff --git a/cms/static/js/i18n/ar/djangojs.js b/cms/static/js/i18n/ar/djangojs.js
index 4c5b0cc8a8..89faf805af 100644
--- a/cms/static/js/i18n/ar/djangojs.js
+++ b/cms/static/js/i18n/ar/djangojs.js
@@ -168,7 +168,6 @@
     "(Caption will be displayed when you start playing the video.)": "(\u0633\u062a\u064f\u0639\u0631\u0636 \u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0641\u0631\u0639\u064a\u0651\u0629 \u0645\u0639 \u0628\u062f\u0621 \u0639\u0631\u0636 \u0645\u0642\u0637\u0639 \u0627\u0644\u0641\u064a\u062f\u064a\u0648.)",
     "(Community TA)": "(\u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u0633\u0627\u0639\u062f\u064a \u0627\u0644\u0645\u0639\u0644\u0645\u064a\u0646)",
     "(Optional)": "(\u0627\u062e\u062a\u064a\u0627\u0631\u064a)",
-    "(Read-only)": "(\u0644\u0644\u0642\u0631\u0627\u0621\u0629 \u0641\u0642\u0637)",
     "(Required Field)": "(\u062d\u0642\u0644 \u0645\u0637\u0644\u0648\u0628)",
     "(Self-paced) Ended {end}": "(\u062a\u062f\u0631\u064a\u0628 \u0630\u0627\u062a\u064a) \u0627\u0646\u062a\u0647\u0649 {end}",
     "(Self-paced) Ends {end}": "(\u062a\u062f\u0631\u064a\u0628 \u0630\u0627\u062a\u064a) \u064a\u0646\u062a\u0647\u064a \u0628\u062a\u0627\u0631\u064a\u062e {end}",
@@ -322,7 +321,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "\u062d\u062f\u062b \u062e\u0637\u0623. \u0627\u0646\u062a\u0638\u0631 \u0628\u0636\u0639 \u062f\u0642\u0627\u0626\u0642 \u060c \u062b\u0645 \u062d\u0627\u0648\u0644 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "\u0646\u0623\u0633\u0641 \u0644\u062d\u062f\u0648\u062b \u062e\u0637\u0623 \u0641\u064a \u0627\u0633\u062a\u0631\u062f\u0627\u062f \u0631\u0633\u0627\u0644\u0629 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a. \u064a\u064f\u0631\u062c\u0649 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629 \u0644\u0627\u062d\u0642\u064b\u0627\u060c \u0648\u0627\u0644\u0627\u062a\u0651\u0635\u0627\u0644 \u0628\u0641\u0631\u064a\u0642 \u0627\u0644\u062f\u0639\u0645 \u0627\u0644\u0641\u0646\u0651\u064a \u0641\u064a \u062d\u0627\u0644 \u0627\u0633\u062a\u0645\u0631\u0651\u062a \u0627\u0644\u0645\u0634\u0643\u0644\u0629.",
     "An error occurred when signing you in to %s.": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0645\u062d\u0627\u0648\u0644\u0629 \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0625\u0644\u0649 %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0645\u062d\u0627\u0648\u0644\u0629 \u0627\u0633\u062a\u0631\u062f\u0627\u062f \u0623\u0648 \u062d\u0641\u0638 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0623\u062f\u0646\u0627\u0647\u060c \u064a\u0631\u062c\u0649 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649 \u0644\u0627\u062d\u0642\u064b\u0627.",
     "An error occurred while looking up team membership. Try refreshing the page.": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0627\u0644\u0628\u062d\u062b \u0639\u0646 \u0639\u0636\u0648\u064a\u0629 \u0627\u0644\u0641\u0631\u064a\u0642. \u062d\u0627\u0648\u0644 \u062a\u062d\u062f\u064a\u062b \u0627\u0644\u0635\u0641\u062d\u0629.",
     "An error occurred while removing the member from the team. Try again.": "\u0646\u0623\u0633\u0641 \u0644\u062d\u062f\u0648\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0625\u0633\u062a\u0628\u0639\u0627\u062f \u0639\u0636\u0648 \u0645\u0646 \u0627\u0644\u0641\u0631\u064a\u0642. \u064a\u064f\u0631\u062c\u0649 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629.",
     "An error occurred.": "\u0646\u0623\u0633\u0641 \u0644\u062d\u062f\u0648\u062b \u062e\u0637\u0623. ",
@@ -409,7 +407,6 @@
     "Bottom": "\u0627\u0644\u0623\u0633\u0641\u0644",
     "Browse": "\u062a\u0635\u0641\u0651\u062d",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "\u062a\u0635\u0641\u062d \u0627\u0644\u0641\u0635\u0648\u0644 \u062d\u062f\u064a\u062b\u0629 \u0627\u0644\u0625\u0646\u0634\u0627\u0621 \u0648\u0634\u0627\u0647\u062f \u0627\u0644\u062c\u062f\u064a\u062f \u0641\u064a \u0645\u0648\u0627\u0636\u064a\u0639\u0643 \u0627\u0644\u0645\u0641\u0636\u0644\u0629.",
-    "Browsing": "\u0627\u0644\u062a\u0635\u0641\u062d",
     "Bulk Exceptions": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u0646 \u0627\u0644\u0627\u0633\u062a\u062b\u0646\u0627\u0621\u0627\u062a",
     "Bullet list": "\u0642\u0627\u0626\u0645\u0629 \u062a\u0639\u062f\u0627\u062f \u0646\u0642\u0637\u064a",
     "Bulleted List (Ctrl+U)": "\u0642\u0627\u0626\u0645\u0629 \u0645\u0646\u0642\u0651\u0637\u0629 (Ctrl+U)",
@@ -594,9 +591,7 @@
     "Course Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u0627\u0642",
     "Course Number": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0627\u0642 ",
     "Course Number Override": "\u062a\u062c\u0627\u0648\u0632 \u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0627\u0642",
-    "Course Number:": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0627\u0642:",
     "Course Outline": "\u0645\u062e\u0637\u0651\u0637 \u0627\u0644\u0645\u0633\u0627\u0642",
-    "Course Run:": "\u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0645\u0633\u0627\u0642:",
     "Course Start": "\u062a\u0627\u0631\u064a\u062e \u0627\u0628\u062a\u062f\u0627\u0621 \u0627\u0644\u0645\u0633\u0627\u0642",
     "Course Title": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0645\u0633\u0627\u0642",
     "Course Title Override": "\u062a\u062c\u0627\u0648\u0632 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0645\u0633\u0627\u0642",
@@ -608,7 +603,6 @@
     "Create": "\u0625\u0646\u0634\u0627\u0621 ",
     "Create Account": "\u0625\u0646\u0634\u0627\u0621 \u062d\u0633\u0627\u0628 ",
     "Create Re-run": "\u062e\u0644\u0642 \u0648\u062d\u062f\u0629 \u0645\u064f\u0639\u0627\u062f \u062a\u0646\u0641\u064a\u0630\u0647\u0627",
-    "Create Support Ticket": "\u0625\u0646\u0634\u0627\u0621 \u062a\u0630\u0643\u0631\u0629 \u062f\u0639\u0645",
     "Create a New Team": "\u0625\u0646\u0634\u0627\u0621 \u0641\u0631\u064a\u0642 \u062c\u062f\u064a\u062f",
     "Create a content group": "\u0625\u0646\u0634\u0627\u0621 \u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u062d\u062a\u0648\u0649",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "\u0623\u0646\u0634\u0626 \u0641\u0631\u064a\u0642\u064b\u0627 \u062c\u062f\u064a\u062f\u064b\u0627 \u0641\u064a \u062d\u0627\u0644 \u0644\u0645 \u062a\u062c\u062f \u0641\u0631\u064a\u0642\u064b\u0627 \u0645\u0648\u062c\u0648\u062f\u064b\u0627 \u0644\u0644\u0627\u0646\u0636\u0645\u0627\u0645 \u0625\u0644\u064a\u0647 \u0623\u0648 \u0643\u0646\u062a \u062a\u0631\u063a\u0628 \u0628\u0627\u0644\u062a\u0639\u0644\u0651\u0645 \u0628\u0631\u0641\u0642\u0629 \u0623\u0635\u062f\u0642\u0627\u0621 \u062a\u0639\u0631\u0641\u0647\u0645.",
@@ -676,7 +670,6 @@
     "Describe ": "\u0635\u0641",
     "Description": "\u0627\u0644\u0648\u0635\u0641",
     "Description of the certificate": "\u0648\u0635\u0641 \u0627\u0644\u0634\u0647\u0627\u062f\u0629",
-    "Details": "\u0627\u0644\u062a\u0641\u0627\u0635\u064a\u0644",
     "Device with Camera": "\u062c\u0647\u0627\u0632 \u0645\u0632\u0648\u062f \u0628\u0643\u0627\u0645\u064a\u0631\u0627",
     "Dimensions": "\u0627\u0644\u0623\u0628\u0639\u0627\u062f",
     "Disc": "\u0627\u0644\u0642\u0631\u0635",
@@ -886,7 +879,6 @@
     "Find next": "\u0625\u064a\u062c\u0627\u062f \u0627\u0644\u062a\u0627\u0644\u064a",
     "Find previous": "\u0625\u064a\u062c\u0627\u062f \u0627\u0644\u0633\u0627\u0628\u0642",
     "Finish": "\u0625\u0646\u0647\u0627\u0621",
-    "Finish later": "\u0627\u0644\u0625\u0646\u0647\u0627\u0621 \u0644\u0627\u062d\u0642\u064b\u0627",
     "First time here?": "\u0644\u0623\u0648\u0644 \u0645\u0631\u0629 \u0647\u0646\u0627\u061f",
     "Follow": "\u0645\u062a\u0627\u0628\u0639\u0629",
     "Follow or unfollow posts": "\u062a\u0627\u0628\u0639 \u0623\u0648 \u0623\u0644\u063a\u064a \u0645\u062a\u0627\u0628\u0639\u0629 \u0645\u0646\u0634\u0648\u0631\u0627\u062a",
@@ -940,7 +932,6 @@
     "H Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
     "HTML preview of post": "\u0627\u0633\u062a\u0639\u0631\u0627\u0636 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 \u0641\u064a HTML",
     "HTML source code": "\u0631\u0645\u0632 \u0645\u0635\u062f\u0631 HTML",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "\u0647\u0644 \u0633\u0628\u0642 \u0623\u0646 \u0642\u0645\u062a \u0628\u0627\u0644\u062e\u062f\u0645\u0629 \u0627\u0644\u0639\u0633\u0643\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0642\u0648\u0627\u062a \u0627\u0644\u0645\u0633\u0644\u062d\u0629 \u0623\u0648 \u0627\u0644\u062c\u064a\u0634 \u0627\u0644\u0648\u0637\u0646\u064a \u0623\u0648 \u0627\u0644\u0642\u0648\u0629 \u0627\u0644\u0627\u062d\u062a\u064a\u0627\u0637\u064a\u0629\u061f",
     "Header": "\u062a\u0631\u0648\u064a\u0633\u0629",
     "Header 1": "\u0627\u0644\u062a\u0631\u0648\u064a\u0633\u0629 1",
     "Header 2": "\u0627\u0644\u062a\u0631\u0648\u064a\u0633\u0629 2",
@@ -1144,7 +1135,6 @@
     "Loading more threads": "\u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u0645\u0648\u0627\u0636\u064a\u0639",
     "Loading posts list": "\u062a\u062d\u0645\u064a\u0644 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0627\u062a",
     "Loading your courses": "\u062c\u0627\u0631\u064a \u062a\u062d\u0645\u064a\u0644 \u0645\u0633\u0627\u0642\u0627\u062a\u0643",
-    "Loading...": "\u062c\u0627\u0631\u064a \u0627\u0644\u062a\u062d\u0645\u064a\u0644...",
     "Location": "\u0627\u0644\u0645\u0648\u0642\u0639",
     "Location in Course": "\u0627\u0644\u0645\u0648\u0642\u0639 \u0641\u064a \u0627\u0644\u0645\u0633\u0627\u0642",
     "Lock this asset": "\u0642\u0641\u0644 \u0647\u0630\u0647 \u0627\u0644\u0645\u0627\u062f\u0629 \u0627\u0644\u0645\u0644\u062d\u0642\u0629",
@@ -1205,7 +1195,6 @@
     "Name of the signatory": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0648\u0642\u0651\u0650\u0639",
     "Name or short description of the configuration": "\u0627\u0633\u0645 \u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0623\u0648 \u0648\u0635\u0641 \u0645\u0648\u062c\u064e\u0632 \u0639\u0646\u0647\u0627",
     "Navigate up": "\u0627\u0646\u062a\u0642\u0644 \u0644\u0623\u0639\u0644\u0649",
-    "Need help logging in?": "\u0647\u0644 \u062a\u062d\u062a\u0627\u062c \u0645\u0633\u0627\u0639\u062f\u0629 \u0641\u064a \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644\u061f",
     "Need help signing in?": "\u0647\u0644 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629 \u0641\u064a \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644\u061f",
     "Need other help signing in?": "\u0647\u0644 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629 \u0623\u062e\u0631\u0649 \u0641\u064a \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644\u061f",
     "Needs verified certificate ": "\u0628\u062d\u0627\u062c\u0629 \u0625\u0644\u0649 \u0634\u0647\u0627\u062f\u0629 \u0645\u0648\u062b\u0642\u0629",
@@ -1316,7 +1305,6 @@
     "Organization ": "\u0627\u0644\u0645\u0624\u0633\u0633\u0629",
     "Organization Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0624\u0633\u0633\u0629",
     "Organization of the signatory": "\u0645\u0624\u0633\u0651\u0633\u0629 \u0627\u0644\u0645\u0648\u0642\u0651\u0650\u0639",
-    "Organization:": "\u0627\u0644\u0645\u0624\u0633\u0651\u0633\u0629:",
     "Other": "\u0622\u062e\u0631",
     "Other sign-in issues": "\u0645\u0634\u0627\u0643\u0644 \u0623\u062e\u0631\u0649 \u0645\u0631\u062a\u0628\u0637\u0629 \u0628\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644",
     "Overall Score": "\u0627\u0644\u0646\u062a\u064a\u062c\u0629 \u0627\u0644\u0643\u0644\u064a\u0629",
@@ -1455,7 +1443,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "\u0627\u0644\u0623\u0633\u0626\u0644\u0629 \u0627\u0644\u062a\u064a \u062a\u062b\u064a\u0631 \u0642\u0636\u0627\u064a\u0627 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0625\u062c\u0627\u0628\u0627\u062a. \u0645\u0646\u0627\u0642\u0634\u0627\u062a \u062a\u0628\u0627\u062f\u0644 \u0627\u0644\u0623\u0641\u0643\u0627\u0631 \u0648\u0628\u062f\u0621 \u0627\u0644\u0645\u062d\u0627\u062f\u062b\u0627\u062a. (\u0645\u0637\u0644\u0648\u0628)",
     "Queued": "\u062a\u062d\u0645\u064a\u0644 \u0642\u064a\u062f \u0627\u0644\u0627\u0646\u062a\u0638\u0627\u0631",
     "REMAINING COURSES": "\u0645\u0633\u0627\u0642\u0627\u062a \u0645\u062a\u0628\u0642\u064a\u0629",
-    "Re-run Course": "\u0645\u0633\u0627\u0642 \u0645\u0634\u063a\u0651\u064e\u0644 \u0645\u0631\u0651\u0629 \u0623\u062e\u0631\u0649",
     "Read More": "\u0644\u0642\u0631\u0627\u0621\u0629 \u0627\u0644\u0645\u0632\u064a\u062f",
     "Read more": "\u0627\u0642\u0631\u0623 \u0627\u0644\u0645\u0632\u064a\u062f",
     "Ready To Start": "\u062c\u0627\u0647\u0632 \u0644\u0644\u0628\u062f\u0621",
@@ -1529,7 +1516,6 @@
     "Return to Export": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0627\u0644\u062a\u0635\u062f\u064a\u0631",
     "Return to Your Dashboard": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a",
     "Return to all posts": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u062c\u0645\u064a\u0639 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0627\u062a",
-    "Return to my dashboard": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0644\u0648\u062d\u0629 \u0645\u0639\u0644\u0648\u0645\u0627\u062a\u064a",
     "Return to team listing": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0625\u062f\u0631\u0627\u062c \u0627\u0644\u0641\u0631\u064a\u0642",
     "Review Policy Exception": "\u0645\u0631\u0627\u062c\u0639\u0629 \u0627\u0633\u062a\u062b\u0646\u0627\u0621 \u0627\u0644\u0633\u064a\u0627\u0633\u0629",
     "Review Rules": "\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u0645\u0631\u0627\u062c\u0639\u0629",
@@ -1582,14 +1568,12 @@
     "Select a subject for your support request.": "\u0627\u062e\u062a\u0631 \u0645\u0648\u0636\u0648\u0639\u064b\u0627 \u0644\u0637\u0644\u0628 \u0627\u0644\u062f\u0639\u0645.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "\u0627\u062e\u062a\u0631 \u0641\u062a\u0631\u0629 \u0632\u0645\u0646\u064a\u0629 \u0645\u062e\u0635\u0651\u0635\u0629 \u0644\u0625\u062c\u0631\u0627\u0621 \u0627\u0644\u0627\u0645\u062a\u062d\u0627\u0646. \u0625\u0630\u0627 \u0632\u0627\u062f\u062a \u0627\u0644\u0642\u064a\u0645\u0629 \u0639\u0646 24 \u0633\u0627\u0639\u0629\u060c\u0623\u062f\u062e\u0644 \u0645\u0642\u062f\u0627\u0631\u064b\u0627 \u0645\u0646 \u0627\u0644\u0648\u0642\u062a. \u064a\u0645\u0643\u0646\u0643 \u0643\u0645\u062c \u0645\u062a\u0639\u0644\u0651\u0645\u064a\u0646 \u0645\u062d\u062f\u062f\u064a\u0646 \u0632\u0645\u0646\u064b\u0627 \u0625\u0636\u0627\u0641\u064a\u064b\u0627 \u0644\u0625\u062c\u0631\u0627\u0621 \u0627\u0644\u0627\u0645\u062a\u062d\u0627\u0646 \u0645\u0646 \u062e\u0644\u0627\u0644 \u0644\u0648\u062d\u0629 \u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0627\u0644\u0623\u0633\u062a\u0627\u0630.",
     "Select all": "\u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0643\u0644",
-    "Select employment status": "\u0641\u0636\u0644\u064b\u0627 \u062d\u062f\u062f \u062d\u0627\u0644\u062a\u0643 \u0627\u0644\u0648\u0638\u064a\u0641\u064a\u0629",
     "Select fidelity": "\u062d\u062f\u062f \u0627\u0644\u062f\u0642\u0629",
     "Select language": "\u062d\u062f\u062f \u0627\u0644\u0644\u063a\u0629",
     "Select one or more groups:": "\u062d\u062f\u062f \u0645\u062c\u0645\u0648\u0639\u0629 \u0648\u0627\u062d\u062f\u0629 \u0623\u0648 \u0623\u0643\u062b\u0631:",
     "Select the course-wide discussion topics that you want to divide.": "\u062d\u062f\u062f \u0645\u0648\u0627\u0636\u064a\u0639 \u0627\u0644\u0645\u062d\u0627\u062f\u062b\u0629 \u0641\u064a \u0627\u0644\u0645\u0633\u0627\u0642 \u0627\u0644\u062a\u064a \u062a\u0648\u062f \u062a\u0642\u0633\u064a\u0645\u0647\u0627.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "\u062d\u062f\u062f \u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0632\u0645\u0646\u064a\u0629 \u0644\u0639\u0631\u0636 \u0645\u0648\u0627\u0639\u064a\u062f \u0627\u0644\u062f\u0648\u0631\u0629. \u0625\u0630\u0627 \u0644\u0645 \u062a\u0642\u0645 \u0628\u062a\u062d\u062f\u064a\u062f \u0645\u0646\u0637\u0642\u0629 \u0632\u0645\u0646\u064a\u0629\u060c \u0633\u064a\u062a\u0645 \u0639\u0631\u0636 \u0645\u0648\u0627\u0639\u064a\u062f \u0627\u0644\u062f\u0648\u0631\u0629\u060c \u0628\u0645\u0627 \u0641\u064a \u0630\u0644\u0643 \u0645\u0648\u0627\u0639\u064a\u062f \u062a\u0642\u062f\u064a\u0645 \u0627\u0644\u0648\u0627\u062c\u0628\u0627\u062a\u060c \u0648\u0641\u0642\u0627\u064b \u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u062a\u0648\u0642\u064a\u062a \u0627\u0644\u0645\u062d\u0644\u064a \u0641\u064a \u0627\u0644\u0645\u062a\u0635\u0641\u062d.",
     "Select turnaround": "\u0627\u062e\u062a\u0631 \u0645\u062e\u0637\u0637 \u0627\u0644\u0627\u0646\u062c\u0627\u0632",
-    "Selected blocks": "\u0627\u0644\u0643\u062a\u0644 \u0627\u0644\u0645\u062d\u062f\u062f\u0629",
     "Selected tab": "\u0627\u0644\u062a\u0628\u0648\u064a\u0628\u0629 \u0627\u0644\u0645\u0646\u062a\u0642\u0627\u0629",
     "Self": "\u0645\u064f\u0642\u064a\u0651\u064e\u0645 \u0630\u0627\u062a\u064a\u0651\u064b\u0627",
     "Send to:": "\u0623\u0631\u0633\u0644 \u0625\u0644\u0649: ",
@@ -2213,17 +2197,11 @@
     "Weight of Total Grade": "\u0648\u0632\u0646 \u0627\u0644\u062f\u0631\u062c\u0629 \u0627\u0644\u0625\u062c\u0645\u0627\u0644\u064a\u0629",
     "We\u2019re sorry to see you go!": "\u0646\u0623\u0633\u0641 \u0644\u0630\u0647\u0627\u0628\u0643!",
     "What You Need for Verification": "\u0645\u0627 \u0627\u0644\u0630\u064a \u062a\u062d\u062a\u0627\u062c\u0647 \u0625\u0644\u064a\u0647 \u0644\u0625\u062c\u0631\u0627\u0621 \u0627\u0644\u062a\u062d\u0642\u0651\u0642",
-    "What can we help you with, {username}?": "\u0643\u064a\u0641 \u064a\u0645\u0643\u0646\u0646\u0627 \u0645\u0633\u0627\u0639\u062f\u062a\u0643\u060c {username}\u061f",
     "What does %(platformName)s do with this photo?": "\u0645\u0627 \u0627\u0644\u0630\u064a \u062a\u0641\u0639\u0644\u0647 %(platformName)s \u0628\u0647\u0630\u0647 \u0627\u0644\u0635\u0648\u0631\u0629\u061f",
     "What does this mean?": "\u0645\u0627\u0630\u0627 \u064a\u0639\u0646\u064a \u0647\u0630\u0627\u061f",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "\u0645\u0627\u0630\u0627 \u0644\u0648 \u0644\u0645 \u0623\u062a\u0645\u0643\u0646 \u0645\u0646 \u0631\u0624\u064a\u0629 \u0635\u0648\u0631\u0629 \u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627\u060c \u0623\u0648 \u0625\u0630\u0627 \u0644\u0645 \u0623\u062a\u0645\u0643\u0646 \u0645\u0646 \u0631\u0624\u064a\u0629 \u0635\u0648\u0631\u062a\u064a \u0644\u062a\u062d\u062f\u064a\u062f \u0627\u0644\u062c\u0627\u0646\u0628 \u0627\u0644\u0645\u0631\u0626\u064a\u061f",
     "What if I have difficulty holding my ID in position relative to the camera?": "\u0645\u0627\u0630\u0627 \u0644\u0648 \u0648\u0627\u062c\u0647\u062a \u0635\u0639\u0648\u0628\u0629 \u0641\u064a \u062a\u062b\u0628\u064a\u062a \u0628\u0637\u0627\u0642\u0629 \u0647\u0648\u064a\u062a\u064a \u0641\u064a \u0627\u0644\u0645\u0648\u0636\u0639 \u0627\u0644\u0645\u0646\u0627\u0633\u0628 \u0644\u0644\u0643\u0627\u0645\u064a\u0631\u0627\u061f",
     "What if I have difficulty holding my head in position relative to the camera?": "\u0645\u0627\u0630\u0627 \u0644\u0648 \u0648\u0627\u062c\u0647\u062a \u0635\u0639\u0648\u0628\u0629 \u0641\u064a \u062a\u062b\u0628\u064a\u062a \u0631\u0623\u0633\u064a \u0641\u064a \u0627\u0644\u0645\u0648\u0636\u0639 \u0627\u0644\u0645\u0646\u0627\u0633\u0628 \u0644\u0644\u0643\u0627\u0645\u064a\u0631\u0627\u061f",
-    "What industry do you currently work in?": "\u0645\u0627\u0647\u0648 \u0645\u062c\u0627\u0644 \u0639\u0645\u0644\u0643 \u062d\u0627\u0644\u064a\u064b\u0627\u061f",
-    "What industry do you want to work in?": "\u0645\u0627 \u0627\u0644\u0645\u062c\u0627\u0644 \u0627\u0644\u0630\u064a \u062a\u0631\u063a\u0628 \u0627\u0644\u0639\u0645\u0644 \u0628\u0647\u061f",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "\u0645\u0627 \u0627\u0644\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u062a\u0639\u0644\u064a\u0645\u064a \u0627\u0644\u0623\u0639\u0644\u0649 \u0627\u0644\u0630\u064a \u062d\u0635\u0644 \u0639\u0644\u064a\u0647 \u0623\u062d\u062f \u0648\u0627\u0644\u062f\u064a\u0643 / \u0627\u0644\u0648\u0635\u064a \u0639\u0644\u064a\u0643\u061f",
-    "What is the highest level of education that you have achieved so far?": "\u0645\u0627 \u0627\u0644\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u062a\u0639\u0644\u064a\u0645\u064a \u0627\u0644\u0623\u0639\u0644\u0649 \u0627\u0644\u0630\u064a \u062d\u0635\u0644\u062a \u0639\u0644\u064a\u0647\u061f",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "\u0645\u0627 \u0645\u062c\u0645\u0648\u0639 \u0627\u0644\u062f\u062e\u0644 \u0627\u0644\u0639\u0627\u0645 \u062e\u0644\u0627\u0644 \u0627\u0644\u0627\u062b\u0646\u0627 \u0639\u0634\u0631 \u0634\u0647\u0631\u064b\u0627 \u0627\u0644\u0645\u0627\u0636\u064a\u0629 \u0644\u062c\u0645\u064a\u0639 \u0623\u0641\u0631\u0627\u062f \u0639\u0627\u0626\u0644\u062a\u0643\u061f",
     "What's Your Next Accomplishment?": "\u0645\u0627\u0647\u0648 \u0625\u0646\u062c\u0627\u0632\u0643 \u0627\u0644\u0642\u0627\u062f\u0645\u061f",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "\u0639\u0646\u062f\u0645\u0627 \u06cc\u0642\u062f\u0645 \u0627\u0644\u0645\u062a\u0639\u0644\u0645\u0648\u0646 \u0625\u062c\u0627\u0628\u0629 \u0639\u0644\u06cc \u0646\u0645\u0648\u0630\u062c \u062a\u0642\u06cc\u06cc\u0645\u060c \u0641\u0633\u06cc\u0638\u0647\u0631 \u0645\u0627 \u0625\u0630\u0627 \u06a9\u0627\u0646 \u0627\u0644\u062c\u0648\u0627\u0628 \u0635\u062d\u06cc\u062d\u0627\u064b \u0623\u0645 \u0644\u0627\u060c \u0648\u064a\u0633\u062a\u0644\u0645\u0648\u0646 \u0627\u0644\u0646\u062a\u06cc\u062c\u0629 \u0641\u0648\u0631\u064b\u0627.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "\u0639\u0646\u062f\u0645\u0627 \u064a\u0643\u0648\u0646 \u0648\u062c\u0647\u0643 \u0641\u064a \u0645\u0648\u0636\u0639\u0647 \u060c \u0627\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0632\u0631 \"\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u0629\" {icon} \u0623\u062f\u0646\u0627\u0647 \u0644\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u062a\u0643.",
@@ -2232,7 +2210,6 @@
     "Whole words": "\u0643\u0644\u0645\u0627\u062a \u0643\u0627\u0645\u0644\u0629 ",
     "Why activate?": "\u0644\u0645 \u0646\u0639\u062a\u0628\u0631 \u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u062d\u0633\u0627\u0628 \u0636\u0631\u0648\u0631\u064a\u0627\u064b\u061f",
     "Why does %(platformName)s need my photo?": "\u0644\u0645\u0627\u0630\u0627 \u062a\u062d\u062a\u0627\u062c %(platformName)s \u0625\u0644\u0649 \u0635\u0648\u0631\u062a\u064a\u061f",
-    "Why does edX collect this information?": "\u0644\u0645\u0627\u0630\u0627 \u062a\u062c\u0645\u0639 edX \u0647\u0630\u0647 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a\u061f",
     "Width": "\u0639\u0631\u0636",
     "Will Be Visible To:": "\u0633\u064a\u0635\u0628\u062d \u0645\u0631\u0626\u064a\u0651 \u0645\u0646: ",
     "Words: {0}": "\u0627\u0644\u0643\u0644\u0645\u0627\u062a: {0}",
@@ -2421,7 +2398,6 @@
     "endorsed %(time_ago)s by %(user)s": "\u0645\u0635\u0627\u062f\u0642\u0629 \u0639\u0644\u064a\u0647\u0627 %(time_ago)s \u0645\u0646 \u0642\u0650\u0628\u0644 %(user)s",
     "enter code here": "\u0623\u062f\u062e\u0644 \u0627\u0644\u062a\u0639\u0644\u064a\u0645\u0627\u062a \u0627\u0644\u0628\u0631\u0645\u062c\u064a\u0629 \u0647\u0646\u0627",
     "enter link description here": "\u0623\u062f\u062e\u0644 \u0648\u0635\u0641 \u0627\u0644\u0631\u0627\u0628\u0637 \u0647\u0646\u0627",
-    "finish later": "\u0627\u0644\u0625\u0646\u0647\u0627\u0621 \u0644\u0627\u062d\u0642\u064b\u0627",
     "follow this post": "\u062a\u0627\u0628\u0650\u0639 \u0647\u0630\u0627 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 ",
     "for": "\u0645\u0646 \u0623\u062c\u0644",
     "group configuration": "\u0636\u0628\u0637 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629",
@@ -2436,7 +2412,6 @@
     "minute": "\u062f\u0642\u064a\u0642\u0629",
     "minutes": "\u062f\u0642\u0627\u0626\u0642",
     "name": "\u0627\u0644\u0627\u0633\u0645  ",
-    "next page": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u062a\u0627\u0644\u064a\u0629",
     "off": "\u063a\u064a\u0631 \u0645\u0641\u0639\u0651\u0644",
     "on": "\u0645\u0641\u0639\u0651\u0644",
     "one letter Friday\u0004F": "\u062c\u0645\u0639\u0629",
@@ -2468,7 +2443,6 @@
     "team count": "\u0639\u062f\u062f \u0623\u0639\u0636\u0627\u0621 \u0627\u0644\u0641\u0631\u064a\u0642",
     "text_word_{uniqueId}": "title_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "\u0628\u0623\u0633\u0631\u0639 \u0648\u0642\u062a \u0645\u0645\u0643\u0646 \u0644\u0644\u0631\u062f \u0648\u0627\u0644\u0645\u0633\u0627\u0639\u062f\u0629!",
     "there is currently {numVotes} vote": [
       "\u0647\u0646\u0627\u0643 {numVotes} \u0635\u0648\u062a",
       "\u0647\u0646\u0627\u0643 {numVotes} \u0635\u0648\u062a",
diff --git a/cms/static/js/i18n/de-de/djangojs.js b/cms/static/js/i18n/de-de/djangojs.js
index 9cf07036ec..42ca2214e7 100644
--- a/cms/static/js/i18n/de-de/djangojs.js
+++ b/cms/static/js/i18n/de-de/djangojs.js
@@ -114,7 +114,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Beschriftung wird angezeigt, sobald das Video gestartet wird.)",
     "(Community TA)": "(Gemeinschaftslehrkraft)",
     "(Optional)": "(Optional)",
-    "(Read-only)": "(Nur Lesezugriff)",
     "(Required Field)": "(Erforderliches Feld)",
     "(Self-paced) Ended {end}": "(Eigenes Tempo) Ist beendet {end}",
     "(Self-paced) Ends {end}": "(Eigenes Tempo) Endet {end}",
@@ -261,7 +260,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Ein Fehler ist aufgetreten. Warten Sie und versuchen Sie es sp\u00e4ter noch einmal.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Es gab einen Fehler beim Abholen deiner E-Mail. Bitte versuche es sp\u00e4ter noch einmal, und benachrichtige die technische \u00dcnterst\u00fctzung, wenn das Problem weiterhin besteht.",
     "An error occurred when signing you in to %s.": "Es ist ein Fehler aufgetreten als Sie sich f\u00fcr %s angemeldet haben.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Beim Versuch, die nachstehenden Informationen abzurufen oder zu speichern, ist ein Fehler aufgetreten. Bitte versuchen Sie es sp\u00e4ter noch einmal.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Beim Pr\u00fcfen der Teammitgliedschaft ist ein Fehler aufgetreten. Versuchen Sie, die Seite zu aktualisieren.",
     "An error occurred while removing the member from the team. Try again.": "Beim entfernen des Teammitgliedes ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.",
     "An error occurred.": "Ein Fehler ist aufgetreten.",
@@ -348,7 +346,6 @@
     "Bottom": "Grundlinie",
     "Browse": "Durchsuchen",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Neue Kurse durchsuchen",
-    "Browsing": "Durchsuchen",
     "Bulk Exceptions": "Sammelausnahmen",
     "Bullet list": "Aufz\u00e4hlung",
     "Bulleted List (Ctrl+U)": "Aufz\u00e4hlende Liste (STRG+U)",
@@ -524,9 +521,7 @@
     "Course Name": "Kursbezeichnung",
     "Course Number": "Kursnummer",
     "Course Number Override": "Kursnummer \u00dcberschreibung",
-    "Course Number:": "Kursnummer:",
     "Course Outline": "Kurs\u00fcbersicht",
-    "Course Run:": "Kurslaufzeit:",
     "Course Start": "Kursbeginn",
     "Course Title": "Kurs Titel",
     "Course Title Override": "Kurstitel \u00fcberschreiben",
@@ -538,7 +533,6 @@
     "Create": "Erstellen",
     "Create Account": "Konto erstellen",
     "Create Re-run": "Erstelle Wiederholungslauf",
-    "Create Support Ticket": "Erstellen Sie ein Supportticket",
     "Create a New Team": "Ein neues Team erstellen",
     "Create a content group": "Erstelle eine Inhaltsgruppe",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Erstelle ein neues Team, wenn Du keinem bestehenden Team beitreten kannst, oder wenn Du mit Freunden lernen m\u00f6chtest, die Du kennst.",
@@ -608,7 +602,6 @@
     "Describe ": "Beschreibe",
     "Description": "Beschreibung",
     "Description of the certificate": "Beschreibung des Zertifikats",
-    "Details": "Details",
     "Device with Camera": "Ger\u00e4t mit Kamera",
     "Dimensions": "Dimensionen",
     "Disc": "Scheibe",
@@ -817,7 +810,6 @@
     "Find next": "Finde n\u00e4chstes",
     "Find previous": "Finde vorheriges",
     "Finish": "Beende",
-    "Finish later": "Sp\u00e4ter beenden",
     "First time here?": "Zum ersten Mal hier?",
     "Follow": "Folgen",
     "Follow or unfollow posts": "Beitr\u00e4gen folgen / entfolgen",
@@ -869,7 +861,6 @@
     "H Align": "H Ausrichtung",
     "HTML preview of post": "HTML Vorschau des Beitrags",
     "HTML source code": "HTML-Quellcode",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Haben Sie jemals im aktiven Dienst in den US-Streitkr\u00e4ften, Reserven oder der Nationalgarde gedient?",
     "Header": "Kopfzeile",
     "Header 1": "Kopfzeile 1",
     "Header 2": "Kopfzeile 2",
@@ -1068,7 +1059,6 @@
     "Loading more threads": "Lade weitere Diskussionsstr\u00e4nge",
     "Loading posts list": "Lade Beitrags\u00fcbersicht",
     "Loading your courses": "Lade ihren Kurs",
-    "Loading...": "Lade...",
     "Location": "Ort",
     "Location in Course": "Position im Kurs",
     "Lock this asset": "Objekt sperren",
@@ -1129,7 +1119,6 @@
     "Name of the signatory": "Name des Unterzeichners",
     "Name or short description of the configuration": "Name oder Kurzbeschreibung des Aufbaus",
     "Navigate up": "Aufw\u00e4rts navigieren",
-    "Need help logging in?": "Brauchen Sie Hilfe beim einloggen?",
     "Need help signing in?": "Brauchen Sie Hilfe bei der Anmeldung?",
     "Need other help signing in?": "Brauchen Sie weitere Hilfe bei der Anmeldung?",
     "Needs verified certificate ": "Ben\u00f6tigt ein verifiziertes Zertifikat",
@@ -1233,7 +1222,6 @@
     "Organization ": "Organsation",
     "Organization Name": "Name der Organisation",
     "Organization of the signatory": "Organisation des Unterzeichners",
-    "Organization:": "Organisation:",
     "Other": "Anderer Abschluss",
     "Other sign-in issues": "Andere Probleme beim Anmelden",
     "Overall Score": "Gesamtpunkte",
@@ -1372,7 +1360,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Fragen ben\u00f6tigen Antworten. Diskussionen l\u00f6sen eine Konversation aus. (Erforderlich)",
     "Queued": "Eingereiht",
     "REMAINING COURSES": "VERBLEIBENDE KURSE",
-    "Re-run Course": "Neue Kurslaufzeit",
     "Read More": "Weiterlesen",
     "Read more": "Mehr erfahren",
     "Ready To Start": "Bereit um zu starten",
@@ -1445,7 +1432,6 @@
     "Return to Export": "Zum Export zur\u00fcckkehren",
     "Return to Your Dashboard": "Zur\u00fcck zu \"Meine Kurse\"",
     "Return to all posts": "Zu allen Beitr\u00e4gen",
-    "Return to my dashboard": "Zur\u00fcck zu meinem Dashboard",
     "Return to team listing": "Zur\u00fcck zur Teamliste",
     "Review Policy Exception": "Ausnahme bei der Begutachtungsrichtlinine",
     "Review Rules": "\u00dcberpr\u00fcfungsregeln",
@@ -1496,14 +1482,12 @@
     "Select a subject for your support request.": "W\u00e4hlen Sie ein Betreff f\u00fcr Ihre Supportanfrage.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "W\u00e4hlen Sie eine Zeitzuteilung f\u00fcr die Pr\u00fcfung aus. Wenn es mehr als 24 Stunden sind, geben Sie die Zeitspanne ein. Sie k\u00f6nnen einzelnen Lernenden \u00fcber das Lehrer-Dashboard zus\u00e4tzliche Zeit geben, um die Pr\u00fcfung abzuschlie\u00dfen.",
     "Select all": "Alles ausw\u00e4hlen",
-    "Select employment status": "W\u00e4hlen Sie Ihren Besch\u00e4ftigungsstatus",
     "Select fidelity": "Treue ausw\u00e4hlen",
     "Select language": "W\u00e4hlen Sie eine Sprache",
     "Select one or more groups:": "W\u00e4hlen Sie eine oder mehrere Gruppen aus:",
     "Select the course-wide discussion topics that you want to divide.": "W\u00e4hlen Sie die kursweiten Diskussionsthemen aus, die Sie aufteilen m\u00f6chten.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "W\u00e4hlen Sie die Zeitzone des angebotenen Kurses aus. Wenn Sie keine bestimmte Zeitzone ausw\u00e4hlen, werden Kursdaten, inklusive Abgabetermine f\u00fcr Aufgaben, in der lokalen Zeit ihres Browsers dargestellt.",
     "Select turnaround": "Wendepunkt ausw\u00e4hlen",
-    "Selected blocks": "Ausgew\u00e4hlte Bl\u00f6cke",
     "Selected tab": "Ausgew\u00e4hlter Tab",
     "Self": "Selbst",
     "Send to:": "Senden an:",
@@ -2067,7 +2051,7 @@
     "View Cohort": "Kohort ansehen",
     "View Course": "Anzeigen",
     "View Current Team Memberships": "Aktuelle Team-Mitgliedschaft sehen ",
-    "View Live": "Live betrachten",
+    "View Live": "Seite ansehen",
     "View Program Record": "Programmprotokoll einsehen",
     "View Report": "Sehen Sie den Bericht hier",
     "View Teams in the {topic_name} Topic": "Teams im {topic_name}  ansehen.",
@@ -2112,17 +2096,11 @@
     "Weight of Total Grade": "Gewichtung der Gesamtnote",
     "We\u2019re sorry to see you go!": "Es tut uns leid, dass Sie Ihren Account l\u00f6schen m\u00f6chten!",
     "What You Need for Verification": "Was du zur Verifizierung ben\u00f6tigst",
-    "What can we help you with, {username}?": "Wie k\u00f6nnen wir Ihnen helfen, {username}?",
     "What does %(platformName)s do with this photo?": "Was macht %(platformName)s mit dieses Foto?",
     "What does this mean?": "Was soll dies bedeuten?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Was, wenn ich mein Kamerabild  oder mein Foto nicht sehen kann?",
     "What if I have difficulty holding my ID in position relative to the camera?": "Was, wenn ich Schwierigkeiten habe, meinen Ausweis in der richtigen Position zur Kamera zu halten?",
     "What if I have difficulty holding my head in position relative to the camera?": "Was, wenn ich Schwierigkeiten habe, meinen Kopf in der richtigen Position zur Kamera zu halten?",
-    "What industry do you currently work in?": "In welcher Branche arbeiten Sie derzeit?",
-    "What industry do you want to work in?": "In welcher Branchen wollen Sie arbeiten?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Welches ist der h\u00f6chste Bildungsabschluss, den ein Elternteil oder Erziehungsberechtigter von Ihnen erreicht hat?",
-    "What is the highest level of education that you have achieved so far?": "Was ist der h\u00f6chste Bildungsabschluss, den Sie erreicht haben?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Wie hoch war das gemeinsame Gesamteinkommen aller Mitglieder Ihrer Familie in den letzten 12 Monaten? ",
     "What's Your Next Accomplishment?": "Was ist Ihr n\u00e4chster Erfolg?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Nutzer sehen sofort nach einreichen ihrer Antworten, ob diese richtig oder falsch sind und welche Punkte sie erhalten.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Wenn Ihr Gesicht in Position ist, klicken Sie auf die Schaltfl\u00e4che des Ausl\u00f6sers {icon} unten, um ein Foto aufzunehmen.",
@@ -2131,7 +2109,6 @@
     "Whole words": "Ganze Worte",
     "Why activate?": "Wieso aktivieren?",
     "Why does %(platformName)s need my photo?": "Wieso braucht %(platformName)s mein Foto?",
-    "Why does edX collect this information?": "Warum braucht edX diese Information?",
     "Width": "Breite",
     "Will Be Visible To:": "Wird sichtbar sein f\u00fcr:",
     "Words: {0}": "W\u00f6rter: {0}",
@@ -2315,7 +2292,6 @@
     "endorsed %(time_ago)s by %(user)s": "bef\u00fcrwortet %(time_ago)s von %(user)s",
     "enter code here": "Code hier eingeben",
     "enter link description here": "Linkbeschreibung hier eingeben",
-    "finish later": "Sp\u00e4ter beenden",
     "follow this post": "Beitrag folgen",
     "for": "f\u00fcr",
     "group configuration": "Gruppenkonfiguration",
@@ -2329,7 +2305,6 @@
     "minute": "Minute",
     "minutes": "Minuten",
     "name": "name",
-    "next page": "n\u00e4chste Seite",
     "off": "Aus",
     "on": "An",
     "one letter Friday\u0004F": "Fr",
@@ -2361,7 +2336,6 @@
     "team count": "Anzahl an Teams",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "desto schneller und gezielter k\u00f6nnen wir Ihnen antworten!",
     "there is currently {numVotes} vote": [
       "aktuell gibt es {numVotes} Stimme",
       "aktuell gibt es {numVotes} Stimmen"
diff --git a/cms/static/js/i18n/el/djangojs.js b/cms/static/js/i18n/el/djangojs.js
index 0290f431d5..c0e07ffc46 100644
--- a/cms/static/js/i18n/el/djangojs.js
+++ b/cms/static/js/i18n/el/djangojs.js
@@ -202,7 +202,6 @@
     "Midnight": "\u039c\u03b5\u03c3\u03ac\u03bd\u03c5\u03c7\u03c4\u03b1",
     "More": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b1",
     "Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-    "Need help logging in?": "\u039e\u03b5\u03c7\u03ac\u03c3\u03b1\u03c4\u03b5 \u03c4\u03bf\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c3\u03b1\u03c2;",
     "Need help signing in?": "\u03a7\u03c1\u03b5\u03b9\u03ac\u03b6\u03b5\u03c3\u03c4\u03b5 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1;",
     "New Password": "\u039d\u03ad\u03bf\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2",
     "No description available": "\u0394\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03b4\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03b7 \u03c0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
@@ -370,7 +369,6 @@
     "Verified Certificate": "\u03a0\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03b9\u03ba\u03cc \u03b5\u03c0\u03b1\u03bb\u03b7\u03b8\u03b5\u03c5\u03bc\u03ad\u03bd\u03bf",
     "View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
     "View Course": "\u0394\u0395\u0399\u03a4\u0395 \u03a4\u039f \u039c\u0391\u0398\u0397\u039c\u0391",
-    "View Live": "\u03a0\u03b1\u03c1\u03b1\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03b6\u03c9\u03bd\u03c4\u03b1\u03bd\u03ac",
     "Vote for good posts and responses": "\u03a5\u03c0\u03b5\u03c1\u03c8\u03b7\u03c6\u03af\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03ba\u03b1\u03bb\u03ad\u03c2 \u03b1\u03bd\u03b1\u03c1\u03c4\u03ae\u03c3\u03b5\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03b1\u03c0\u03bf\u03ba\u03c1\u03af\u03c3\u03b5\u03b9\u03c2",
     "Warning": "\u03a0\u03c1\u03bf\u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
     "We couldn't create your account.": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03ad\u03c3\u03b1\u03bc\u03b5 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03bf\u03c5\u03bc\u03b5 \u03c4\u03bf\u03bd \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c3\u03b1\u03c2",
diff --git a/cms/static/js/i18n/eo/djangojs.js b/cms/static/js/i18n/eo/djangojs.js
index 404d096061..6f35d08ce8 100644
--- a/cms/static/js/i18n/eo/djangojs.js
+++ b/cms/static/js/i18n/eo/djangojs.js
@@ -434,6 +434,7 @@
     "Code block": "\u00c7\u00f6d\u00e9 \u00dfl\u00f6\u00e7k \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#",
     "Cohort Assignment Method": "\u00c7\u00f6h\u00f6rt \u00c0ss\u00efgnm\u00e9nt M\u00e9th\u00f6d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7#",
     "Cohort Name": "\u00c7\u00f6h\u00f6rt N\u00e4m\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
+    "Cohort assignment not allowed: {email_or_username}": "\u00c7\u00f6h\u00f6rt \u00e4ss\u00efgnm\u00e9nt n\u00f6t \u00e4ll\u00f6w\u00e9d: {email_or_username} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442#",
     "Cohorts": "\u00c7\u00f6h\u00f6rts \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #",
     "Cohorts Disabled": "\u00c7\u00f6h\u00f6rts D\u00efs\u00e4\u00dfl\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "Cohorts Enabled": "\u00c7\u00f6h\u00f6rts \u00c9n\u00e4\u00dfl\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1#",
@@ -622,9 +623,7 @@
     "Download Memberships": "D\u00f6wnl\u00f6\u00e4d M\u00e9m\u00df\u00e9rsh\u00efps \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #",
     "Download Software Clicked": "D\u00f6wnl\u00f6\u00e4d S\u00f6ftw\u00e4r\u00e9 \u00c7l\u00ef\u00e7k\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
     "Download Transcript for Editing": "D\u00f6wnl\u00f6\u00e4d Tr\u00e4ns\u00e7r\u00efpt f\u00f6r \u00c9d\u00eft\u00efng \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442#",
-    "Download URL": "D\u00f6wnl\u00f6\u00e4d \u00dbRL \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
     "Download available encodings (.csv)": "D\u00f6wnl\u00f6\u00e4d \u00e4v\u00e4\u00efl\u00e4\u00dfl\u00e9 \u00e9n\u00e7\u00f6d\u00efngs (.\u00e7sv) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442#",
-    "Download the user's certificate": "D\u00f6wnl\u00f6\u00e4d th\u00e9 \u00fcs\u00e9r's \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442#",
     "Draft (Never published)": "Dr\u00e4ft (N\u00e9v\u00e9r p\u00fc\u00dfl\u00efsh\u00e9d) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3#",
     "Draft (Unpublished changes)": "Dr\u00e4ft (\u00dbnp\u00fc\u00dfl\u00efsh\u00e9d \u00e7h\u00e4ng\u00e9s) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454#",
     "Draft saved on {lastSavedStart}{editedOn}{lastSavedEnd} by {editedByStart}{editedBy}{editedByEnd}": "Dr\u00e4ft s\u00e4v\u00e9d \u00f6n {lastSavedStart}{editedOn}{lastSavedEnd} \u00df\u00fd {editedByStart}{editedBy}{editedByEnd} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
@@ -1173,7 +1172,6 @@
     "Not Started": "N\u00f6t St\u00e4rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Not Supported": "N\u00f6t S\u00fcpp\u00f6rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
     "Not able to set passing grade to less than %(minimum_grade_cutoff)s%.": "N\u00f6t \u00e4\u00dfl\u00e9 t\u00f6 s\u00e9t p\u00e4ss\u00efng gr\u00e4d\u00e9 t\u00f6 l\u00e9ss th\u00e4n %(minimum_grade_cutoff)s%. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
-    "Not available": "N\u00f6t \u00e4v\u00e4\u00efl\u00e4\u00dfl\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
     "Not divided": "N\u00f6t d\u00efv\u00efd\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Not in Use": "N\u00f6t \u00efn \u00dbs\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#",
     "Not selected": "N\u00f6t s\u00e9l\u00e9\u00e7t\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
diff --git a/cms/static/js/i18n/es-419/djangojs.js b/cms/static/js/i18n/es-419/djangojs.js
index 9733607a8e..4fd6f115bd 100644
--- a/cms/static/js/i18n/es-419/djangojs.js
+++ b/cms/static/js/i18n/es-419/djangojs.js
@@ -224,7 +224,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Los subt\u00edtulos ser\u00e1n mostrados al iniciar la reproducci\u00f3n del video.)",
     "(Community TA)": "(Profesor ayudante de la comunidad)",
     "(Optional)": "(Opcional)",
-    "(Read-only)": "(Solo-lectura)",
     "(Required Field)": "(Campo requerido)",
     "(Self-paced) Ended {end}": "(A ritmo propio) Terminado {end}",
     "(Self-paced) Ends {end}": "(A ritmo propio)Termina{end}",
@@ -375,7 +374,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Un error ha ocurrido. Espere unos pocos minutos e intenta de nuevo.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Ocurri\u00f3 un error al recuperar tu correo. Por favor intenta nuevamente m\u00e1s tarde. Si el problema persiste, contacta a soporte t\u00e9cnico.",
     "An error occurred when signing you in to %s.": "Ocurri\u00f3 un error al iniciar tu sesi\u00f3n en %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Se produjo un error al intentar recuperar recuperar o guardar la informaci\u00f3n a continuaci\u00f3n. Por favor intenta de nuevo mas tarde. ",
     "An error occurred while looking up team membership. Try refreshing the page.": "Ocurrio un error al buscar la membresia del equipo. Intenta refrescar la pagina.",
     "An error occurred while removing the member from the team. Try again.": "Ocurri\u00f3 un error al remover al miembro del equipo. Intenta nuevamente. ",
     "An error occurred.": "Ha ocurrido un error.",
@@ -463,7 +461,6 @@
     "Bottom": "Base",
     "Browse": "Explorar",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Echa un vistazo a nuestros cursos lanzados recientemente y qu\u00e9 hay de nuevo en tus temas favoritos.",
-    "Browsing": "Explorando",
     "Bulk Exceptions": "Excepciones en lote",
     "Bullet list": "Lista con vi\u00f1etas",
     "Bulleted List (Ctrl+U)": "Vi\u00f1etas (Ctrl+U)",
@@ -650,9 +647,7 @@
     "Course Name": "T\u00edtulo del curso",
     "Course Number": "C\u00f3digo del curso",
     "Course Number Override": "Reemplazo para el n\u00famero de curso",
-    "Course Number:": "N\u00famero del curso:",
     "Course Outline": "Estructura del curso",
-    "Course Run:": "Edici\u00f3n del Curso:",
     "Course Start": "Inicio del Curso",
     "Course Title": "T\u00edtulo del curso",
     "Course Title Override": "Reemplazo para el t\u00edtulo del curso",
@@ -664,7 +659,6 @@
     "Create": "Crear",
     "Create Account": "Crear cuenta",
     "Create Re-run": "Crear reapertura",
-    "Create Support Ticket": "Crear caso de soporte",
     "Create a New Team": "Crear un nuevo equipo",
     "Create a content group": "Crear contenido de grupo",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Crea un nuevo equipo si no puedes encontrar uno existente para unirte o si deseas aprender con personas que ya conoces.",
@@ -734,7 +728,6 @@
     "Describe ": "Describir",
     "Description": "Descripci\u00f3n",
     "Description of the certificate": "Descripci\u00f3n del certificado",
-    "Details": "Detalles",
     "Device with Camera": "Dispositivo con c\u00e1mara",
     "Dimensions": "Dimensiones",
     "Disc": "Disco",
@@ -952,7 +945,6 @@
     "Find next": "Encontrar el siguiente",
     "Find previous": "Encontrar el anterior",
     "Finish": "Finalizar",
-    "Finish later": "Terminar despues",
     "First time here?": "Primera vez aqu\u00ed?",
     "Follow": "Seguir",
     "Follow or unfollow posts": "Seguir o dejar de seguir publicaciones",
@@ -1007,7 +999,6 @@
     "HTML preview of post": "previsiualizaci\u00f3n en HTML",
     "HTML source code": "C\u00f3digo fuente HTML",
     "Have a computer with a functioning webcam": "Contar con un computador con c\u00e1mara web funcionando ",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "\u00bfAlguna vez has servido en un deber activo en las Fuerzas Armadas de Estados Unidos de America, Reservas, o Guardia Nacional? ",
     "Have your valid photo ID (e.g. driver's license or passport) ready": "Tener una foto de identificaci\u00f3n valida (ejemplo: licencia de conducci\u00f3n o pasaporte) a la mano",
     "Header": "Encabezado",
     "Header 1": "Encabezado 1",
@@ -1213,7 +1204,6 @@
     "Loading more threads": "Cargando m\u00e1s discusiones",
     "Loading posts list": "Cargando lista de publicaci\u00f3nes",
     "Loading your courses": "Cargando tus cursos",
-    "Loading...": "Cargando...",
     "Location": "Ubicaci\u00f3n",
     "Location in Course": "Ubicaci\u00f3n en el curso",
     "Lock this asset": "Bloquear este recurso",
@@ -1277,7 +1267,6 @@
     "Name or short description of the configuration": "Nombre o descripci\u00f3n corta de la configuraci\u00f3n",
     "Navigate to onboarding exam": "Navega hacia el examen de inducci\u00f3n",
     "Navigate up": "Navegue hacia arriba",
-    "Need help logging in?": "\u00bfNecesita ayuda para iniciar sesi\u00f3n?",
     "Need help signing in?": "\u00bfNecesita ayuda para iniciar sesi\u00f3n?",
     "Need other help signing in?": "\u00bfNecesita otra ayuda para iniciar sesi\u00f3n?",
     "Needs verified certificate ": "Necesita certificado verificado",
@@ -1393,7 +1382,6 @@
     "Organization ": "Organizaci\u00f3n",
     "Organization Name": "Nombre de la organizaci\u00f3n",
     "Organization of the signatory": "Organizaci\u00f3n del signatario",
-    "Organization:": "Organizaci\u00f3n:",
     "Other": "Otros",
     "Other sign-in issues": "Otros problemas para iniciar sesi\u00f3n",
     "Overall Score": "Puntaje general",
@@ -1540,7 +1528,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Utiliza Pregunta para plantear temas que necesitan respuestas. Utiliza Discusi\u00f3n para compartir tus ideas y comenzar conversaciones. (Requerido)",
     "Queued": "En cola",
     "REMAINING COURSES": "CURSOS RESTANTES",
-    "Re-run Course": "Relanzar Curso",
     "Read More": "Leer mas",
     "Read more": "Leer m\u00e1s",
     "Ready To Start": "Listo para comenzar",
@@ -1618,7 +1605,6 @@
     "Return to Export": "Regresar a exportar",
     "Return to Your Dashboard": "Volver al panel principal",
     "Return to all posts": "Volver a todas las publicaciones",
-    "Return to my dashboard": "Volver a mi panel de control",
     "Return to team listing": "Volver a la lista del equipo",
     "Review Policy Exception": "Revisar excepci\u00f3n a la pol\u00edtica",
     "Review Rules": "Revisar las reglas",
@@ -1671,14 +1657,12 @@
     "Select a subject for your support request.": "Elige un tema para tu petici\u00f3n de ayuda.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Seleccione un tiempo disponible para el examen. Si es mayor a 24 horas, escriba la cantidad de tiempo. Puede otorgar a estudiantes individuales un tiempo extra para completar el examen a trav\u00e9s del panel de control de instructor.",
     "Select all": "Selecionar todo",
-    "Select employment status": "Seleccionar estatus laboral",
     "Select fidelity": "Seleccionar fidelidad",
     "Select language": "Seleccionar lenguaje",
     "Select one or more groups:": "Selecciones uno o mas grupos:",
     "Select the course-wide discussion topics that you want to divide.": "Seleccione los temas de discusi\u00f3n del curso que desea dividir.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Selecciona la zona horaria para exponer las fechas del curso. Si no especificas una zona horaria, las fechas del curso, incluidas las fechas l\u00edmites de tareas, ser\u00e1n expuestas en la zona horaria local de tu navegador.",
     "Select turnaround": "Seleccione tiempo de entrega.",
-    "Selected blocks": "Bloques seleccionados",
     "Selected tab": "Opci\u00f3n seleccionada",
     "Self": "Auto",
     "Send to:": "Enviar a:",
@@ -2314,17 +2298,11 @@
     "Weight of Total Grade": "Peso en la calificaci\u00f3n total",
     "We\u2019re sorry to see you go!": "\u00a1Sentimos que te vayas!",
     "What You Need for Verification": "Lo que necesita para la verificaci\u00f3n",
-    "What can we help you with, {username}?": "\u00bfEn qu\u00e9 podemos ayudarte, {username}?",
     "What does %(platformName)s do with this photo?": "\u00bfQu\u00e9 hace %(platformName)s con esta imagen?",
     "What does this mean?": "\u00bfQu\u00e9 significa esto?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "\u00bfQu\u00e9 sucede si no puedo ver la imagen de la c\u00e1mara, o si no puedo ver mi foto para determinar qu\u00e9 lado es visible?",
     "What if I have difficulty holding my ID in position relative to the camera?": "\u00bfQu\u00e9 sucede si tengo dificultades para mantener mi identificaci\u00f3n en posici\u00f3n con respecto a la c\u00e1mara?",
     "What if I have difficulty holding my head in position relative to the camera?": "\u00bfQu\u00e9 sucede si tengo dificultades para mantener la cabeza en posici\u00f3n con respecto a la c\u00e1mara?",
-    "What industry do you currently work in?": "\u00bfEn que industria trabajas actualmente?",
-    "What industry do you want to work in?": "\u00bfEn que industria te gustar\u00eda trabajar?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "\u00bfCual es el nivel de educaci\u00f3n mas alto que alguno de tus padres o responsables ha adquirido? ",
-    "What is the highest level of education that you have achieved so far?": "\u00bfCual es el nivel mas alto de educaci\u00f3n que has obtenido hasta la fecha?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "\u00bfCual fue el ingreso total combinado, durante los ultimo 12 meses, de todos los miembros de tu familia? ",
     "What's Your Next Accomplishment?": "\u00bfQu\u00e9 ser\u00e1 tu pr\u00f3ximo logro?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Cuando un estudiante ya haya enviado su respuesta en una evaluaci\u00f3n, en seguida ver\u00e1 si esa respuesta es correcta o incorrecta y la puntuaci\u00f3n correspondiente.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Cuando su cara est\u00e9 en posici\u00f3n, use el bot\u00f3n Tomar foto {icon} a continuaci\u00f3n para tomar su foto.",
@@ -2333,7 +2311,6 @@
     "Whole words": "Palabras completas",
     "Why activate?": "Por qu\u00e9 activar?",
     "Why does %(platformName)s need my photo?": "Por qu\u00e9 %(platformName)s necesita mi foto ?",
-    "Why does edX collect this information?": "\u00bfPor qu\u00e9 edX recoleta esta informaci\u00f3n?",
     "Width": "Anchura",
     "Will Be Visible To:": "Ser\u00e1 visible para:",
     "Words: {0}": "Palabras: {0}",
@@ -2538,7 +2515,6 @@
     "endorsed %(time_ago)s by %(user)s": "Validado hace %(time_ago)s por %(user)s",
     "enter code here": "ingresa el c\u00f3digo aqu\u00ed",
     "enter link description here": "Ingresa la descripci\u00f3n del v\u00ednculo aqu\u00ed",
-    "finish later": "terminar despues",
     "follow this post": "sigue esta publicaci\u00f3n",
     "for": "para",
     "group configuration": "Configuraci\u00f3n de Grupo",
@@ -2553,7 +2529,6 @@
     "minute": "minuto",
     "minutes": "minutos",
     "name": "nombre",
-    "next page": "Siguiente p\u00e1gina",
     "off": "Apagar",
     "on": "Encender",
     "one letter Friday\u0004F": "V",
@@ -2585,7 +2560,6 @@
     "team count": "Cantidad de equipos",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "Cuantos m\u00e1s detalles, m\u00e1s r\u00e1pido y mejor podremos responder",
     "there is currently {numVotes} vote": [
       "actualmente hay {numVotes} voto",
       "actualmente hay {numVotes} votos",
diff --git a/cms/static/js/i18n/eu-es/djangojs.js b/cms/static/js/i18n/eu-es/djangojs.js
index bd36c35cd1..0093df513b 100644
--- a/cms/static/js/i18n/eu-es/djangojs.js
+++ b/cms/static/js/i18n/eu-es/djangojs.js
@@ -68,7 +68,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Azpitituluak erakutsiko dira bideoa ikusten hasten zarenean.)",
     "(Community TA)": "(Eztabaida-laguntzailea)",
     "(Optional)": "(Aukerakoa)",
-    "(Read-only)": "(Irakurtzekoa baino ez)",
     "(Required Field)": "(Beharrezko eremua)",
     "(Staff)": "(Arduradunak)",
     "(optional)": "(aukerakoa)",
@@ -349,9 +348,7 @@
     "Course Name": "Ikastaroaren izena",
     "Course Number": "Ikastaro-zenbakia",
     "Course Number Override": "Aldatu Ikastaro-zenbakia",
-    "Course Number:": "Ikastaro-zenbakia",
     "Course Outline": "Ikastaroaren egitura",
-    "Course Run:": "Ikastaroa ematea:",
     "Course Start": "Ikastaroaren hasiera",
     "Course Title": "Ikastaroaren izenburua",
     "Course Title Override": "Aldatu ikastaroaren izenburua",
@@ -412,7 +409,6 @@
     "Describe ": "Deskribatu",
     "Description": "Deskribapena",
     "Description of the certificate": "Ziurtagiriaren deskribapena",
-    "Details": "Xehetasunak",
     "Dimensions": "Neurriak",
     "Disc": "Diskoa",
     "Discard Changes": "Utzi aldaketak",
@@ -752,7 +748,6 @@
     "Name of the signatory": "Sinatzailearen izena",
     "Name or short description of the configuration": "Ezarpenen izena edo deskribapen laburra",
     "Navigate up": "Joan gora",
-    "Need help logging in?": "Laguntza behar duzu saioa hasteko?",
     "New %(item_type)s": "%(item_type)s berria",
     "New Address": "Helbide berria",
     "New Password": "Pasahitz berria",
@@ -825,7 +820,6 @@
     "Organization ": "Erakundea",
     "Organization Name": "Erakundearen izena",
     "Organization of the signatory": "Sinatzailearen erakundea",
-    "Organization:": "Erakundea:",
     "Other": "Bestelako bat",
     "Overall Score": "Puntuazio orokorra",
     "Page break": "Orri-jauzia",
@@ -894,7 +888,6 @@
     "Question": "Galdera",
     "Queued": "Ilaran",
     "REMAINING COURSES": "GERATZEN DIREN IKASTAROAK",
-    "Re-run Course": "Errepikatu ikastaroa",
     "Read More": "Irakurri gehiago",
     "Read more": "Irakurri gehiago",
     "Ready To Start": "Hasteko prest",
@@ -1328,7 +1321,6 @@
     "We've encountered an error. Refresh your browser and then try again.": "Errore bat aurkitu dugu. Frekatu zure nabigatzailea eta saiatu berriz.",
     "Web:": "Web:",
     "Webcam": "Web-kamera",
-    "What can we help you with, {username}?": "Zertan lagundu ahal dizugu, {username}?",
     "What does this mean?": "Zer esan nahi du honek?",
     "What's Your Next Accomplishment?": "Zein izango da hurrengo lorpena?",
     "Whole words": "Hitz osoak",
@@ -1446,7 +1438,6 @@
     "minute": "minutu",
     "minutes": "minutu",
     "name": "izena",
-    "next page": "hurrengo orria",
     "off": "itzalita",
     "on": "piztuta",
     "one letter Friday\u0004F": "O",
diff --git a/cms/static/js/i18n/fr/djangojs.js b/cms/static/js/i18n/fr/djangojs.js
index 254b689959..dbba28e4d7 100644
--- a/cms/static/js/i18n/fr/djangojs.js
+++ b/cms/static/js/i18n/fr/djangojs.js
@@ -224,7 +224,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Les sous-titres s'afficheront quand vous lancerez la vid\u00e9o.)",
     "(Community TA)": "(Assistant technique)",
     "(Optional)": "(Optionnel)",
-    "(Read-only)": "(Lecture-seule)",
     "(Required Field)": "(Champ requis)",
     "(Self-paced) Ended {end}": "(\u00c0 votre rythme) Termin\u00e9 {end}",
     "(Self-paced) Ends {end}": "(\u00c0 votre rythme) Se finit \u00e0 {end}",
@@ -375,7 +374,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Une erreur est survenue. Attendez quelques minutes avant de r\u00e9essayer.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Une erreur est survenue lors de la r\u00e9cup\u00e9ration de votre courriel. S'il vous pla\u00eet r\u00e9essayez plus tard, et contactez le support technique si le probl\u00e8me persiste.",
     "An error occurred when signing you in to %s.": "Une erreur s'est produite en vous connectant \u00e0 %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Une erreur s'est produite lors de la tentative de r\u00e9cup\u00e9ration ou d'enregistrement des informations ci-dessous. Veuillez r\u00e9essayer plus tard.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Une erreur s'est produite lors de la recherche des membres de l'\u00e9quipe. Essayez d'actualiser la page.",
     "An error occurred while removing the member from the team. Try again.": "Une erreur est survenue lors de la suppression du membre de l'\u00e9quipe. R\u00e9essayez.",
     "An error occurred.": "Une erreur est survenue.",
@@ -463,7 +461,6 @@
     "Bottom": "Bas",
     "Browse": "Parcourir",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Parcourez les plus r\u00e9cents cours et voyez ce qui existe de nouveau dans vos sujets favoris",
-    "Browsing": "Navigation",
     "Bulk Exceptions": "D\u00e9rogations en lot",
     "Bullet list": "Liste \u00e0 puces",
     "Bulleted List (Ctrl+U)": "List \u00e0 Puces (Ctrl+U)",
@@ -650,9 +647,7 @@
     "Course Name": "Nom du Cours",
     "Course Number": "Num\u00e9ro du cours",
     "Course Number Override": "Ecrasement du Num\u00e9ro du Cours",
-    "Course Number:": "Num\u00e9ro du cours :",
     "Course Outline": "Plan du Cours",
-    "Course Run:": "Session :",
     "Course Start": "D\u00e9but du Cours",
     "Course Title": "Titre du cours",
     "Course Title Override": "Surcharge du Titre du Cours",
@@ -664,7 +659,6 @@
     "Create": "Cr\u00e9er",
     "Create Account": "Cr\u00e9er un compte",
     "Create Re-run": "Cr\u00e9er une relance",
-    "Create Support Ticket": "Cr\u00e9er un billet de support",
     "Create a New Team": "Cr\u00e9er une nouvelle \u00e9quipe",
     "Create a content group": "Cr\u00e9er un groupe de contenu",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Cr\u00e9ez une nouvelle \u00e9quipe si vous ne trouvez pas une \u00e9quipe existante \u00e0 rejoindre, ou si vous d\u00e9sirez apprendre avec des amis que vous connaissez d\u00e9j\u00e0.",
@@ -734,7 +728,6 @@
     "Describe ": "D\u00e9crire",
     "Description": "Description",
     "Description of the certificate": "Description du certificat",
-    "Details": "D\u00e9tails",
     "Device with Camera": "Appareil avec cam\u00e9ra",
     "Dimensions": "Dimensions",
     "Disc": "Disque",
@@ -952,7 +945,6 @@
     "Find next": "Trouver le suivant",
     "Find previous": "Trouver le pr\u00e9c\u00e9dent",
     "Finish": "Terminer",
-    "Finish later": "Terminer plus tard",
     "First time here?": "C'est votre premi\u00e8re visite ?",
     "Follow": "Suivre",
     "Follow or unfollow posts": "Suivre ou ne plus suivre un message",
@@ -1007,7 +999,6 @@
     "HTML preview of post": "Pr\u00e9visualisation HTML de l'article",
     "HTML source code": "Code source HTML",
     "Have a computer with a functioning webcam": "Ayez un ordinateur avec une webcam fonctionnelle",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Avez-vous d\u00e9j\u00e0 servi en service actif dans les forces arm\u00e9es, les r\u00e9serves ou la garde nationale?",
     "Have your valid photo ID (e.g. driver's license or passport) ready": "Ayez \u00e0 port\u00e9e de main votre pi\u00e8ce d'identit\u00e9 valide avec photo (par exemple, permis de conduire ou passeport)",
     "Header": "En-t\u00eate",
     "Header 1": "En-t\u00eate 1",
@@ -1213,7 +1204,6 @@
     "Loading more threads": "Chargement de plus de messages",
     "Loading posts list": "Chargement de la liste des messages",
     "Loading your courses": "Chargement de vos cours",
-    "Loading...": "Chargement...",
     "Location": "Adresse",
     "Location in Course": "Emplacement dans le cours",
     "Lock this asset": "V\u00e9rouiller cet \u00e9l\u00e9ment",
@@ -1277,7 +1267,6 @@
     "Name or short description of the configuration": "Nom ou description br\u00e8ve de la configuration",
     "Navigate to onboarding exam": "Acc\u00e9dez \u00e0 l'examen d'int\u00e9gration",
     "Navigate up": "Naviguer vers le haut",
-    "Need help logging in?": "Besoin d'aide pour vous connecter ?",
     "Need help signing in?": "Besoin d'aide pour vous enregistrer?",
     "Need other help signing in?": "Encore besoin d'aide pour vous enregistrer?",
     "Needs verified certificate ": "N\u00e9cessite un certificat v\u00e9rifi\u00e9",
@@ -1393,7 +1382,6 @@
     "Organization ": "Organisation",
     "Organization Name": "Nom de l'organisation",
     "Organization of the signatory": "Organisation du signataire",
-    "Organization:": "Organisation:",
     "Other": "Autre",
     "Other sign-in issues": "Autres probl\u00e8mes d'enregistrement",
     "Overall Score": "Score total",
@@ -1540,7 +1528,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Les questions sont adapt\u00e9es pour les sujets qui n\u00e9cessitent une r\u00e9ponse. Les discussions permettent de partager des id\u00e9es et de commencer des conversations. (Requis)",
     "Queued": "Mis en file d'attente",
     "REMAINING COURSES": "RESTANT",
-    "Re-run Course": "Relancer le cours",
     "Read More": "En lire plus.",
     "Read more": "En lire plus",
     "Ready To Start": "Pr\u00eat \u00e0 Commencer",
@@ -1619,7 +1606,6 @@
     "Return to Export": "Retourner \u00e0 l'exportation",
     "Return to Your Dashboard": "Retour au Tableau de bord",
     "Return to all posts": "Revenir \u00e0 tous les sujets",
-    "Return to my dashboard": "Retour \u00e0 mon tableau de bord",
     "Return to team listing": "Retour \u00e0 la liste des membres de l'\u00e9quipe",
     "Review Policy Exception": "Exception aux R\u00e8gles de Revues",
     "Review Rules": "V\u00e9rification des r\u00e8gles",
@@ -1672,14 +1658,12 @@
     "Select a subject for your support request.": "S\u00e9lectionnez un sujet pour votre demande d'assistance.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Choisissez une p\u00e9riode de temps pour l'examen. Si c'est plus de 24 heures, indiquer la quantit\u00e9 de temps. Vous pouvez accorder du temps suppl\u00e9mentaire \u00e0 des apprenants individuels via le tableau de bord de l'enseignant afin de leur permettre de terminer l'examen.",
     "Select all": "Tout s\u00e9lectionner",
-    "Select employment status": "S\u00e9lectionnez le statut d'emploi",
     "Select fidelity": "S\u00e9lectionnez la fid\u00e9lit\u00e9",
     "Select language": "S\u00e9lectionnez la langue",
     "Select one or more groups:": "S\u00e9lectionner au moins un groupe\u00a0:",
     "Select the course-wide discussion topics that you want to divide.": "S\u00e9lectionnez les sujets de discussion du cours que vous souhaitez s\u00e9parer.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "S\u00e9lectionnez le fuseau horaire pour l'affichage des dates de cours. Si vous n'indiquez aucun fuseau horaire, les dates de cours, y compris les \u00e9ch\u00e9ances de devoirs, seront affich\u00e9s en fonction du fuseau horaire local de votre navigateur. ",
     "Select turnaround": "S\u00e9lectionnez le d\u00e9lai d'ex\u00e9cution",
-    "Selected blocks": "Blocs s\u00e9lectionn\u00e9s",
     "Selected tab": "Onglet s\u00e9lectionn\u00e9",
     "Self": "Auto",
     "Send to:": "Envoyez \u00e0 :",
@@ -2316,17 +2300,11 @@
     "Weight of Total Grade": "Valeur de l'ensemble du grade",
     "We\u2019re sorry to see you go!": "Nous sommes d\u00e9sol\u00e9s de vous voir partir !",
     "What You Need for Verification": "Ce qui est n\u00e9c\u00e9saire pour la v\u00e9rification",
-    "What can we help you with, {username}?": "A quoi pouvons-nous vous \u00eatre utile, {username}?",
     "What does %(platformName)s do with this photo?": "Que fait %(platformName)s avec cette photo ?",
     "What does this mean?": "Qu'est ce que cela signifie?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Que se passe-t-il si je ne peux pas voir l'image de l'appareil photo ou si je ne peux pas voir ma photo pour d\u00e9terminer quel c\u00f4t\u00e9 est visible ?",
     "What if I have difficulty holding my ID in position relative to the camera?": "Que faire si j'ai des difficult\u00e9s \u00e0 tenir ma carte d'identit\u00e9 en position par rapport \u00e0 la cam\u00e9ra ?",
     "What if I have difficulty holding my head in position relative to the camera?": "Que faire si j'ai des difficult\u00e9s \u00e0 maintenir ma t\u00eate en position par rapport \u00e0 la cam\u00e9ra ?",
-    "What industry do you currently work in?": "Dans quel secteur travaillez-vous actuellement?",
-    "What industry do you want to work in?": "Dans quel secteur souhaitez-vous travailler?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Quel est le niveau de scolarit\u00e9 le plus \u00e9lev\u00e9 que l'un de vos parents ou tuteurs ait atteint?",
-    "What is the highest level of education that you have achieved so far?": "Quel est le niveau d'\u00e9ducation le plus \u00e9lev\u00e9 que vous ayez atteint jusqu'\u00e0 pr\u00e9sent?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Quel a \u00e9t\u00e9 le revenu total combin\u00e9, au cours des 12 derniers mois, de tous les membres de votre famille?",
     "What's Your Next Accomplishment?": "Quel est votre prochain accomplissement?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Lorsque les \u00e9tudiants r\u00e9pondent \u00e0 une \u00e9valuation, ils voient imm\u00e9diatement si la r\u00e9ponse est juste ou fausse ainsi que leur note. ",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Lorsque votre visage est en position, utilisez le bouton \"Prendre une photo\" {icon} ci-dessous pour prendre votre photo.",
@@ -2335,7 +2313,6 @@
     "Whole words": "Mots entiers",
     "Why activate?": "Pourquoi activer?",
     "Why does %(platformName)s need my photo?": "Pourquoi %(platformName)s a besoin de ma photo ?",
-    "Why does edX collect this information?": "Pourquoi edX collecte-t-il ces informations ?",
     "Width": "Largeur",
     "Will Be Visible To:": "Sera visible pour :",
     "Words: {0}": "Mots : {0}",
@@ -2540,7 +2517,6 @@
     "endorsed %(time_ago)s by %(user)s": "approuv\u00e9 %(time_ago)s par %(user)s",
     "enter code here": "saisir du code ici",
     "enter link description here": "saisir une description du lien ici",
-    "finish later": "terminer plus tard",
     "follow this post": "Suivre ce message",
     "for": "pour",
     "group configuration": "configuration des groupes",
@@ -2555,7 +2531,6 @@
     "minute": "minute",
     "minutes": "minutes",
     "name": "nom",
-    "next page": "page suivante",
     "off": "arr\u00eat",
     "on": "on",
     "one letter Friday\u0004F": "V",
@@ -2587,7 +2562,6 @@
     "team count": "total \u00e9quipe",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "le plus rapidement et efficacement que nous pouvons r\u00e9pondre !",
     "there is currently {numVotes} vote": [
       "il y a actuellement {numVotes} vote",
       "il y a actuellement {numVotes} votes",
diff --git a/cms/static/js/i18n/id/djangojs.js b/cms/static/js/i18n/id/djangojs.js
index ce4883a2e1..1ec5f0cd4e 100644
--- a/cms/static/js/i18n/id/djangojs.js
+++ b/cms/static/js/i18n/id/djangojs.js
@@ -233,7 +233,6 @@
     "Bottom": "Bawah",
     "Browse": "Jelajahi",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Telusuri kursus yang baru dirilis dan lihat yang baru dalam subjek favorit Anda.",
-    "Browsing": "Jelajah",
     "Bulk Exceptions": "Pengecualian Massal",
     "Bullet list": "Bullet list",
     "Bulleted List (Ctrl+U)": "Bulleted List (Ctrl+U)",
@@ -374,9 +373,7 @@
     "Course Name": "Nama Kursus",
     "Course Number": "Nomor Kursus",
     "Course Number Override": "Penggantian Nomor Kursus",
-    "Course Number:": "Nomor Kursus:",
     "Course Outline": "Garis Besar Kursus",
-    "Course Run:": "Kursus Berjalan:",
     "Course Title": "Judul Kursus",
     "Course Title Override": "Penggantian Judul Kursus",
     "Course Video Settings": "Pengaturan Video Kursus",
@@ -428,7 +425,6 @@
     "Describe ": "Deskripsikan",
     "Description": "Deskripsi",
     "Description of the certificate": "Keterangan sertifikat",
-    "Details": "Detil",
     "Dimensions": "Dimensi",
     "Disc": "Cakram",
     "Discard Changes": "Batalkan Perubahan",
@@ -906,7 +902,6 @@
     "Organization ": "Organisasi",
     "Organization Name": "Nama Organisasi",
     "Organization of the signatory": "Organisasi dari penandatangan",
-    "Organization:": "Organisasi:",
     "Other": "Lainnya",
     "Overall Score": "Nilai Keseluruhan",
     "PDF Chapters": "Bab PDF",
@@ -1561,7 +1556,6 @@
     "Weight of Total Grade": "Berat dari total grade",
     "We\u2019re sorry to see you go!": "Kami sedih Anda pergi ",
     "What You Need for Verification": "Apa yang anda perlukan untuk verifikasi",
-    "What can we help you with, {username}?": "Ada yang bisa kami bantu, {username}?",
     "What does %(platformName)s do with this photo?": "Apa yang dilakukan %(platformName)s terhadap foto ini?",
     "What does this mean?": "Apakah ini maksudnya?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Saat peserta mengirimkan jawaban untuk penilaian, mereka langsung dapat melihat apakah jawaban mereka benar atau salah, dan nilai yang mereka terima.",
diff --git a/cms/static/js/i18n/it-it/djangojs.js b/cms/static/js/i18n/it-it/djangojs.js
index 6d7795d97e..cbf49bcad8 100644
--- a/cms/static/js/i18n/it-it/djangojs.js
+++ b/cms/static/js/i18n/it-it/djangojs.js
@@ -210,7 +210,6 @@
     "(Caption will be displayed when you start playing the video.)": "(La trascrizione del video verr\u00e0 mostrata quando inizierai a guardare il video)",
     "(Community TA)": "(Community TA)",
     "(Optional)": "(Facoltativo)",
-    "(Read-only)": "(Sola lettura)",
     "(Required Field)": "(Campo richiesto)",
     "(Self-paced) Ended {end}": "(Apprendimento autonomo) Terminato {end}",
     "(Self-paced) Ends {end}": "(Apprendimento autonomo) Termina {end}",
@@ -360,7 +359,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Si \u00e8 verificato un errore. Aspetta qualche minuto e riprova.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Si \u00e8 verificato un errore mentre cercavi di leggere le tue email. Riprova dopo cortesemente, e contatta il supporto tecnico se il problema persiste.",
     "An error occurred when signing you in to %s.": "Si \u00e8 verificato un errore durante l'accesso a %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Si \u00e8 verificato un errore durante il tentativo di recuperare o salvare le informazioni seguenti. Prova di nuovo pi\u00f9 tardi.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Si \u00e8 verificato un errore durante la ricerca tra le adesioni ai team. Prova ad aggiornare la pagina.",
     "An error occurred while removing the member from the team. Try again.": "Si \u00e8 verificato un errore durante la rimozione del membro dal team. Riprova pi\u00f9 tardi",
     "An error occurred.": "Si \u00e8 verificato un errore. ",
@@ -447,7 +445,6 @@
     "Bottom": "In basso",
     "Browse": "Cerca",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Sfoglia i corsi avviati di recente e scopri le novit\u00e0 nei tuoi soggetti preferiti ",
-    "Browsing": "Esplorazione",
     "Bulk Exceptions": "Eccezioni di massa ",
     "Bullet list": "Elenco puntato",
     "Bulleted List (Ctrl+U)": "Elenco puntato (Ctrl+U)",
@@ -629,9 +626,7 @@
     "Course Name": "Nome Corso",
     "Course Number": "Numero del Corso",
     "Course Number Override": "Sostituzione numero corso",
-    "Course Number:": "Numero Corso",
     "Course Outline": "Struttura del corso",
-    "Course Run:": "Esecuzione corso:",
     "Course Start": "Inizio del corso ",
     "Course Title": "Titolo del Corso",
     "Course Title Override": "Sostituzione titolo corso",
@@ -643,7 +638,6 @@
     "Create": "Crea",
     "Create Account": "Crea account",
     "Create Re-run": "Crea un riavvio",
-    "Create Support Ticket": "Crea ticket di supporto",
     "Create a New Team": "Crea un nuovo gruppo",
     "Create a content group": "Crea un gruppo di contenuti ",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Crea un nuovo gruppo se non ne trovi uno esistente di cui far parte, o se vorresti apprendere insieme ad amici che conosci ",
@@ -713,7 +707,6 @@
     "Describe ": "Descrivi ",
     "Description": "Descrizione",
     "Description of the certificate": "Descrizione del certificato",
-    "Details": "Dettagli",
     "Device with Camera": "Dispositivo con telecamera ",
     "Dimensions": "Dimensioni",
     "Disc": "Disco",
@@ -925,7 +918,6 @@
     "Find next": "Trova successivo",
     "Find previous": "Trova precedente",
     "Finish": "Fine",
-    "Finish later": "Termina pi\u00f9 tardi",
     "First time here?": "Nuovo utente? ",
     "Follow": "Segui ",
     "Follow or unfollow posts": "Segui o non seguire post ",
@@ -979,7 +971,6 @@
     "HTML preview of post": "Anteprima HTML del post",
     "HTML source code": "Codice sorgente HTML",
     "Have a computer with a functioning webcam": "Disporre di un computer con una webcam funzionante",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Hai mai prestato servizio attivo nelle forze armate, nelle riserve o nella guardia nazionale degli Stati Uniti? ",
     "Have your valid photo ID (e.g. driver's license or passport) ready": "Avere a disposizione un documento d'identit\u00e0 valido con foto (ad es. la patente di guida o il passaporto)",
     "Header": "Intestazione",
     "Header 1": "Intestazione 1",
@@ -1182,7 +1173,6 @@
     "Loading more threads": "Carica ulteriori discussioni",
     "Loading posts list": "Caricamento dell'elenco dei post ",
     "Loading your courses": "Caricamento dei tuoi corsi",
-    "Loading...": "Caricamento...",
     "Location": "Posizione",
     "Location in Course": "Posizione in corso",
     "Lock this asset": "Blocca questa attivit\u00e0",
@@ -1246,7 +1236,6 @@
     "Name or short description of the configuration": "Nome o breve descrizione della configurazione ",
     "Navigate to onboarding exam": "Accedi all'esame di onboarding",
     "Navigate up": "Naviga su",
-    "Need help logging in?": "Hai bisogno di aiuto per l'accesso?",
     "Need help signing in?": "Hai bisogno di aiuto per l'accesso? ",
     "Need other help signing in?": "Hai bisogno di altro aiuto per l'accesso? ",
     "Needs verified certificate ": "Richiede un certificato verificato ",
@@ -1361,7 +1350,6 @@
     "Organization ": "Organizzazione",
     "Organization Name": "Nome organizzazione",
     "Organization of the signatory": "Organizzazione del firmatario",
-    "Organization:": "Organizzazione:",
     "Other": "Altro",
     "Other sign-in issues": "Altri problemi di collegamento ",
     "Overall Score": "Voto Finale",
@@ -1504,7 +1492,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Le domande sollevano problemi che richiedono risposte. Le discussioni condividono idee ed avviano le conversazioni. (Obbligatorio) ",
     "Queued": "In coda",
     "REMAINING COURSES": "CORSI RIMANENTI ",
-    "Re-run Course": "Riesegui il corso",
     "Read More": "Per saperne di pi\u00f9",
     "Read more": "Per saperne di pi\u00f9",
     "Ready To Start": "Pronto a partire",
@@ -1580,7 +1567,6 @@
     "Return to Export": "Ritorna a Esporta",
     "Return to Your Dashboard": "Ritorna alla tua dashboard",
     "Return to all posts": "Torna a tutti i post",
-    "Return to my dashboard": "Torna alla mia dashboard",
     "Return to team listing": "Torna alla lista del gruppo",
     "Review Policy Exception": "Verifica Eccezione Policy",
     "Review Rules": "Regole di controllo",
@@ -1632,14 +1618,12 @@
     "Select a subject for your support request.": "Seleziona un argomento per la tua richiesta di supporto. ",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Seleziona il tempo da assegnare per l'esame. Se sono pi\u00f9 di 24 ore, digita la quantit\u00e0 di tempo. Puoi concedere ai singoli studenti pi\u00f9 tempo per completare l'esame tramite la Dashboard dell'Istruttore. ",
     "Select all": "Seleziona tutto",
-    "Select employment status": "Seleziona occupazione",
     "Select fidelity": "Seleziona fedelt\u00e0",
     "Select language": "Seleziona lingua",
     "Select one or more groups:": "Seleziona uno o pi\u00f9 gruppi:",
     "Select the course-wide discussion topics that you want to divide.": "Selezionare gli argomenti di discussione a livello del corso che si desidera dividere. ",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Seleziona il fuso orario per la visualizzazione delle date dei corsi. Se non specifichi un fuso orario, le date dei corsi, comprese le scadenze dei compiti, verranno visualizzate nel fuso orario locale del tuo browser. ",
     "Select turnaround": "Seleziona soluzione temporaneo",
-    "Selected blocks": "Blocchi selezionati",
     "Selected tab": "Tab selezionata",
     "Self": "Autonomo ",
     "Send to:": "Manda a:",
@@ -2259,17 +2243,11 @@
     "Weight of Total Grade": "Peso del Voto totale",
     "We\u2019re sorry to see you go!": "Ci dispiace che tu ci lasci! ",
     "What You Need for Verification": "Cosa serve per la verifica ",
-    "What can we help you with, {username}?": "Come possiamo aiutarti, {username}?",
     "What does %(platformName)s do with this photo?": "Per cosa viene utilizzata la mia foto da %(platformName)s ? ",
     "What does this mean?": "Cosa significa? ",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Cosa devo fare se non posso visualizzare l'immagine della fotocamera o se non posso visualizzare la mia foto per determinare il lato visibile? ",
     "What if I have difficulty holding my ID in position relative to the camera?": "Cosa devo fare se ho difficolt\u00e0 a mantenere il documento di identit\u00e0 in posizione rispetto alla telecamera? ",
     "What if I have difficulty holding my head in position relative to the camera?": "Cosa devo fare se ho difficolt\u00e0 a mantenere la testa in posizione rispetto alla telecamera? ",
-    "What industry do you currently work in?": "In quale settore lavori attualmente? ",
-    "What industry do you want to work in?": "In quale settore vuoi lavorare? ",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Qual \u00e8 il livello di istruzione pi\u00f9 elevato raggiunto da uno dei tuoi genitori o tutori? ",
-    "What is the highest level of education that you have achieved so far?": "Qual \u00e8 il livello di istruzione pi\u00f9 elevato che hai raggiunto finora? ",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Qual \u00e8 stato il reddito totale complessivo, negli ultimi 12 mesi, di tutti i membri della tua famiglia? ",
     "What's Your Next Accomplishment?": "Quale \u00e8 il tuo prossimo risultato? ",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Quando gli studenti inviano una risposta a una valutazione, vedono immediatamente se la risposta \u00e8 corretta o errata e il punteggio ottenuto. ",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Quando il viso \u00e8 in posizione, utilizzare il pulsante Scatta la foto {icon} di seguito per scattare la foto. ",
@@ -2278,7 +2256,6 @@
     "Whole words": "Parole intere",
     "Why activate?": "Perch\u00e9 attivare? ",
     "Why does %(platformName)s need my photo?": "Perch\u00e9 %(platformName)s richiede la mia foto? ",
-    "Why does edX collect this information?": "Perch\u00e9 edX raccoglie queste informazioni?",
     "Width": "Larghezza",
     "Will Be Visible To:": "Sar\u00e0 visibile a:",
     "Words: {0}": "Parole: {0}",
@@ -2480,7 +2457,6 @@
     "endorsed %(time_ago)s by %(user)s": "promosso %(time_ago)s da %(user)s",
     "enter code here": "inserisci qui il codice",
     "enter link description here": "Inserisci qui la descrizione del link",
-    "finish later": "termina pi\u00f9 tardi",
     "follow this post": "segui questo post ",
     "for": "per ",
     "group configuration": "Configurazione del gruppo",
@@ -2494,7 +2470,6 @@
     "minute": "minuto",
     "minutes": "minuti",
     "name": "nome",
-    "next page": "pagina successiva",
     "off": "off",
     "on": "on",
     "one letter Friday\u0004F": "V",
@@ -2526,7 +2501,6 @@
     "team count": "totale gruppo",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "rispondere nel modo pi\u00f9 veloce e utile possibile. ",
     "there is currently {numVotes} vote": [
       "attualmente \u00e8 presente {numVotes} voto",
       "attualmente sono presenti {numVotes} voti",
diff --git a/cms/static/js/i18n/mn/djangojs.js b/cms/static/js/i18n/mn/djangojs.js
index c733e16930..125410cbf4 100644
--- a/cms/static/js/i18n/mn/djangojs.js
+++ b/cms/static/js/i18n/mn/djangojs.js
@@ -126,9 +126,7 @@
     "Course Id": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u043a\u043e\u0434",
     "Course Name": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u043d\u044d\u0440",
     "Course Number": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0434\u0443\u0433\u0430\u0430\u0440",
-    "Course Number:": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0434\u0443\u0433\u0430\u0430\u0440:",
     "Course Outline": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0433\u0430\u0440\u0447\u0438\u0433",
-    "Course Run:": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0445\u0443\u0433\u0430\u0446\u0430\u0430:",
     "Course Title": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u043d\u044d\u0440",
     "Course is not yet visible to students.": "\u0425\u0438\u0447\u044d\u044d\u043b \u0441\u0443\u0440\u0430\u043b\u0446\u0430\u0433\u0447\u0434\u0430\u0434 \u0430\u0440\u0430\u0439 \u0445\u0430\u0440\u0430\u0433\u0434\u0430\u0445\u0433\u04af\u0439 \u0431\u0430\u0439\u0433\u0430\u0430. ",
     "Create": "\u04ae\u04af\u0441\u0433\u044d\u0445",
@@ -149,7 +147,6 @@
     "Delete table": "\u0425\u04af\u0441\u043d\u044d\u0433\u0442 \u0443\u0441\u0442\u0433\u0430\u0445",
     "Deleting": "\u0423\u0441\u0442\u0433\u0430\u0436 \u0431\u0430\u0439\u043d\u0430",
     "Description": "\u0422\u0430\u0439\u043b\u0431\u0430\u0440",
-    "Details": "\u0414\u044d\u043b\u0433\u044d\u0440\u044d\u043d\u0433\u04af\u0439",
     "Dimensions": "\u0425\u044d\u043c\u0436\u044d\u044d\u0441\u04af\u04af\u0434",
     "Discard Changes": "\u04e8\u04e9\u0440\u0447\u043b\u04e9\u043b\u0442\u0438\u0439\u0433 \u0431\u043e\u043b\u0438\u0443\u043b\u0430\u0445",
     "Discussion Home": "\u042d\u0445\u043b\u044d\u043b",
@@ -285,7 +282,6 @@
     "OpenAssessment Save Error": "\u041d\u044d\u044d\u043b\u0442\u0442\u044d\u0439 \u04af\u043d\u044d\u043b\u0433\u044d\u044d \u0425\u0430\u0434\u0433\u0430\u043b\u0430\u0433\u0434\u0430\u0445 \u0410\u043b\u0434\u0430\u0430",
     "Order History": "\u0417\u0430\u0445\u0438\u0430\u043b\u0433\u044b\u043d \u0442\u04af\u04af\u0445",
     "Organization": "\u0411\u0430\u0439\u0433\u0443\u0443\u043b\u043b\u0430\u0433\u0430",
-    "Organization:": "\u0411\u0430\u0439\u0433\u0443\u0443\u043b\u043b\u0430\u0433\u0430:",
     "Other": "\u0411\u0443\u0441\u0430\u0434",
     "Password": "\u041d\u0443\u0443\u0446 \u04af\u0433",
     "Play": "\u0422\u043e\u0433\u043b\u0443\u0443\u043b\u0430\u0445",
@@ -449,7 +445,7 @@
     "Very loud": "\u041c\u0430\u0448 \u0447\u0430\u043d\u0433\u0430",
     "Very low": "\u041c\u0430\u0448 \u0441\u0443\u043b",
     "View": "\u0425\u0430\u0440\u0430\u0445",
-    "View Live": "LMS-\u0434 \u04af\u0437\u044d\u0445",
+    "View Live": "LMS-\u0434 \u0445\u0430\u0440\u0430\u0445",
     "Volume": "\u0426\u0430\u0440\u0430\u0430",
     "Vote for good posts and responses": "\u0427\u0430\u043d\u0430\u0440\u0442\u0430\u0439 \u0431\u0438\u0447\u043b\u044d\u0433 \u0431\u043e\u043b\u043e\u043d \u0445\u0430\u0440\u0438\u0443\u043b\u0442\u0430\u0434 \u0441\u0430\u043d\u0430\u043b \u04e9\u0433\u04e9\u0445",
     "We couldn't sign you in.": "\u0422\u0430\u043d\u044b\u0433 \u0441\u0438\u0441\u0442\u0435\u043c\u0434 \u043d\u044d\u0432\u0442\u0440\u04af\u04af\u043b\u044d\u0445 \u0431\u043e\u043b\u043e\u043c\u0436\u0433\u04af\u0439 \u0431\u0430\u0439\u043d\u0430",
diff --git a/cms/static/js/i18n/pt-pt/djangojs.js b/cms/static/js/i18n/pt-pt/djangojs.js
index 6688e16f7b..477fc56bff 100644
--- a/cms/static/js/i18n/pt-pt/djangojs.js
+++ b/cms/static/js/i18n/pt-pt/djangojs.js
@@ -171,7 +171,6 @@
     "(Caption will be displayed when you start playing the video.)": "(As legendas ser\u00e3o exibidas quando iniciar a reprodu\u00e7\u00e3o do v\u00eddeo.)",
     "(Community TA)": "(Assistente de Ensino da Comunidade)",
     "(Optional)": "(Opcional)",
-    "(Read-only)": "(S\u00f3 leitura)",
     "(Required Field)": "(Campo Obrigat\u00f3rio)",
     "(Self-paced) Ended {end}": "(Ritmo Pr\u00f3prio) Terminado {end}",
     "(Self-paced) Ends {end}": "(Ritmo Pr\u00f3prio) Termina {end}",
@@ -322,7 +321,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Ocorreu um erro. Aguarde alguns minutos e tente novamente.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Ocorreu um erro ao recuperar o seu email. Por favor, tente novamente mais tarde e contate o suporte t\u00e9cnico se o problema persistir.",
     "An error occurred when signing you in to %s.": "Ocorreu um erro ao iniciar sess\u00e3o em %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Ocorreu um erro ao tentar recuperar ou salvar as informa\u00e7\u00f5es abaixo. Por favor, tente novamente mais tarde.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Um erro ocorreu ao procurar a ades\u00e3o \u00e0 equipa. Tente atualizar a p\u00e1gina.",
     "An error occurred while removing the member from the team. Try again.": "Ocorreu um erro ao remover um membro da equipa. Tente novamente.",
     "An error occurred.": "Ocorreu um erro.",
@@ -409,7 +407,6 @@
     "Bottom": "Fundo",
     "Browse": "Procurar",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Explore os cursos recentemente lan\u00e7ados e veja o que h\u00e1 de novo sobre os seus temas favoritos",
-    "Browsing": "Navega\u00e7\u00e3o",
     "Bulk Exceptions": "Exce\u00e7\u00f5es em massa",
     "Bullet list": "Lista de marcadores",
     "Bulleted List (Ctrl+U)": "Lista de Marcadores(Ctrl+U)",
@@ -590,9 +587,7 @@
     "Course Name": "Nome do curso",
     "Course Number": "C\u00f3digo do Curso",
     "Course Number Override": "Substitui\u00e7\u00e3o do C\u00f3digo do Curso",
-    "Course Number:": "N\u00famero do Curso:",
     "Course Outline": "Descri\u00e7\u00e3o do Curso",
-    "Course Run:": "Curso de Forma\u00e7\u00e3o:",
     "Course Start": "Data de In\u00edcio do Curso",
     "Course Title": "T\u00edtulo do Curso",
     "Course Title Override": "Substitui\u00e7\u00e3o do T\u00edtulo do Curso",
@@ -604,7 +599,6 @@
     "Create": "Criar",
     "Create Account": "Criar Conta",
     "Create Re-run": "Criar Nova Edi\u00e7\u00e3o do Curso",
-    "Create Support Ticket": "Criar Pedido de Apoio",
     "Create a New Team": "Criar nova equipa",
     "Create a content group": "Criar um grupo de conte\u00fado",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Crie uma nova equipa se n\u00e3o conseguir encontrar uma equipa existente para se juntar, ou se pretende aprender com os amigos que conhece.",
@@ -674,7 +668,6 @@
     "Describe ": "Descreva ",
     "Description": "Descri\u00e7\u00e3o",
     "Description of the certificate": "Descri\u00e7\u00e3o do Certificado",
-    "Details": "Detalhes",
     "Device with Camera": "Dispositivo com C\u00e2mara",
     "Dimensions": "Dimens\u00f5es",
     "Disc": "Disco",
@@ -886,7 +879,6 @@
     "Find next": "Encontrar o seguinte",
     "Find previous": "Localizar anterior",
     "Finish": "Terminar",
-    "Finish later": "Terminar mais tarde",
     "First time here?": "\u00c9 a primeira vez aqui?",
     "Follow": "Seguir",
     "Follow or unfollow posts": "Siga ou deixe de seguir publica\u00e7\u00f5es",
@@ -939,7 +931,6 @@
     "H Align": "Alinhamento horizontal",
     "HTML preview of post": "HTML pr\u00e9-visualiza\u00e7\u00e3o da publica\u00e7\u00e3o",
     "HTML source code": "C\u00f3digo-fonte HTML",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "J\u00e1 serviu, em ativo, nas For\u00e7as Armadas, Reservas ou Guarda Nacional dos EUA?",
     "Header": "Cabe\u00e7alho",
     "Header 1": "Cabe\u00e7alho 1",
     "Header 2": "Cabe\u00e7alho 2",
@@ -1142,7 +1133,6 @@
     "Loading more threads": "A carregar mais t\u00f3picos",
     "Loading posts list": "A carregar lista de publica\u00e7\u00f5es",
     "Loading your courses": "Carregando os seus cursos",
-    "Loading...": "Carregando...",
     "Location": "Local",
     "Location in Course": "Localiza\u00e7\u00e3o no Curso",
     "Lock this asset": "Bloquear este ficheiro",
@@ -1203,7 +1193,6 @@
     "Name of the signatory": "Nome do Signat\u00e1rio",
     "Name or short description of the configuration": "Nome ou breve descri\u00e7\u00e3o da configura\u00e7\u00e3o",
     "Navigate up": "Subir",
-    "Need help logging in?": "Precisa de ajuda para iniciar sess\u00e3o?",
     "Need help signing in?": "Precisa de ajuda para entrar?",
     "Need other help signing in?": "Precisa de outra ajuda para entrar?",
     "Needs verified certificate ": "Necessita de certificado validado ",
@@ -1314,7 +1303,6 @@
     "Organization ": "Organiza\u00e7\u00e3o",
     "Organization Name": "Nome da Organiza\u00e7\u00e3o",
     "Organization of the signatory": "Organiza\u00e7\u00e3o do signat\u00e1rio",
-    "Organization:": "Organiza\u00e7\u00e3o:",
     "Other": "Outro",
     "Other sign-in issues": "Outros problemas sobre iniciar sess\u00e3o",
     "Overall Score": "Pontua\u00e7\u00e3o geral",
@@ -1456,7 +1444,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "As perguntas levantam quest\u00f5es que precisam de uma resposta. Os debates partilham ideias e iniciam conversas. (Obrigat\u00f3rio)",
     "Queued": "Em fila de espera",
     "REMAINING COURSES": "RESTANTES CURSOS",
-    "Re-run Course": "Reexecutar Curso",
     "Read More": "Ler Mais",
     "Read more": "Ler mais",
     "Ready To Start": "Pronto Para Come\u00e7ar",
@@ -1531,7 +1518,6 @@
     "Return to Export": "Regressar a Exporta\u00e7\u00e3o",
     "Return to Your Dashboard": "Regressar ao Painel de Controlo",
     "Return to all posts": "Regressar a todos os artigos",
-    "Return to my dashboard": "Voltar ao meu painel",
     "Return to team listing": "Regressar \u00e0 listagem da equipa",
     "Review Policy Exception": "Excep\u00e7\u00e3o \u00e0 Pol\u00edtica de Revis\u00e3o",
     "Review Rules": "Regras de Revis\u00e3o",
@@ -1583,14 +1569,12 @@
     "Select a subject for your support request.": "Selecione um assunto para o seu pedido de apoio.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Selecione o tempo de aloca\u00e7\u00e3o para o exame. Se for mais de 24 horas, digite a quantidade de tempo. Pode conceder tempo adicional aos estudantes para completarem o exame atrav\u00e9s do painel do formador.",
     "Select all": "Selecionar tudo",
-    "Select employment status": "Selecione o estatuto profissional.",
     "Select fidelity": "Selecionar fidelidade",
     "Select language": "Selecionar idioma",
     "Select one or more groups:": "Selecione um ou mais grupos:",
     "Select the course-wide discussion topics that you want to divide.": "Selecionar os t\u00f3picos de debate de todo o curso que pretende dividir.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Selecione o fuso hor\u00e1rio para exibir as datas do curso. Se n\u00e3o for especificado um fuso hor\u00e1rio, as datas do curso, incluindo os prazos de atribui\u00e7\u00e3o, ser\u00e3o exibidos no fuso hor\u00e1rio local do seu navegador.",
     "Select turnaround": "Selecione uma alernativa",
-    "Selected blocks": "Blocos selecionados",
     "Selected tab": "Separador selecionado",
     "Self": "Auto",
     "Send to:": "Enviar para:",
@@ -2167,7 +2151,7 @@
     "View Cohort": "Ver Grupo",
     "View Course": "Ver Curso",
     "View Current Team Memberships": "Ver Equipas de Membros Actuais",
-    "View Live": "Ver em directo",
+    "View Live": "Visualizar ao vivo",
     "View Program Record": "Ver Registo do Programa",
     "View Report": "Ver Relat\u00f3rio",
     "View Teams in the {topic_name} Topic": "Ver equipas no {topic_name} T\u00f3pico",
@@ -2213,17 +2197,11 @@
     "Weight of Total Grade": "Peso da Classifica\u00e7\u00e3o Total",
     "We\u2019re sorry to see you go!": "Temos pena que se v\u00e1 embora!",
     "What You Need for Verification": "O que \u00e9 necess\u00e1rio para a Valida\u00e7\u00e3o",
-    "What can we help you with, {username}?": "Em que podemos ajud\u00e1-lo, {username}?",
     "What does %(platformName)s do with this photo?": "O que far\u00e1 a %(platformName)s com esta fotografia?",
     "What does this mean?": "O que significa isto?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "E se n\u00e3o conseguir ver a imagem da c\u00e2mara, ou se eu n\u00e3o conseguir ver a minha fotografia para determinar qual lado \u00e9 vis\u00edvel?",
     "What if I have difficulty holding my ID in position relative to the camera?": "E se eu tiver dificuldade em manter o meu documento de identifica\u00e7\u00e3o em posi\u00e7\u00e3o em rela\u00e7\u00e3o \u00e0 c\u00e2mara?",
     "What if I have difficulty holding my head in position relative to the camera?": "E se eu tiver dificuldade em manter minha cabe\u00e7a em posi\u00e7\u00e3o em rela\u00e7\u00e3o \u00e0 c\u00e2mara?",
-    "What industry do you currently work in?": "Em que sector trabalha atualmente?",
-    "What industry do you want to work in?": "Em que sector pretende trabalhar?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Qual o n\u00edvel mais alto de educa\u00e7\u00e3o que um dos seus pais ou tutores atingiu?",
-    "What is the highest level of education that you have achieved so far?": "Qual o n\u00edvel mais alto de educa\u00e7\u00e3o que atingiu at\u00e9 agora?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Qual foi o rendimento total combinado, de todos os seus membros da sua fam\u00edlia, durante os \u00faltimos 12 meses? ",
     "What's Your Next Accomplishment?": "Qual \u00e9 a Sua Pr\u00f3xima Realiza\u00e7\u00e3o?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Quando os estudantes submetem uma resposta a uma avalia\u00e7\u00e3o, podem confirmar imediatamente se a resposta est\u00e1 correta ou incorreta e qual a pontua\u00e7\u00e3o recebida.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Quando a sua cara estiver em posi\u00e7\u00e3o, use o bot\u00e3o Tirar foto {icon} abaixo para tirar uma fotografia.",
@@ -2232,7 +2210,6 @@
     "Whole words": "Palavras completas",
     "Why activate?": "Porqu\u00ea ativar?",
     "Why does %(platformName)s need my photo?": "Porque \u00e9 que a %(platformName)s necessita da minha fotografia?",
-    "Why does edX collect this information?": "Por que \u00e9 que a edX recolhe estas informa\u00e7\u00f5es?",
     "Width": "Largura",
     "Will Be Visible To:": "Estar\u00e1 vis\u00edvel para:",
     "Words: {0}": "Palavras: {0}",
@@ -2421,7 +2398,6 @@
     "endorsed %(time_ago)s by %(user)s": "aprovado %(time_ago)s por %(user)s",
     "enter code here": "introduza o c\u00f3digo aqui",
     "enter link description here": "inserir descri\u00e7\u00e3o do link aqui",
-    "finish later": "terminar mais tarde",
     "follow this post": "siga esta publica\u00e7\u00e3o",
     "for": "para",
     "group configuration": "configura\u00e7\u00e3o de grupo",
@@ -2435,7 +2411,6 @@
     "minute": "minuto",
     "minutes": "minutos",
     "name": "nome",
-    "next page": "p\u00e1gina seguinte",
     "off": "desligado",
     "on": "ligado",
     "one letter Friday\u0004F": "S",
@@ -2467,7 +2442,6 @@
     "team count": "contagem de equipa",
     "text_word_{uniqueId}": "texto_palavra_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "texto_palavra_{uniqueId} t\u00edtulo_palavra_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "O mais r\u00e1pido e \u00fatil que conseguimos responder!",
     "there is currently {numVotes} vote": [
       "existe atualmente {numVotes} voto",
       "existem atualmente {numVotes} votos",
diff --git a/cms/static/js/i18n/rtl/djangojs.js b/cms/static/js/i18n/rtl/djangojs.js
index fd178a6ae9..316b90b64c 100644
--- a/cms/static/js/i18n/rtl/djangojs.js
+++ b/cms/static/js/i18n/rtl/djangojs.js
@@ -403,6 +403,7 @@
     "Code block": "\u023b\u00f8d\u01dd bl\u00f8\u0254\u029e",
     "Cohort Assignment Method": "\u023b\u00f8\u0265\u00f8\u0279\u0287 \u023ass\u1d09\u0183n\u026f\u01ddn\u0287 M\u01dd\u0287\u0265\u00f8d",
     "Cohort Name": "\u023b\u00f8\u0265\u00f8\u0279\u0287 N\u0250\u026f\u01dd",
+    "Cohort assignment not allowed: {email_or_username}": "\u023b\u00f8\u0265\u00f8\u0279\u0287 \u0250ss\u1d09\u0183n\u026f\u01ddn\u0287 n\u00f8\u0287 \u0250ll\u00f8\u028d\u01ddd: {email_or_username}",
     "Cohorts": "\u023b\u00f8\u0265\u00f8\u0279\u0287s",
     "Cohorts Disabled": "\u023b\u00f8\u0265\u00f8\u0279\u0287s \u0110\u1d09s\u0250bl\u01ddd",
     "Cohorts Enabled": "\u023b\u00f8\u0265\u00f8\u0279\u0287s \u0246n\u0250bl\u01ddd",
@@ -577,9 +578,7 @@
     "Download": "\u0110\u00f8\u028dnl\u00f8\u0250d",
     "Download Memberships": "\u0110\u00f8\u028dnl\u00f8\u0250d M\u01dd\u026fb\u01dd\u0279s\u0265\u1d09ds",
     "Download Transcript for Editing": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0166\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u00f8\u0279 \u0246d\u1d09\u0287\u1d09n\u0183",
-    "Download URL": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0244\u024c\u0141",
     "Download available encodings (.csv)": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0250\u028c\u0250\u1d09l\u0250bl\u01dd \u01ddn\u0254\u00f8d\u1d09n\u0183s (.\u0254s\u028c)",
-    "Download the user's certificate": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0287\u0265\u01dd ns\u01dd\u0279's \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd",
     "Draft (Never published)": "\u0110\u0279\u0250\u025f\u0287 (N\u01dd\u028c\u01dd\u0279 dnbl\u1d09s\u0265\u01ddd)",
     "Draft (Unpublished changes)": "\u0110\u0279\u0250\u025f\u0287 (\u0244ndnbl\u1d09s\u0265\u01ddd \u0254\u0265\u0250n\u0183\u01dds)",
     "Draft saved on {lastSavedStart}{editedOn}{lastSavedEnd} by {editedByStart}{editedBy}{editedByEnd}": "\u0110\u0279\u0250\u025f\u0287 s\u0250\u028c\u01ddd \u00f8n {lastSavedStart}{editedOn}{lastSavedEnd} b\u028e {editedByStart}{editedBy}{editedByEnd}",
@@ -1094,7 +1093,6 @@
     "Not Graded": "N\u00f8\u0287 \u01e4\u0279\u0250d\u01ddd",
     "Not Supported": "N\u00f8\u0287 Sndd\u00f8\u0279\u0287\u01ddd",
     "Not able to set passing grade to less than %(minimum_grade_cutoff)s%.": "N\u00f8\u0287 \u0250bl\u01dd \u0287\u00f8 s\u01dd\u0287 d\u0250ss\u1d09n\u0183 \u0183\u0279\u0250d\u01dd \u0287\u00f8 l\u01ddss \u0287\u0265\u0250n %(minimum_grade_cutoff)s%.",
-    "Not available": "N\u00f8\u0287 \u0250\u028c\u0250\u1d09l\u0250bl\u01dd",
     "Not divided": "N\u00f8\u0287 d\u1d09\u028c\u1d09d\u01ddd",
     "Not in Use": "N\u00f8\u0287 \u1d09n \u0244s\u01dd",
     "Not selected": "N\u00f8\u0287 s\u01ddl\u01dd\u0254\u0287\u01ddd",
diff --git a/cms/static/js/i18n/ru/djangojs.js b/cms/static/js/i18n/ru/djangojs.js
index 5b212d4091..a3327ceec2 100644
--- a/cms/static/js/i18n/ru/djangojs.js
+++ b/cms/static/js/i18n/ru/djangojs.js
@@ -522,7 +522,6 @@
     "Describe ": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
     "Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
     "Description of the certificate": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430",
-    "Details": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438",
     "Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440\u044b",
     "Disc": "\u0434\u0438\u0441\u043a",
     "Discard Changes": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f",
diff --git a/cms/static/js/i18n/sk/djangojs.js b/cms/static/js/i18n/sk/djangojs.js
index 667f58c9c7..ab0fce0ba9 100644
--- a/cms/static/js/i18n/sk/djangojs.js
+++ b/cms/static/js/i18n/sk/djangojs.js
@@ -153,7 +153,6 @@
     "Deleted Group": "Zmazan\u00e1 skupina",
     "Deleting this %(item_display_name)s is permanent and cannot be undone.": "Odstr\u00e1nenie %(item_display_name)s je trval\u00e9 a nie je mo\u017en\u00e9 ho vr\u00e1ti\u0165 sp\u00e4\u0165.",
     "Description": "Popis",
-    "Details": "Podrobnosti",
     "Dimensions": "Rozmery",
     "Disc": "Disk",
     "Discard Changes": "Zahodi\u0165 zmeny",
diff --git a/cms/static/js/i18n/tr-tr/djangojs.js b/cms/static/js/i18n/tr-tr/djangojs.js
index 8e097b9d5e..2c89b57353 100644
--- a/cms/static/js/i18n/tr-tr/djangojs.js
+++ b/cms/static/js/i18n/tr-tr/djangojs.js
@@ -121,7 +121,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Altyaz\u0131 videoyu oynatmaya ba\u015flad\u0131\u011f\u0131n\u0131zda g\u00f6sterilecek.)",
     "(Community TA)": "(Topluluk Asistan\u0131)",
     "(Optional)": "(\u0130ste\u011fe Ba\u011fl\u0131)",
-    "(Read-only)": "(Salt-okunur)",
     "(Required Field)": "(Gerekli Alan)",
     "(Self-paced) Ended {end}": "(Kendi kendine) Bitti {end}",
     "(Self-paced) Ends {end}": "(Kendi kendine) Biti\u015f {end}",
@@ -270,7 +269,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Bir hata olu\u015ftu. Birka\u00e7 dakika bekleyin, ve ondan sonra tekrar deneyin.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "E-posta adresinizi al\u0131rken bir hata olu\u015ftu. L\u00fctfen daha sonra tekrar deneyiniz, ve e\u011fer problem devam ederse teknik destek ile ileti\u015fime ge\u00e7iniz.",
     "An error occurred when signing you in to %s.": "%s ortam\u0131nda oturum a\u00e7arken hata olu\u015ftu.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "A\u015fa\u011f\u0131daki bilgiyi \u00e7ekmeye ya da kaydetmeye \u00e7al\u0131\u015f\u0131rken bir hata ger\u00e7ekle\u015fti. Bir s\u00fcre sonra l\u00fctfen tekrar deneyin.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Tak\u0131m \u00fcyeli\u011fine aran\u0131rken bir hata olu\u015ftu. Sayfay\u0131 yenilemeyi deneyin.",
     "An error occurred while removing the member from the team. Try again.": "Tak\u0131mdan \u00fcyeyi \u00e7\u0131kart\u0131rken bir hata olu\u015ftu. Tekrar deneyin.",
     "An error occurred.": "Bir hata meydana geldi.",
@@ -356,7 +354,6 @@
     "Bottom": "Alt",
     "Browse": "G\u00f6z at",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Yeni a\u00e7\u0131lm\u0131\u015f dersleri taray\u0131n ve ilginizi \u00e7eken konularda ne yenilikler var g\u00f6r\u00fcnt\u00fcleyin",
-    "Browsing": "G\u00f6z at\u0131l\u0131yor",
     "Bulk Exceptions": "Toplu \u0130stisnalar",
     "Bullet list": "Madde imli liste",
     "Bulleted List (Ctrl+U)": "Noktal\u0131 Liste (Ctrl+U)",
@@ -531,9 +528,7 @@
     "Course Name": "Ders \u0130smi",
     "Course Number": "Ders Numaras\u0131",
     "Course Number Override": "Ders Numaras\u0131n\u0131 Ge\u00e7ersiz K\u0131l",
-    "Course Number:": "Ders Numaras\u0131:",
     "Course Outline": "Ders Tasla\u011f\u0131",
-    "Course Run:": "Ders Yay\u0131n\u0131:",
     "Course Start": "Ders Ba\u015flang\u0131c\u0131",
     "Course Title": "Ders Ba\u015fl\u0131\u011f\u0131",
     "Course Title Override": "Ders Ba\u015fl\u0131\u011f\u0131n\u0131 Ge\u00e7ersiz K\u0131l",
@@ -545,7 +540,6 @@
     "Create": "Olu\u015ftur",
     "Create Account": "Hesap Olu\u015ftur",
     "Create Re-run": "Yeniden \u00c7al\u0131\u015ft\u0131rma Olu\u015ftur",
-    "Create Support Ticket": "Destek Talebi Olu\u015ftur",
     "Create a New Team": "Yeni Bir Tak\u0131m Olu\u015ftur",
     "Create a content group": "\u0130\u00e7erik grubu yarat",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Kat\u0131lacak bir tak\u0131m bulamad\u0131ysan\u0131z, ya da tan\u0131d\u0131\u011f\u0131n\u0131z arkada\u015flar\u0131n\u0131zla \u00f6\u011frenmek istiyorsan\u0131z yeni bir tak\u0131m olu\u015fturun.",
@@ -614,7 +608,6 @@
     "Describe ": "Tan\u0131mla",
     "Description": "A\u00e7\u0131klama",
     "Description of the certificate": "Sertifikan\u0131n a\u00e7\u0131klamas\u0131",
-    "Details": "Ayr\u0131nt\u0131lar",
     "Device with Camera": "Kameral\u0131 Cihaz",
     "Dimensions": "Boyutlar",
     "Disc": "Disk",
@@ -819,7 +812,6 @@
     "Find next": "Sonrakini bul",
     "Find previous": "\u00d6ncekini bul",
     "Finish": "Bitir",
-    "Finish later": "Sonra tamamla",
     "First time here?": "\u0130lk kez mi buradas\u0131n\u0131z?",
     "Follow": "Takip et",
     "Follow or unfollow posts": "G\u00f6nderileri takip et veya takipten \u00e7\u0131k",
@@ -873,7 +865,6 @@
     "H Align": "H Hizalama",
     "HTML preview of post": "G\u00f6nderinin HTML \u00f6nizlemesi",
     "HTML source code": "HTML kaynak kodu",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Bug\u00fcne dek ABD Ordusu, Yedek Kuvvetler ya da Ulusal Muhaf\u0131zlarda hizmet ettiniz mi?",
     "Header": "\u00dcst bilgi ",
     "Header 1": "\u00dcst bilgi 1",
     "Header 2": "\u00dcst bilgi 2",
@@ -1071,7 +1062,6 @@
     "Loading more threads": "Daha fazla ileti dizisi y\u00fckl\u00fcyor",
     "Loading posts list": "\u0130leti listesi y\u00fckleniyor",
     "Loading your courses": "Dersleriniz y\u00fckleniyor",
-    "Loading...": "Y\u00fckl\u00fcyor...",
     "Location": "Yer",
     "Location in Course": "Dersteki Konum",
     "Lock this asset": "Bu veriyi kitle",
@@ -1131,7 +1121,6 @@
     "Name of the signatory": "\u0130mza sahibinin ad\u0131",
     "Name or short description of the configuration": "Yap\u0131land\u0131rman\u0131n ad\u0131 ya da k\u0131sa a\u00e7\u0131klamas\u0131",
     "Navigate up": "Yukar\u0131 git",
-    "Need help logging in?": "Oturum a\u00e7mak i\u00e7in yard\u0131ma m\u0131 ihtiyac\u0131n\u0131z var?",
     "Need help signing in?": "Giri\u015f yapmak i\u00e7in yard\u0131ma m\u0131 ihtiyac\u0131n\u0131z var?",
     "Need other help signing in?": "Giri\u015f yapmak i\u00e7in farkl\u0131 bir yard\u0131ma m\u0131 ihtiyac\u0131n\u0131z var?",
     "Needs verified certificate ": "Onayl\u0131 sertifika gerekiyor",
@@ -1238,7 +1227,6 @@
     "Organization ": "Kurum",
     "Organization Name": "Kurum Ad\u0131",
     "Organization of the signatory": "\u0130mza sahibinin kurumu",
-    "Organization:": "Kurum:",
     "Other": "Di\u011fer",
     "Other sign-in issues": "Di\u011fer giri\u015f sorunlar\u0131",
     "Overall Score": "Toplam Skor",
@@ -1382,7 +1370,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Sorular cevap gerektiren konular\u0131 ileri s\u00fcrer. Tart\u0131\u015fmalar fikirleri payla\u015f\u0131r ve sohbeti ba\u015flat\u0131r. (Gerekli)",
     "Queued": "Kuyru\u011fa Al\u0131nd\u0131",
     "REMAINING COURSES": "KALAN DERSLER",
-    "Re-run Course": "Dersi Yeniden \u00c7al\u0131\u015ft\u0131r",
     "Read More": "Daha Fazlas\u0131 \u0130\u00e7in",
     "Read more": "Daha fazlas\u0131",
     "Ready To Start": "Ba\u015flamaya Haz\u0131r",
@@ -1458,7 +1445,6 @@
     "Return to Export": "D\u0131\u015fa Aktarmaya Geri D\u00f6n",
     "Return to Your Dashboard": "Panele Geri D\u00f6n",
     "Return to all posts": "T\u00fcm g\u00f6nderilere d\u00f6n",
-    "Return to my dashboard": "Panelime geri d\u00f6n",
     "Return to team listing": "Tak\u0131m listesine geri d\u00f6n",
     "Review Policy Exception": "\u0130nceleme Politikas\u0131 \u0130stisnas\u0131",
     "Review Rules": "Kurallar\u0131 G\u00f6zden Ge\u00e7ir",
@@ -1509,12 +1495,10 @@
     "Select a subject for your support request.": "Destek talebiniz i\u00e7in bir konu se\u00e7in.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "S\u0131nav i\u00e7in ayr\u0131lan s\u00fcreyi se\u00e7in. E\u011fer 24 saatten fazlaysa, s\u00fcreyi yazarak girin. E\u011fitmen Paneli arac\u0131l\u0131\u011f\u0131yla belli \u00f6\u011frencilere s\u0131nav\u0131 tamamlamalar\u0131 i\u00e7in daha fazla s\u00fcre tan\u0131mlayabilirsiniz.",
     "Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
-    "Select employment status": "Meslek durumunu se\u00e7in",
     "Select language": "Dil Se\u00e7imi",
     "Select one or more groups:": "Bir ya da daha fazla grup se\u00e7in:",
     "Select the course-wide discussion topics that you want to divide.": "B\u00f6lmek istedi\u011finiz ders-geneli tart\u0131\u015fma konular\u0131n\u0131 se\u00e7in.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Ders tarihleri g\u00f6sterimi i\u00e7in saat dilimini se\u00e7in. Herhangi bir saat dilimini se\u00e7memeniz durumunda, g\u00f6rev teslimleri d\u00e2hil olmak \u00fczere t\u00fcm ders tarihleri, web taray\u0131c\u0131n\u0131z\u0131n yerel zaman\u0131na g\u00f6re g\u00f6sterilecektir. ",
-    "Selected blocks": "Se\u00e7ili blocklar",
     "Selected tab": "Se\u00e7ili sekme",
     "Self": "Kendin",
     "Send to:": "G\u00f6nderilecek ki\u015fi:",
@@ -2111,17 +2095,11 @@
     "Weight of Total Grade": "Toplam Not A\u011f\u0131rl\u0131\u011f\u0131",
     "We\u2019re sorry to see you go!": "Gitti\u011finizi g\u00f6rmek bizi \u00fcz\u00fcyor!",
     "What You Need for Verification": "Do\u011frulama \u0130\u00e7in Gerekenler",
-    "What can we help you with, {username}?": "Sana nas\u0131l yard\u0131mc\u0131 olabiliriz, {username}?",
     "What does %(platformName)s do with this photo?": "%(platformName)s bu foto\u011fraf ile ne yapar?",
     "What does this mean?": "Ne anlama geliyor?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Ya kamera g\u00f6r\u00fcnt\u00fcs\u00fcn\u00fc g\u00f6remezsem veya hangi taraf\u0131n g\u00f6r\u00fcn\u00fcr oldu\u011funu belirlemeye \u00e7al\u0131\u015f\u0131rken foto\u011fraf\u0131m\u0131 g\u00f6remezsem?",
     "What if I have difficulty holding my ID in position relative to the camera?": "Kimli\u011fimi kameraya g\u00f6re yerinde tutmakta zorluk \u00e7ekersem ne olur? ",
     "What if I have difficulty holding my head in position relative to the camera?": "Ba\u015f\u0131m\u0131 kameraya g\u00f6re pozisyonda tutmakta zorluk \u00e7ekiyorsam ne olur? ",
-    "What industry do you currently work in?": "\u015eu anda hangi sekt\u00f6rde \u00e7al\u0131\u015f\u0131yorsunuz?",
-    "What industry do you want to work in?": "Gelecekte hangi sekt\u00f6rde \u00e7al\u0131\u015fmak istiyorsunuz?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Ebeveyn ya da velilerinizin \u015fimdiye kadar ula\u015ft\u0131\u011f\u0131 en y\u00fcksek e\u011fitim seviyesi nedir?",
-    "What is the highest level of education that you have achieved so far?": "\u015eimdiye kadar ula\u015ft\u0131\u011f\u0131n\u0131z en y\u00fcksek e\u011fitim seviyesi nedir?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "T\u00fcm aile \u00fcyelerinizin son 12 ayl\u0131k toplam geliri, ne kadard\u0131?",
     "What's Your Next Accomplishment?": "Bir Sonraki Ba\u015far\u0131n Ne Olacak?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "\u00d6\u011frenciler bir de\u011ferlendirmeye cevap g\u00f6nderdi\u011finde, de\u011ferlendirmedeki cevaplar\u0131n\u0131n do\u011fru ya da yanl\u0131\u015f olup olmad\u0131\u011f\u0131n\u0131 ve ald\u0131klar\u0131 notu hemen g\u00f6rebilirler.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Y\u00fcz\u00fcn\u00fcz \u00e7er\u00e7eve i\u00e7indeyken, a\u015fa\u011f\u0131daki Foto\u011fraf \u00c7ek {icon} d\u00fc\u011fmesini kullanarak foto\u011fraf\u0131n\u0131z\u0131 \u00e7ekin.",
@@ -2130,7 +2108,6 @@
     "Whole words": "Tam s\u00f6zc\u00fckler",
     "Why activate?": "Neden etkinle\u015ftirme ad\u0131m\u0131?",
     "Why does %(platformName)s need my photo?": "Ni\u00e7in %(platformName)s benim foto\u011fraf\u0131ma gerek duyuyor?",
-    "Why does edX collect this information?": "edX neden bu bilgiyi topluyor?",
     "Width": "Geni\u015flik",
     "Will Be Visible To:": "\u015eu Ki\u015filere G\u00f6r\u00fcnecek:",
     "Words: {0}": "Kelimeler: {0}",
@@ -2327,7 +2304,6 @@
     "endorsed %(time_ago)s by %(user)s": "%(user)s kullan\u0131c\u0131 taraf\u0131ndan %(time_ago)s \u00f6nce desteklenmi\u015f",
     "enter code here": "kodu buraya girin",
     "enter link description here": "ba\u011flant\u0131 a\u00e7\u0131klamas\u0131n\u0131 buraya girin",
-    "finish later": "sonra tamamla",
     "follow this post": "bu iletiyi takip et",
     "for": "i\u00e7in",
     "group configuration": "grup ayar\u0131",
@@ -2341,7 +2317,6 @@
     "minute": "dakika",
     "minutes": "dakika",
     "name": "isim",
-    "next page": "sonraki sayfa",
     "off": "kapal\u0131",
     "on": "a\u00e7\u0131k",
     "one letter Friday\u0004F": "C",
@@ -2370,7 +2345,6 @@
     "strong text": "kal\u0131n metin",
     "subsection": "altb\u00f6l\u00fcm",
     "team count": "tak\u0131m say\u0131s\u0131",
-    "the more quickly and helpfully we can respond!": "o kadar h\u0131zl\u0131 ve yard\u0131mc\u0131 bir \u015fekilde yan\u0131t verebiliriz!",
     "unanswered question": "cevaplanmayan soru",
     "unit": "\u00fcnite",
     "unsubmitted": "g\u00f6nderilmedi",
diff --git a/cms/static/js/i18n/uk/djangojs.js b/cms/static/js/i18n/uk/djangojs.js
index 88de8b4656..6d1bd8c71b 100644
--- a/cms/static/js/i18n/uk/djangojs.js
+++ b/cms/static/js/i18n/uk/djangojs.js
@@ -84,7 +84,6 @@
     "(Add signatories for a certificate)": "(\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u0456\u0434\u043f\u0438\u0441\u0430\u043d\u0442\u0456\u0432 \u0434\u043b\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0456\u043a\u0430\u0442\u0443)",
     "(Caption will be displayed when you start playing the video.)": "(\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u0438\u043c\u0443\u0442\u044c\u0441\u044f, \u043a\u043e\u043b\u0438 \u0412\u0438 \u043f\u043e\u0447\u043d\u0435\u0442\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e.)",
     "(Optional)": "(\u043d\u0435\u043e\u0431\u043e\u0432'\u044f\u0437\u043a\u043e\u0432\u043e)",
-    "(Read-only)": "(\u041b\u0438\u0448\u0435 \u0434\u043b\u044f \u0447\u0438\u0442\u0430\u043d\u043d\u044f)",
     "(Required Field)": "(\u041e\u0431\u043e\u0432'\u044f\u0437\u043a\u043e\u0432\u0435 \u043f\u043e\u043b\u0435)",
     "(Self-paced) Ended {end}": " (\u0421\u0430\u043c\u043e\u0441\u0442\u0456\u0439\u043d\u0456 \u043a\u0443\u0440\u0441\u0438) \u0417\u0430\u043a\u0456\u043d\u0447\u0438\u043b\u0438\u0441\u044f {end}",
     "(Self-paced) Ends {end}": "\u0417\u0430\u043a\u0456\u043d\u0447\u0443\u044e\u0442\u044c\u0441\u044f {end} (\u0421\u0430\u043c\u043e\u0441\u0442\u0456\u0439\u043d\u0456 \u043a\u0443\u0440\u0441\u0438) ",
@@ -340,7 +339,6 @@
     "Course Name": "\u041d\u0430\u0437\u0432\u0430 \u043a\u0443\u0440\u0441\u0443",
     "Course Number": "\u041d\u043e\u043c\u0435\u0440 \u041a\u0443\u0440\u0441\u0443",
     "Course Number Override": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u043e\u043c\u0435\u0440 \u043a\u0443\u0440\u0441\u0443",
-    "Course Number:": "\u041d\u043e\u043c\u0435\u0440 \u041a\u0443\u0440\u0441\u0443:",
     "Course Outline": "\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u043a\u0443\u0440\u0441\u0443",
     "Course Title": "\u041d\u0430\u0437\u0432\u0430 \u043a\u0443\u0440\u0441\u0443",
     "Course Title Override": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430\u0437\u0432\u0443 \u043a\u0443\u0440\u0441\u0443",
@@ -389,7 +387,6 @@
     "Deleting this {xblock_type} is permanent and cannot be undone.": "\u0412\u0438\u0434\u0430\u043b\u0435\u043d\u043d\u044f \u0446\u044c\u043e\u0433\u043e  {xblock_type} \u0454 \u0431\u0435\u0437\u043f\u043e\u0432\u043e\u0440\u043e\u0442\u043d\u0456\u043c \u0456 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 \u0441\u043a\u0430\u0441\u043e\u0432\u0430\u043d\u0435. ",
     "Describe ": "\u041e\u043f\u0438\u0448\u0456\u0442\u044c",
     "Description": "\u041e\u043f\u0438\u0441",
-    "Details": "\u0414\u0435\u0442\u0430\u043b\u0456",
     "Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440\u043d\u0456\u0441\u0442\u044c",
     "Disc": "\u0414\u0438\u0441\u043a",
     "Discard Changes": "\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0437\u043c\u0456\u043d\u0438",
diff --git a/cms/static/js/i18n/vi/djangojs.js b/cms/static/js/i18n/vi/djangojs.js
index 9800b0eeea..986d87a76b 100644
--- a/cms/static/js/i18n/vi/djangojs.js
+++ b/cms/static/js/i18n/vi/djangojs.js
@@ -59,7 +59,6 @@
     "(Add signatories for a certificate)": "(Th\u00eam ng\u01b0\u1eddi k\u00fd cho ch\u1ee9ng ch\u1ec9)",
     "(Caption will be displayed when you start playing the video.)": "(Ph\u1ee5 \u0111\u1ec1 s\u1ebd \u0111\u01b0\u1ee3c hi\u1ec3n th\u1ecb khi b\u1ea1n b\u1eaft \u0111\u1ea7u ph\u00e1t video)",
     "(Optional)": "(Kh\u00f4ng b\u1eaft bu\u1ed9c)",
-    "(Read-only)": "(Ch\u1ec9-\u0111\u1ecdc)",
     "(Required Field)": "(Th\u00f4ng tin b\u1eaft bu\u1ed9c)",
     "(Self-paced) Ended {end}": "(Self-paced) \u0110\u00e3 k\u1ebft th\u00fac {end}",
     "(Self-paced) Ends {end}": "(Self-paced) K\u1ebft th\u00fac {end}",
@@ -360,9 +359,7 @@
     "Course Name": "T\u00ean Kh\u00f3a H\u1ecdc",
     "Course Number": "S\u1ed1 Kh\u00f3a H\u1ecdc",
     "Course Number Override": "Ch\u00e8n l\u00ean s\u1ed1 th\u1ee9 t\u1ef1 kh\u00f3a h\u1ecdc",
-    "Course Number:": "M\u00e3 kh\u00f3a h\u1ecdc:",
     "Course Outline": "Ph\u00e1c Th\u1ea3o Kh\u00f3a H\u1ecdc",
-    "Course Run:": "Ch\u1ea1y kh\u00f3a h\u1ecdc",
     "Course Title": "Kh\u00f3a h\u1ecdc:",
     "Course Title Override": "Ch\u00e8n l\u00ean t\u00ean kh\u00f3a h\u1ecdc",
     "Course Video Settings": "Thi\u1ebft l\u1eadp Video Kh\u00f3a h\u1ecdc",
@@ -419,7 +416,6 @@
     "Deprecated": "\u0110\u00e3 l\u1ed7i th\u1eddi",
     "Description": "M\u00f4 t\u1ea3",
     "Description of the certificate": "M\u00f4 t\u1ea3 ch\u1ee9ng ch\u1ec9",
-    "Details": "Chi ti\u1ebft",
     "Dimensions": "K\u00edch th\u01b0\u1edbc",
     "Disc": "\u0110\u0129a",
     "Discard Changes": "X\u00f3a Thay \u0110\u1ed5i",
@@ -886,7 +882,6 @@
     "Organization ": "T\u1ed5 ch\u1ee9c",
     "Organization Name": "T\u00ean t\u1ed5 ch\u1ee9c",
     "Organization of the signatory": "T\u1ed5 ch\u1ee9c c\u1ee7a ng\u01b0\u1eddi k\u00fd",
-    "Organization:": "T\u1ed5 ch\u1ee9c:",
     "Other": "L\u1ef1a ch\u1ecdn kh\u00e1c",
     "Overall Score": "T\u1ed5ng \u0110i\u1ec3m",
     "Page break": "Ng\u1eaft trang",
@@ -990,7 +985,6 @@
     "Publishing": "Ph\u00e1t h\u00e0nh",
     "Publishing Status": "Tr\u1ea1ng th\u00e1i Xu\u1ea5t b\u1ea3n",
     "Queued": "\u0110\u00e3 x\u1ebfp h\u00e0ng",
-    "Re-run Course": "Ch\u1ea1y l\u1ea1i Kh\u00f3a h\u1ecdc",
     "Read More": "Xem Th\u00eam",
     "Reason field should not be left blank.": "Vui l\u00f2ng \u0111i\u1ec1n v\u00e0o m\u1ee5c L\u00fd do.",
     "Receive updates": "Nh\u1eadn th\u00f4ng b\u00e1o khi c\u00f3 b\u00e0i \u0111\u0103ng m\u1edbi",
@@ -1543,7 +1537,6 @@
     "Weight of Total Grade": "S\u0129 s\u1ed1 c\u1ee7a l\u1edbp",
     "We\u2019re sorry to see you go!": "Ch\u00fang t\u00f4i r\u1ea5t ti\u1ebfc khi th\u1ea5y b\u1ea1n ra \u0111i!",
     "What You Need for Verification": "Nh\u1eefng g\u00ec b\u1ea1n c\u1ea7n \u0111\u1ec3 x\u00e1c minh",
-    "What can we help you with, {username}?": "Ch\u00fang t\u00f4i c\u00f3 th\u1ec3 gi\u00fap g\u00ec cho b\u1ea1n, {username}?",
     "What does this mean?": "\u0110i\u1ec1u n\u00e0y c\u00f3 ngh\u0129a l\u00e0 g\u00ec?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Khi h\u1ecdc vi\u00ean g\u1eedi c\u00e2u tr\u1ea3 l\u1eddi cho m\u1ed9t b\u00e0i \u0111\u00e1nh gi\u00e1, h\u1ecd s\u1ebd ngay l\u1eadp t\u1ee9c \u0111\u01b0\u1ee3c xem c\u00e2u tr\u1ea3 l\u1eddi l\u00e0 ch\u00ednh x\u00e1c hay kh\u00f4ng, v\u00e0 \u0111i\u1ec3m s\u1ed1 nh\u1eadn \u0111\u01b0\u1ee3c.",
     "Which timed transcript would you like to use?": "B\u1ea1n mu\u1ed1n s\u1eed d\u1ee5ng b\u1ea3n d\u1ecbch n\u00e0o?",
diff --git a/cms/static/js/i18n/zh-cn/djangojs.js b/cms/static/js/i18n/zh-cn/djangojs.js
index 93efdd50ee..051cee1b7c 100644
--- a/cms/static/js/i18n/zh-cn/djangojs.js
+++ b/cms/static/js/i18n/zh-cn/djangojs.js
@@ -95,7 +95,6 @@
     "(Add signatories for a certificate)": "(\u6dfb\u52a0\u8bc1\u4e66\u4e2d\u7684\u7b7e\u7f72\u65b9)",
     "(Caption will be displayed when you start playing the video.)": "(\u5f00\u59cb\u64ad\u653e\u89c6\u9891\u65f6\u5c06\u663e\u793a\u5b57\u5e55)",
     "(Optional)": "(\u975e\u5fc5\u586b)",
-    "(Read-only)": "\uff08\u53ea\u8bfb\uff09",
     "(Required Field)": "(\u5fc5\u586b\u5b57\u6bb5)",
     "(Self-paced) Ended {end}": "(\u81ea\u4e3b\u6a21\u5f0f) \u7ed3\u675f {end}",
     "(Self-paced) Ends {end}": "(\u81ea\u4e3b\u6a21\u5f0f) \u7ed3\u675f {end}",
@@ -308,7 +307,6 @@
     "Bottom": "\u5e95\u7aef",
     "Browse": "\u6d4f\u89c8",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "\u6d4f\u89c8\u6700\u65b0\u4e0a\u7ebf\u7684\u8bfe\u7a0b\u5e76\u67e5\u770b\u60a8\u6700\u559c\u7231\u79d1\u76ee\u7684\u66f4\u65b0\u60c5\u51b5",
-    "Browsing": "\u6d4f\u89c8",
     "Bulk Exceptions": "\u6279\u91cf\u7279\u6b8a\u5904\u7406",
     "Bullet list": "\u9879\u76ee\u7b26\u53f7\u5217\u8868",
     "Bulleted List (Ctrl+U)": "\u7b26\u53f7\u5217\u8868(Ctrl+U)",
@@ -464,9 +462,7 @@
     "Course Name": "\u8bfe\u7a0b\u540d\u79f0",
     "Course Number": "\u8bfe\u7a0b\u4ee3\u7801",
     "Course Number Override": "\u91cd\u5199\u8bfe\u7a0b\u7f16\u53f7",
-    "Course Number:": "\u8bfe\u7a0b\u7f16\u53f7\uff1a",
     "Course Outline": "\u8bfe\u7a0b\u5927\u7eb2",
-    "Course Run:": "\u8bfe\u7a0b\u957f\u5ea6\uff1a",
     "Course Start": "\u8bfe\u7a0b\u5f00\u59cb",
     "Course Title": "\u8bfe\u7a0b\u6807\u9898",
     "Course Title Override": "\u91cd\u5199\u8bfe\u7a0b\u6807\u9898",
@@ -537,7 +533,6 @@
     "Describe ": "\u63cf\u8ff0",
     "Description": "\u63cf\u8ff0",
     "Description of the certificate": "\u8ba4\u8bc1\u63cf\u8ff0",
-    "Details": "\u7ec6\u8282",
     "Dimensions": "\u5c3a\u5bf8",
     "Disc": "\u5b9e\u5fc3\u5706",
     "Discard Changes": "\u653e\u5f03\u66f4\u6539",
@@ -1089,7 +1084,6 @@
     "Organization ": "\u673a\u6784",
     "Organization Name": "\u673a\u6784\u540d\u79f0",
     "Organization of the signatory": "\u7ec4\u7ec7\u673a\u6784\u7b7e\u7ae0",
-    "Organization:": "\u673a\u6784\uff1a",
     "Other": "\u5176\u4ed6",
     "Overall Score": "\u603b\u6210\u7ee9",
     "PDF Chapters": "PDF\u5404\u7ae0\u8282",
@@ -1219,7 +1213,6 @@
     "Publishing Status": "\u53d1\u5e03\u72b6\u6001",
     "Queued": "\u5df2\u6392\u961f",
     "REMAINING COURSES": "\u5269\u4f59\u8bfe\u7a0b",
-    "Re-run Course": "\u91cd\u542f\u8bfe\u7a0b",
     "Read More": "\u4e86\u89e3\u66f4\u591a",
     "Read more": "\u4e86\u89e3\u66f4\u591a",
     "Ready To Start": "\u51c6\u5907\u5f00\u59cb",
@@ -1850,7 +1843,7 @@
     "View Archived Course": "\u67e5\u770b\u5b58\u6863\u7684\u8bfe\u7a0b",
     "View Cohort": "\u67e5\u770b\u7fa4\u7ec4",
     "View Course": "\u67e5\u770b\u8bfe\u7a0b",
-    "View Live": "\u67e5\u770b\u7ebf\u4e0a\u7248\u672c",
+    "View Live": "\u67e5\u770b\u5728\u7ebf\u7248",
     "View Program Record": "\u67e5\u770b\u8bfe\u7a0b\u8bb0\u5f55",
     "View all errors": "\u67e5\u770b\u6240\u6709\u9519\u8bef",
     "View child items": "\u67e5\u770b\u5b50\u7c7b\u76ee",
@@ -1884,7 +1877,6 @@
     "Weight of Total Grade": "\u5728\u603b\u8bc4\u5206\u4e2d\u7684\u6743\u91cd",
     "We\u2019re sorry to see you go!": "\u5f88\u9057\u61be\u770b\u5230\u60a8\u8981\u79bb\u5f00\uff01",
     "What You Need for Verification": "\u8ba4\u8bc1\u6240\u9700",
-    "What can we help you with, {username}?": "\u4eb2\u7231\u7684{username}\uff0c\u6709\u4ec0\u4e48\u53ef\u4ee5\u5e2e\u52a9\u60a8\uff1f",
     "What does %(platformName)s do with this photo?": "%(platformName)s\u7528\u8fd9\u5f20\u7167\u7247\u505a\u4ec0\u4e48\uff1f",
     "What does this mean?": "\u8fd9\u662f\u4ec0\u4e48\u610f\u601d\uff1f",
     "What's Your Next Accomplishment?": "\u60a8\u7684\u4e0b\u4e00\u4e2a\u76ee\u6807\u662f\u4ec0\u4e48\uff1f",
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index 286111e7f0..347f7ea77b 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -187,15 +187,15 @@ define(['jquery', 'underscore', 'backbone', 'gettext', 'js/views/pages/base_page
                 event.preventDefault();
 
                 if(!options || options.view !== 'visibility_view' ){
-                    var useNewTextEditor = this.$('.edit-button').attr("use-new-editor-text"),
-                        useNewVideoEditor = this.$('.edit-button').attr("use-new-editor-video"),
-                        useNewProblemEditor = this.$('.edit-button').attr("use-new-editor-problem"),
-                        blockType = xblockElement.find('.xblock').attr("data-block-type");
+                    var useNewTextEditor = this.$('.xblock-header-primary').attr("use-new-editor-text"),
+                    useNewVideoEditor = this.$('.xblock-header-primary').attr("use-new-editor-video"),
+                    useNewProblemEditor = this.$('.xblock-header-primary').attr("use-new-editor-problem"),
+                    blockType = xblockElement.find('.xblock').attr("data-block-type");
                     if( (useNewTextEditor === "True" && blockType === "html") ||
                         (useNewVideoEditor === "True" && blockType === "video") ||
                         (useNewProblemEditor === "True" && blockType === "problem")
                     ) {
-                        var destinationUrl = this.$('.edit-button').attr("authoring_MFE_base_url") + '/' + blockType + '/' + encodeURI(xblockElement.find('.xblock').attr("data-usage-id"));
+                        var destinationUrl = this.$('.xblock-header-primary').attr("authoring_MFE_base_url") + '/' + blockType + '/' + encodeURI(xblockElement.find('.xblock').attr("data-usage-id"));
                         window.location.href = destinationUrl;
                         return;
                     }
@@ -322,6 +322,23 @@ define(['jquery', 'underscore', 'backbone', 'gettext', 'js/views/pages/base_page
             },
 
             onNewXBlock: function(xblockElement, scrollOffset, is_duplicate, data) {
+                var useNewTextEditor = this.$('.xblock-header-primary').attr("use-new-editor-text"),
+                useNewVideoEditor = this.$('.xblock-header-primary').attr("use-new-editor-video"),
+                useNewProblemEditor = this.$('.xblock-header-primary').attr("use-new-editor-problem");
+
+                //find the block type in the locator if availible
+                if(data.hasOwnProperty('locator')){
+                    var matchBlockTypeFromLocator = /\@(.*?)\+/;
+                    var blockType = data.locator.match(matchBlockTypeFromLocator);
+                }
+                if((useNewTextEditor === "True" && blockType.includes("html")) ||
+                    (useNewVideoEditor === "True" && blockType.includes("video"))||
+                    (useNewProblemEditor === "True" && blockType.includes("problem"))
+                    ){
+                        var destinationUrl = this.$('.xblock-header-primary').attr("authoring_MFE_base_url") + '/' + blockType[1] + '/' + encodeURI(data.locator);
+                        window.location.href = destinationUrl;
+                        return;
+                }
                 ViewUtils.setScrollOffset(xblockElement, scrollOffset);
                 xblockElement.data('locator', data.locator);
                 return this.refreshXBlock(xblockElement, true, is_duplicate);
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 5f3b5bf875..1bd2c3070e 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -59,7 +59,12 @@ block_is_unit = is_unit(xblock)
     % if not show_preview:
         is-collapsed
     % endif
-    ">
+    "
+    use-new-editor-text = ${use_new_editor_text}
+    use-new-editor-video = ${use_new_editor_video}
+    use-new-editor-problem = ${use_new_editor_problem}
+    authoring_MFE_base_url = ${get_editor_page_base_url(xblock.location.course_key)}
+    >
         <div class="header-details">
             % if show_inline:
             <a href="#" data-tooltip="${_('Expand or Collapse')}" class="action expand-collapse collapse">
@@ -80,12 +85,7 @@ block_is_unit = is_unit(xblock)
                     % if can_edit:
                         % if not show_inline:
                             <li class="action-item action-edit">
-                                <button class="btn-default edit-button action-button"
-                                    use-new-editor-text = ${use_new_editor_text}
-                                    use-new-editor-video = ${use_new_editor_video}
-                                    use-new-editor-problem = ${use_new_editor_problem}
-                                    authoring_MFE_base_url = ${get_editor_page_base_url(xblock.location.course_key)}
-                                >
+                                <button class="btn-default edit-button action-button">
                                     <span class="icon fa fa-pencil" aria-hidden="true"></span>
                                     <span class="action-button-text">${_("Edit")}</span>
                                 </button>
diff --git a/common/djangoapps/student/signals/__init__.py b/common/djangoapps/student/signals/__init__.py
index 0ae2390011..9d134198f0 100644
--- a/common/djangoapps/student/signals/__init__.py
+++ b/common/djangoapps/student/signals/__init__.py
@@ -4,5 +4,6 @@ from common.djangoapps.student.signals.signals import (
     ENROLL_STATUS_CHANGE,
     ENROLLMENT_TRACK_UPDATED,
     REFUND_ORDER,
-    UNENROLL_DONE
+    UNENROLL_DONE,
+    USER_EMAIL_CHANGED
 )
diff --git a/common/djangoapps/student/signals/receivers.py b/common/djangoapps/student/signals/receivers.py
index c05813dc2d..6d0cf4f061 100644
--- a/common/djangoapps/student/signals/receivers.py
+++ b/common/djangoapps/student/signals/receivers.py
@@ -3,7 +3,8 @@ Signal receivers for the "student" application.
 """
 
 # pylint: disable=unused-argument
-
+import logging
+from asyncio.log import logger
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db import IntegrityError
@@ -11,6 +12,7 @@ from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
 
 from lms.djangoapps.courseware.toggles import courseware_mfe_progress_milestones_are_active
+from lms.djangoapps.utils import get_braze_client
 from common.djangoapps.student.helpers import EMAIL_EXISTS_MSG_FMT, USERNAME_EXISTS_MSG_FMT, AccountValidationError
 from common.djangoapps.student.models import (
     CourseEnrollment,
@@ -20,8 +22,11 @@ from common.djangoapps.student.models import (
     is_username_retired
 )
 from common.djangoapps.student.models_api import confirm_name_change
+from common.djangoapps.student.signals import USER_EMAIL_CHANGED
 from openedx.features.name_affirmation_api.utils import is_name_affirmation_installed
 
+logger = logging.getLogger(__name__)
+
 
 @receiver(pre_save, sender=get_user_model())
 def on_user_updated(sender, instance, **kwargs):
@@ -97,3 +102,18 @@ if is_name_affirmation_installed():
     # pylint: disable=import-error
     from edx_name_affirmation.signals import VERIFIED_NAME_APPROVED
     VERIFIED_NAME_APPROVED.connect(listen_for_verified_name_approved)
+
+
+@receiver(USER_EMAIL_CHANGED)
+def _listen_for_user_email_changed(sender, user, **kwargs):
+    """ If user has changed their email, update that in email Braze. """
+    email = user.email
+    user_id = user.id
+    attributes = [{'email': email, 'external_id': user_id}]
+
+    try:
+        braze_client = get_braze_client()
+        if braze_client:
+            braze_client.track_user(attributes=attributes)
+    except Exception as exc:   # pylint: disable=broad-except
+        logger.exception(f'Unable to sync new email [{email}] with Braze for user [{user_id}]')
diff --git a/common/djangoapps/student/signals/signals.py b/common/djangoapps/student/signals/signals.py
index 0682bb5ea9..49745ca48c 100644
--- a/common/djangoapps/student/signals/signals.py
+++ b/common/djangoapps/student/signals/signals.py
@@ -19,3 +19,5 @@ ENROLL_STATUS_CHANGE = Signal()
 
 # providing_args=["course_enrollment"]
 REFUND_ORDER = Signal()
+
+USER_EMAIL_CHANGED = Signal()
diff --git a/common/djangoapps/student/tests/test_certificates.py b/common/djangoapps/student/tests/test_certificates.py
index a9f6335661..f935653e34 100644
--- a/common/djangoapps/student/tests/test_certificates.py
+++ b/common/djangoapps/student/tests/test_certificates.py
@@ -15,7 +15,6 @@ from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODUL
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.data import CertificatesDisplayBehaviors
 
-from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.certificates.api import get_certificate_url
 from lms.djangoapps.certificates.data import CertificateStatuses
@@ -36,7 +35,6 @@ class CertificateDisplayTestBase(SharedModuleStoreTestCase):
     MODULESTORE = TEST_DATA_MONGO_AMNESTY_MODULESTORE
     USERNAME = "test_user"
     PASSWORD = "password"
-    DOWNLOAD_URL = "http://www.example.com/certificate.pdf"
 
     @classmethod
     def setUpClass(cls):
@@ -63,7 +61,7 @@ class CertificateDisplayTestBase(SharedModuleStoreTestCase):
         else:
             self.assertNotContains(response, 'Add Certificate to LinkedIn Profile')
 
-    def _create_certificate(self, enrollment_mode, download_url=DOWNLOAD_URL):
+    def _create_certificate(self, enrollment_mode):
         """Simulate that the user has a generated certificate. """
         CourseEnrollmentFactory.create(
             user=self.user,
@@ -73,38 +71,10 @@ class CertificateDisplayTestBase(SharedModuleStoreTestCase):
             user=self.user,
             course_id=self.course.id,
             mode=enrollment_mode,
-            download_url=download_url,
             status=CertificateStatuses.downloadable,
             grade=0.98,
         )
 
-    def _check_can_download_certificate(self):
-        """
-        Inspect the dashboard to see if a certificate can be downloaded.
-        """
-        response = self.client.get(reverse('dashboard'))
-        self.assertContains(response, 'Download my')
-        self.assertContains(response, self.DOWNLOAD_URL)
-
-    def _check_can_download_certificate_no_id(self):
-        """
-        Inspects the dashboard to see if a certificate for a non verified course enrollment
-        is present
-        """
-        response = self.client.get(reverse('dashboard'))
-        self.assertContains(response, 'Download')
-        self.assertContains(response, self.DOWNLOAD_URL)
-
-    def _check_can_not_download_certificate(self):
-        """
-        Make sure response does not have any of the download certificate buttons
-        """
-        response = self.client.get(reverse('dashboard'))
-        self.assertNotContains(response, 'View Test_Certificate')
-        self.assertNotContains(response, 'Download my Test_Certificate')
-        self.assertNotContains(response, 'Download my Test_Certificate')
-        self.assertNotContains(response, self.DOWNLOAD_URL)
-
 
 @ddt.ddt
 @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
@@ -131,7 +101,6 @@ class CertificateDashboardMessageDisplayTest(CertificateDisplayTestBase):
         if is_past:
             self.assertNotContains(response, test_message)
             self.assertNotContains(response, "View Test_Certificate")
-            self._check_can_download_certificate()
 
         else:
             self.assertContains(response, test_message)
@@ -175,27 +144,6 @@ class CertificateDisplayTest(CertificateDisplayTestBase):
     Tests of certificate display.
     """
 
-    @ddt.data('verified', 'professional')
-    @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False})
-    def test_display_verified_certificate(self, enrollment_mode):
-        self._create_certificate(enrollment_mode)
-        self._check_can_download_certificate()
-
-    @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False})
-    def test_no_certificate_status_no_problem(self):
-        with patch('common.djangoapps.student.views.dashboard.cert_info', return_value={}):
-            self._create_certificate('honor')
-            self._check_can_not_download_certificate()
-
-    @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False})
-    def test_display_verified_certificate_no_id(self):
-        """
-        Confirm that if we get a certificate with a no-id-professional mode
-        we still can download our certificate
-        """
-        self._create_certificate(CourseMode.NO_ID_PROFESSIONAL_MODE)
-        self._check_can_download_certificate_no_id()
-
     @ddt.data('verified', 'honor', 'professional')
     def test_unverified_certificate_message(self, enrollment_mode):
         cert = self._create_certificate(enrollment_mode)
@@ -225,34 +173,6 @@ class CertificateDisplayTest(CertificateDisplayTestBase):
         self._check_linkedin_visibility(True)
 
 
-@ddt.ddt
-@unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
-class CertificateDisplayTestHtmlView(CertificateDisplayTestBase):
-    """
-    Tests of webview certificate display
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.course.cert_html_view_enabled = True
-        cls.course.save()
-        cls.store.update_item(cls.course, cls.USERNAME)
-
-    @ddt.data('verified', 'honor')
-    @override_settings(CERT_NAME_SHORT='Test_Certificate')
-    @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': True})
-    def test_display_download_certificate_button(self, enrollment_mode):
-        """
-        Tests if CERTIFICATES_HTML_VIEW is True
-        and course has enabled web certificates via cert_html_view_enabled setting
-        and no active certificate configuration available
-        then any of the web view certificate Download button should not be visible.
-        """
-        self._create_certificate(enrollment_mode, download_url='')
-        self._check_can_not_download_certificate()
-
-
 @ddt.ddt
 @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
 class CertificateDisplayTestLinkedHtmlView(CertificateDisplayTestBase):
diff --git a/common/djangoapps/student/tests/test_email.py b/common/djangoapps/student/tests/test_email.py
index 940d54e77a..22f1197576 100644
--- a/common/djangoapps/student/tests/test_email.py
+++ b/common/djangoapps/student/tests/test_email.py
@@ -562,6 +562,7 @@ class EmailChangeConfirmationTests(EmailTestMixin, EmailTemplateTagMixin, CacheI
 
     @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', "Test only valid in LMS")
     @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'CONTACT': '/help/contact-us'})
+    @patch('common.djangoapps.student.signals.signals.USER_EMAIL_CHANGED.send')
     @ddt.data(
         ('plain_text', False),
         ('plain_text', True),
@@ -569,9 +570,10 @@ class EmailChangeConfirmationTests(EmailTestMixin, EmailTemplateTagMixin, CacheI
         ('html', True)
     )
     @ddt.unpack
-    def test_successful_email_change(self, test_body_type, test_marketing_enabled):
+    def test_successful_email_change(self, test_body_type, test_marketing_enabled, mock_email_change_signal):
         with patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': test_marketing_enabled}):
             self.assertChangeEmailSent(test_body_type)
+            assert mock_email_change_signal.called
 
         meta = json.loads(UserProfile.objects.get(user=self.user).meta)
         assert 'old_emails' in meta
diff --git a/common/djangoapps/student/tests/test_receivers.py b/common/djangoapps/student/tests/test_receivers.py
index 39e654adeb..fb8d285fdb 100644
--- a/common/djangoapps/student/tests/test_receivers.py
+++ b/common/djangoapps/student/tests/test_receivers.py
@@ -1,18 +1,15 @@
 """ Tests for student signal receivers. """
 
 from unittest import skipUnless
+from unittest.mock import patch
+
+from django.conf import settings
 from edx_toggles.toggles.testutils import override_waffle_flag
+
+from common.djangoapps.student.models import CourseEnrollmentCelebration, PendingNameChange, UserProfile
+from common.djangoapps.student.signals.signals import USER_EMAIL_CHANGED
+from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory, UserProfileFactory
 from lms.djangoapps.courseware.toggles import COURSEWARE_MICROFRONTEND_PROGRESS_MILESTONES
-from common.djangoapps.student.models import (
-    CourseEnrollmentCelebration,
-    PendingNameChange,
-    UserProfile
-)
-from common.djangoapps.student.tests.factories import (
-    CourseEnrollmentFactory,
-    UserFactory,
-    UserProfileFactory
-)
 from openedx.features.name_affirmation_api.utils import is_name_affirmation_installed
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
 
@@ -73,3 +70,15 @@ class ReceiversTest(SharedModuleStoreTestCase):
         assert PendingNameChange.objects.count() == 0
         profile = UserProfile.objects.get(user=user)
         assert profile.name == new_name
+
+    @skipUnless(settings.ROOT_URLCONF == 'lms.urls', "Test only valid in LMS")
+    @patch('common.djangoapps.student.signals.receivers.get_braze_client')
+    def test_listen_for_user_email_changed(self, mock_get_braze_client):
+        """
+        Ensure that USER_EMAIL_CHANGED signal triggers correct calls to get_braze_client.
+        """
+        user = UserFactory(email='email@test.com', username='jdoe')
+
+        USER_EMAIL_CHANGED.send(sender=None, user=user)
+
+        assert mock_get_braze_client.called
diff --git a/common/djangoapps/student/views/management.py b/common/djangoapps/student/views/management.py
index 1d918ac57a..5ec791ba27 100644
--- a/common/djangoapps/student/views/management.py
+++ b/common/djangoapps/student/views/management.py
@@ -79,6 +79,7 @@ from common.djangoapps.student.models import (  # lint-amnesty, pylint: disable=
 from common.djangoapps.student.signals import REFUND_ORDER
 from common.djangoapps.util.db import outer_atomic
 from common.djangoapps.util.json_request import JsonResponse
+from common.djangoapps.student.signals import USER_EMAIL_CHANGED
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 log = logging.getLogger("edx.student")
@@ -902,6 +903,8 @@ def confirm_email_change(request, key):
             return response
 
         response = render_to_response("email_change_successful.html", address_context)
+
+        USER_EMAIL_CHANGED.send(sender=None, user=user)
         return response
 
 
diff --git a/common/djangoapps/third_party_auth/admin.py b/common/djangoapps/third_party_auth/admin.py
index 35f43ad129..6b0ca785fd 100644
--- a/common/djangoapps/third_party_auth/admin.py
+++ b/common/djangoapps/third_party_auth/admin.py
@@ -108,8 +108,12 @@ class SAMLProviderConfigAdmin(KeyedConfigurationModelAdmin):
         """ Do we have cached metadata for this SAML provider? """
         if not inst.is_active:
             return None  # N/A
-        data = SAMLProviderData.current(inst.entity_id)
-        return bool(data and data.is_valid())
+        records = SAMLProviderData.objects.filter(entity_id=inst.entity_id)
+        for record in records:
+            if record.is_valid():
+                return True
+        return False
+
     has_data.short_description = 'Metadata Ready'
     has_data.boolean = True
 
diff --git a/common/djangoapps/third_party_auth/models.py b/common/djangoapps/third_party_auth/models.py
index f0a37616a3..4d1c1f84a9 100644
--- a/common/djangoapps/third_party_auth/models.py
+++ b/common/djangoapps/third_party_auth/models.py
@@ -784,16 +784,23 @@ class SAMLProviderConfig(ProviderConfig):
             conf['attr_defaults'][field] = default
 
         # Now get the data fetched automatically from the metadata.xml:
-        data = SAMLProviderData.current(self.entity_id)
-        if not data or not data.is_valid():
+        data_records = SAMLProviderData.objects.filter(entity_id=self.entity_id)
+        public_keys = []
+        for record in data_records:
+            if record.is_valid():
+                public_keys.append(record.public_key)
+                sso_url = record.sso_url
+        if not public_keys:
             log.error(
                 'No SAMLProviderData found for provider "%s" with entity id "%s" and IdP slug "%s". '
                 'Run "manage.py saml pull" to fix or debug.',
                 self.name, self.entity_id, self.slug
             )
             raise AuthNotConfigured(provider_name=self.name)
-        conf['x509cert'] = data.public_key
-        conf['url'] = data.sso_url
+
+        conf['x509certMulti'] = {'signing': public_keys}
+        conf['x509cert'] = ''
+        conf['url'] = sso_url
 
         # Add SAMLConfiguration appropriate for this IdP
         conf['saml_sp_configuration'] = (
diff --git a/common/djangoapps/third_party_auth/samlproviderdata/tests/test_samlproviderdata.py b/common/djangoapps/third_party_auth/samlproviderdata/tests/test_samlproviderdata.py
index 8854d320ae..5dbf7a803e 100644
--- a/common/djangoapps/third_party_auth/samlproviderdata/tests/test_samlproviderdata.py
+++ b/common/djangoapps/third_party_auth/samlproviderdata/tests/test_samlproviderdata.py
@@ -203,7 +203,7 @@ class SAMLProviderDataTests(APITestCase):
         POST auth/saml/v0/provider_data/sync_provider_data -d data
         """
         mock_fetch.return_value = '<?xml><a>tag</a>'
-        public_key = 'askdjf;sakdjfs;adkfjas;dkfjas;dkfjas;dlkfj'
+        public_key = ['askdjf;sakdjfs;adkfjas;dkfjas;dkfjas;dlkfj']
         sso_url = 'https://fake-test.id'
         expires_at = datetime.now()
         mock_parse.return_value = (public_key, sso_url, expires_at)
@@ -219,11 +219,11 @@ class SAMLProviderDataTests(APITestCase):
         response = self.client.post(url, data)
 
         assert response.status_code == status.HTTP_201_CREATED
-        assert response.data == " Created new record for SAMLProviderData for entityID http://entity-id-1"
+        assert response.data == " Created new record(s) for SAMLProviderData for entityID http://entity-id-1"
         assert SAMLProviderData.objects.count() == orig_count + 1
 
         # should only update this time
         response = self.client.post(url, data)
         assert response.status_code == status.HTTP_200_OK
-        assert response.data == (" Updated existing SAMLProviderData for entityID http://entity-id-1")
+        assert response.data == (" Updated existing SAMLProviderData record(s) for entityID http://entity-id-1")
         assert SAMLProviderData.objects.count() == orig_count + 1
diff --git a/common/djangoapps/third_party_auth/samlproviderdata/views.py b/common/djangoapps/third_party_auth/samlproviderdata/views.py
index 09ad65dfa8..f61b237c12 100644
--- a/common/djangoapps/third_party_auth/samlproviderdata/views.py
+++ b/common/djangoapps/third_party_auth/samlproviderdata/views.py
@@ -18,7 +18,7 @@ from rest_framework.response import Response
 
 from common.djangoapps.third_party_auth.utils import (
     convert_saml_slug_provider_id,
-    create_or_update_saml_provider_data,
+    create_or_update_bulk_saml_provider_data,
     fetch_metadata_xml,
     parse_metadata_xml,
     validate_uuid4_string
@@ -110,12 +110,12 @@ class SAMLProviderDataViewSet(PermissionRequiredMixin, SAMLProviderDataMixin, vi
         entity_id = request.POST.get('entity_id')
         metadata_url = request.POST.get('metadata_url')
         sso_url = request.POST.get('sso_url')
-        public_key = request.POST.get('public_key')
+        public_keys = request.POST.get('public_key')
         if not entity_id:
             return Response('entity_id is required', status.HTTP_400_BAD_REQUEST)
-        if not metadata_url and not (sso_url and public_key):
+        if not metadata_url and not (sso_url and public_keys):
             return Response('either metadata_url or sso and public key are required', status.HTTP_400_BAD_REQUEST)
-        if metadata_url and (sso_url or public_key):
+        if metadata_url and (sso_url or public_keys):
             return Response(
                 'either metadata_url or sso and public key can be provided, not both', status.HTTP_400_BAD_REQUEST
             )
@@ -131,18 +131,18 @@ class SAMLProviderDataViewSet(PermissionRequiredMixin, SAMLProviderDataMixin, vi
 
             # part 2: create/update samlproviderdata
             log.info("Processing IdP with entityID %s", entity_id)
-            public_key, sso_url, expires_at = parse_metadata_xml(xml, entity_id)
+            public_keys, sso_url, expires_at = parse_metadata_xml(xml, entity_id)
         else:
             now = datetime.now()
             expires_at = now.replace(year=now.year + 10)
-        changed = create_or_update_saml_provider_data(entity_id, public_key, sso_url, expires_at)
+        changed = create_or_update_bulk_saml_provider_data(entity_id, public_keys, sso_url, expires_at)
         if changed:
-            str_message = f" Created new record for SAMLProviderData for entityID {entity_id}"
+            str_message = f" Created new record(s) for SAMLProviderData for entityID {entity_id}"
             log.info(str_message)
             response = str_message
             http_status = status.HTTP_201_CREATED
         else:
-            str_message = f" Updated existing SAMLProviderData for entityID {entity_id}"
+            str_message = f" Updated existing SAMLProviderData record(s) for entityID {entity_id}"
             log.info(str_message)
             response = str_message
             http_status = status.HTTP_200_OK
diff --git a/common/djangoapps/third_party_auth/tasks.py b/common/djangoapps/third_party_auth/tasks.py
index 88b118a689..d702932f4d 100644
--- a/common/djangoapps/third_party_auth/tasks.py
+++ b/common/djangoapps/third_party_auth/tasks.py
@@ -14,7 +14,7 @@ from requests import exceptions
 from common.djangoapps.third_party_auth.models import SAMLConfiguration, SAMLProviderConfig
 from common.djangoapps.third_party_auth.utils import (
     MetadataParseError,
-    create_or_update_saml_provider_data,
+    create_or_update_bulk_saml_provider_data,
     parse_metadata_xml,
 )
 
@@ -87,8 +87,8 @@ def fetch_saml_metadata():
 
             for entity_id in entity_ids:
                 log.info("Processing IdP with entityID %s", entity_id)
-                public_key, sso_url, expires_at = parse_metadata_xml(xml, entity_id)
-                changed = create_or_update_saml_provider_data(entity_id, public_key, sso_url, expires_at)
+                public_keys, sso_url, expires_at = parse_metadata_xml(xml, entity_id)
+                changed = create_or_update_bulk_saml_provider_data(entity_id, public_keys, sso_url, expires_at)
                 if changed:
                     log.info(f"→ Created new record for SAMLProviderData for entityID {entity_id}")
                     num_updated += 1
diff --git a/common/djangoapps/third_party_auth/tests/test_utils.py b/common/djangoapps/third_party_auth/tests/test_utils.py
index 2d971e69d0..5d35d92b46 100644
--- a/common/djangoapps/third_party_auth/tests/test_utils.py
+++ b/common/djangoapps/third_party_auth/tests/test_utils.py
@@ -157,8 +157,44 @@ class TestUtils(TestCase):
             </md:EntityDescriptor>
         '''
         xml = etree.fromstring(xml_text, parser)
-        public_key, sso_url, _ = parse_metadata_xml(xml, entity_id)
-        assert public_key == 'abc+hkIuUktxkg='
+        public_keys, sso_url, _ = parse_metadata_xml(xml, entity_id)
+        assert public_keys == ['abc+hkIuUktxkg=']
+        assert sso_url == 'https://idp/SSOService.php'
+
+    def test_parse_metadata_uses_multiple_signing_cert(self):
+        entity_id = 'http://testid'
+        parser = etree.XMLParser(remove_comments=True)
+        xml_text = '''<?xml version="1.0"?>
+            <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://testid">
+                <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+                    <md:KeyDescriptor use="signing">
+                        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                            <ds:X509Data>
+                            <ds:X509Certificate>abc+hkIuUktxkg=</ds:X509Certificate>
+                            </ds:X509Data>
+                        </ds:KeyInfo>
+                    </md:KeyDescriptor>
+                    <md:KeyDescriptor use="signing">
+                        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                            <ds:X509Data>
+                            <ds:X509Certificate>xyz+ayylmao=</ds:X509Certificate>
+                            </ds:X509Data>
+                        </ds:KeyInfo>
+                    </md:KeyDescriptor>
+                    <md:KeyDescriptor use="encryption">
+                        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                            <ds:X509Data>
+                            <ds:X509Certificate>blachabc+hkIuUktxkg=blaal;skdjf;ksd</ds:X509Certificate>
+                            </ds:X509Data>
+                        </ds:KeyInfo>
+                    </md:KeyDescriptor>
+                    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp/SSOService.php"/>
+                </md:IDPSSODescriptor>
+            </md:EntityDescriptor>
+        '''
+        xml = etree.fromstring(xml_text, parser)
+        public_keys, sso_url, _ = parse_metadata_xml(xml, entity_id)
+        assert public_keys == ['abc+hkIuUktxkg=', 'xyz+ayylmao=']
         assert sso_url == 'https://idp/SSOService.php'
 
     def test_parse_metadata_with_use_attribute_missing(self):
@@ -179,6 +215,6 @@ class TestUtils(TestCase):
             </md:EntityDescriptor>
         '''
         xml = etree.fromstring(xml_text, parser)
-        public_key, sso_url, _ = parse_metadata_xml(xml, entity_id)
-        assert public_key == 'abc+hkIuUktxkg='
+        public_keys, sso_url, _ = parse_metadata_xml(xml, entity_id)
+        assert public_keys == ['abc+hkIuUktxkg=']
         assert sso_url == 'https://idp/SSOService.php'
diff --git a/common/djangoapps/third_party_auth/utils.py b/common/djangoapps/third_party_auth/utils.py
index 8517af0328..0cb6981030 100644
--- a/common/djangoapps/third_party_auth/utils.py
+++ b/common/djangoapps/third_party_auth/utils.py
@@ -101,18 +101,24 @@ def parse_metadata_xml(xml, entity_id):
 
     # Now we just need to get the public_key and sso_url
     # We want the use='signing' cert, not the 'encryption' one
-    public_key = sso_desc.findtext("./{}[@use='signing']//{}".format(
+    # There may be multiple signing certs returned by the server so create one record per signing cert found.
+    certs = sso_desc.findall("./{}[@use='signing']//{}".format(
         etree.QName(SAML_XML_NS, "KeyDescriptor"), "{http://www.w3.org/2000/09/xmldsig#}X509Certificate"
     ))
-    if not public_key:
+
+    if not certs:
         # it's possible that there is just one keyDescription with no use attribute
         # that is a shortcut for both signing and encryption combined. So we can use that as fallback.
-        public_key = sso_desc.findtext("./{}//{}".format(
+        certs = sso_desc.findall("./{}//{}".format(
             etree.QName(SAML_XML_NS, "KeyDescriptor"), "{http://www.w3.org/2000/09/xmldsig#}X509Certificate"
         ))
-        if not public_key:
+        if not certs:
             raise MetadataParseError("Public Key missing. Expected an <X509Certificate>")
-    public_key = public_key.replace(" ", "")
+
+    public_keys = []
+    for key in certs:
+        public_keys.append(key.text.replace(" ", ""))
+
     binding_elements = sso_desc.iterfind("./{}".format(etree.QName(SAML_XML_NS, "SingleSignOnService")))
     sso_bindings = {element.get('Binding'): element.get('Location') for element in binding_elements}
     try:
@@ -120,7 +126,7 @@ def parse_metadata_xml(xml, entity_id):
         sso_url = sso_bindings['urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']
     except KeyError:
         raise MetadataParseError("Unable to find SSO URL with HTTP-Redirect binding.")  # lint-amnesty, pylint: disable=raise-missing-from
-    return public_key, sso_url, expires_at
+    return public_keys, sso_url, expires_at
 
 
 def user_exists(details):
@@ -164,29 +170,22 @@ def get_user_from_email(details):
     return None
 
 
-def create_or_update_saml_provider_data(entity_id, public_key, sso_url, expires_at):
+def create_or_update_bulk_saml_provider_data(entity_id, public_keys, sso_url, expires_at):
     """
-    Update/Create the SAMLProviderData for the given entity ID.
-    Return value:
-        False if nothing has changed and existing data's "fetched at" timestamp is just updated.
-        True if a new record was created. (Either this is a new provider or something changed.)
+    Placeholder
     """
-    data_obj = SAMLProviderData.current(entity_id)
     fetched_at = now()
-    if data_obj and (data_obj.public_key == public_key and data_obj.sso_url == sso_url):
-        data_obj.expires_at = expires_at
-        data_obj.fetched_at = fetched_at
-        data_obj.save()
-        return False
-    else:
-        SAMLProviderData.objects.create(
-            entity_id=entity_id,
-            fetched_at=fetched_at,
-            expires_at=expires_at,
-            sso_url=sso_url,
-            public_key=public_key,
+    new_records_created = False
+    # Create a data record for each of the public keys provided
+    for key in public_keys:
+        _, created = SAMLProviderData.objects.update_or_create(
+            public_key=key, entity_id=entity_id,
+            defaults={'sso_url': sso_url, 'expires_at': expires_at, 'fetched_at': fetched_at},
         )
-        return True
+        if created:
+            new_records_created = True
+
+    return new_records_created
 
 
 def convert_saml_slug_provider_id(provider):  # lint-amnesty, pylint: disable=redefined-outer-name
diff --git a/common/djangoapps/util/tests/test_codejail_includes.py b/common/djangoapps/util/tests/test_codejail_includes.py
new file mode 100644
index 0000000000..0e56240a54
--- /dev/null
+++ b/common/djangoapps/util/tests/test_codejail_includes.py
@@ -0,0 +1,26 @@
+"""
+Tests for codejail-includes package.
+"""
+
+import unittest
+
+import eia
+import loncapa
+from verifiers import draganddrop
+
+
+class TestCodeJailIncludes(unittest.TestCase):
+    """ tests for  codejail includes"""
+
+    def test_loncapa(self):
+        random_integer = loncapa.lc_random(2, 60, 5)
+        assert random_integer <= 60
+        assert random_integer >= 2
+
+    def test_nested_list_and_list1(self):
+        assert draganddrop.PositionsCompare([[1, 2], 40]) == draganddrop.PositionsCompare([1, 3])
+
+    def test_Eia(self):
+        # Test cases. All of these should return True
+        assert eia.iseia(100)  # 100 ohm resistor is EIA
+        assert not eia.iseia(101)  # 101 is not
diff --git a/common/djangoapps/util/views.py b/common/djangoapps/util/views.py
index 3cbaaf018e..4bc4fd5522 100644
--- a/common/djangoapps/util/views.py
+++ b/common/djangoapps/util/views.py
@@ -167,11 +167,6 @@ def calculate(request):
     return HttpResponse(json.dumps({'result': str(result)}))  # lint-amnesty, pylint: disable=http-response-with-json-dumps
 
 
-def info(request):
-    """ Info page (link from main header) """
-    return render_to_response("info.html", {})
-
-
 def add_p3p_header(view_func):
     """
     This decorator should only be used with views which may be displayed through the iframe.
diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index cc1ea427f5..30295b0919 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -104,7 +104,6 @@ class LoncapaSystem(object):
         get_python_lib_zip,
         DEBUG,
         i18n,
-        node_path,
         render_template,
         resources_fs,
         seed,      # Why do we do this if we have self.seed?
@@ -119,7 +118,6 @@ class LoncapaSystem(object):
         self.get_python_lib_zip = get_python_lib_zip
         self.DEBUG = DEBUG                              # pylint: disable=invalid-name
         self.i18n = i18n
-        self.node_path = node_path
         self.render_template = render_template
         self.resources_fs = resources_fs
         self.seed = seed                     # Why do we do this if we have self.seed?
diff --git a/common/lib/capa/capa/safe_exec/README.rst b/common/lib/capa/capa/safe_exec/README.rst
index 9a28480caf..ef12f45af6 100644
--- a/common/lib/capa/capa/safe_exec/README.rst
+++ b/common/lib/capa/capa/safe_exec/README.rst
@@ -15,18 +15,12 @@ CodeJail`__, with a few customized tweaks.
 __ https://github.com/edx/codejail/blob/master/README.rst
 
 
-1. At the instruction to install packages into the sandboxed code, you'll 
+1. At the instruction to install packages into the sandboxed code, you'll
    need to install the requirements from requirements/edx-sandbox::
 
     $ pip install -r requirements/edx-sandbox/base.txt
 
-2. At the instruction to create the AppArmor profile, you'll need a line in
-   the profile for the sandbox packages.  <EDXPLATFORM> is the full path to
-   your edx_platform repo::
-
-    <EDXPLATFORM>/common/lib/sandbox-packages/** r,
-
-3. You can configure resource limits in settings.py.  A CODE_JAIL setting is
+2. You can configure resource limits in settings.py.  A CODE_JAIL setting is
    available, a dictionary.  The "limits" key lets you adjust the limits for
    CPU time, real time, and memory use.  Setting any of them to zero disables
    that limit::
diff --git a/common/lib/capa/capa/tests/helpers.py b/common/lib/capa/capa/tests/helpers.py
index 1779168c1a..0d30b1b60f 100644
--- a/common/lib/capa/capa/tests/helpers.py
+++ b/common/lib/capa/capa/tests/helpers.py
@@ -73,7 +73,6 @@ def test_capa_system(render_template=None):
         get_python_lib_zip=lambda: None,
         DEBUG=True,
         i18n=gettext.NullTranslations(),
-        node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
         render_template=render_template or tst_render_template,
         resources_fs=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),
         seed=0,
diff --git a/common/lib/sandbox-packages/README b/common/lib/sandbox-packages/README
deleted file mode 100644
index 706998b08e..0000000000
--- a/common/lib/sandbox-packages/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory is in the Python path for sandboxed Python execution.
diff --git a/common/lib/sandbox-packages/eia.py b/common/lib/sandbox-packages/eia.py
deleted file mode 100644
index f8c2da59f1..0000000000
--- a/common/lib/sandbox-packages/eia.py
+++ /dev/null
@@ -1,112 +0,0 @@
-"""
-Standard resistor values.
-
-Commonly used for verifying electronic components in circuit classes are
-standard values, or conversely, for generating realistic component
-values in parameterized problems. For details, see:
-
-http://en.wikipedia.org/wiki/Electronic_color_code
-"""
-
-
-# pylint: disable=invalid-name
-# r is standard name for a resistor. We would like to use it as such.
-
-import math
-import numbers
-
-E6 = [10, 15, 22, 33, 47, 68]
-
-E12 = [10, 12, 15, 18, 22, 27, 33, 39, 47, 56, 68, 82]
-E24 = [10, 12, 15, 18, 22, 27, 33, 39, 47, 56, 68, 82, 11, 13, 16, 20,
-       24, 30, 36, 43, 51, 62, 75, 91]
-
-E48 = [100, 121, 147, 178, 215, 261, 316, 383, 464, 562, 681, 825, 105,
-       127, 154, 187, 226, 274, 332, 402, 487, 590, 715, 866, 110, 133,
-       162, 196, 237, 287, 348, 422, 511, 619, 750, 909, 115, 140, 169,
-       205, 249, 301, 365, 442, 536, 649, 787, 953]
-
-E96 = [100, 121, 147, 178, 215, 261, 316, 383, 464, 562, 681, 825, 102,
-       124, 150, 182, 221, 267, 324, 392, 475, 576, 698, 845, 105, 127,
-       154, 187, 226, 274, 332, 402, 487, 590, 715, 866, 107, 130, 158,
-       191, 232, 280, 340, 412, 499, 604, 732, 887, 110, 133, 162, 196,
-       237, 287, 348, 422, 511, 619, 750, 909, 113, 137, 165, 200, 243,
-       294, 357, 432, 523, 634, 768, 931, 115, 140, 169, 205, 249, 301,
-       365, 442, 536, 649, 787, 953, 118, 143, 174, 210, 255, 309, 374,
-       453, 549, 665, 806, 976]
-
-E192 = [100, 121, 147, 178, 215, 261, 316, 383, 464, 562, 681, 825, 101,
-        123, 149, 180, 218, 264, 320, 388, 470, 569, 690, 835, 102, 124,
-        150, 182, 221, 267, 324, 392, 475, 576, 698, 845, 104, 126, 152,
-        184, 223, 271, 328, 397, 481, 583, 706, 856, 105, 127, 154, 187,
-        226, 274, 332, 402, 487, 590, 715, 866, 106, 129, 156, 189, 229,
-        277, 336, 407, 493, 597, 723, 876, 107, 130, 158, 191, 232, 280,
-        340, 412, 499, 604, 732, 887, 109, 132, 160, 193, 234, 284, 344,
-        417, 505, 612, 741, 898, 110, 133, 162, 196, 237, 287, 348, 422,
-        511, 619, 750, 909, 111, 135, 164, 198, 240, 291, 352, 427, 517,
-        626, 759, 920, 113, 137, 165, 200, 243, 294, 357, 432, 523, 634,
-        768, 931, 114, 138, 167, 203, 246, 298, 361, 437, 530, 642, 777,
-        942, 115, 140, 169, 205, 249, 301, 365, 442, 536, 649, 787, 953,
-        117, 142, 172, 208, 252, 305, 370, 448, 542, 657, 796, 965, 118,
-        143, 174, 210, 255, 309, 374, 453, 549, 665, 806, 976, 120, 145,
-        176, 213, 258, 312, 379, 459, 556, 673, 816, 988]
-
-
-def iseia(r, valid_types=(E6, E12, E24)):
-    '''
-    Check if a component is a valid EIA value.
-
-    By default, check 5% component values
-    '''
-
-    # Step 1: Discount things which are not numbers
-    if not isinstance(r, numbers.Number) or \
-       r < 0 or \
-       math.isnan(r) or \
-       math.isinf(r):
-        return False
-
-    # Special case: 0 is an okay resistor
-    if r == 0:
-        return True
-
-    # Step 2: Move into the range [100, 1000)
-    while r < 100:
-        r = r * 10
-    while r >= 1000:
-        r = r / 10
-
-    # Step 3: Discount things which are not integers, and cast to int
-    if abs(r - round(r)) > 0.01:
-        return False
-    r = int(round(r))
-
-    # Step 4: Check if we're a valid EIA value
-    for type_list in valid_types:
-        if r in type_list:
-            return True
-        if int(r / 10.) in type_list and (r % 10) == 0:
-            return True
-
-    return False
-
-if __name__ == '__main__':
-    # Test cases. All of these should return True
-    print(iseia(100))        # 100 ohm resistor is EIA
-    print(not iseia(101))    # 101 is not
-    print(not iseia(100.3))  # Floating point close to EIA is not EIA
-    print(iseia(100.001))    # But within floating point error is
-    print(iseia(1e5))        # We handle big numbers well
-    print(iseia(2200))       # We handle middle-of-the-list well
-    # We can handle 1% components correctly; 2.2k is EIA24, but not EIA48.
-    print(not iseia(2200, (E48, E96, E192)))
-    print(iseia(5490e2, (E48, E96, E192)))
-    print(iseia(2200))
-    print(not iseia(5490e2))
-    print(iseia(1e-5))      # We handle little numbers well
-    print(not iseia("Hello"))  # Junk handled okay
-    print(not iseia(float('NaN')))
-    print(not iseia(-1))
-    print(not iseia(iseia))
-    print(not iseia(float('Inf')))
-    print(iseia(0))  # Corner case. 0 is a standard resistor value.
diff --git a/common/lib/sandbox-packages/loncapa/__init__.py b/common/lib/sandbox-packages/loncapa/__init__.py
deleted file mode 100644
index 3d613e04de..0000000000
--- a/common/lib/sandbox-packages/loncapa/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python  # lint-amnesty, pylint: disable=missing-module-docstring
-
-from .loncapa_check import *  # lint-amnesty, pylint: disable=redefined-builtin
diff --git a/common/lib/sandbox-packages/loncapa/loncapa_check.py b/common/lib/sandbox-packages/loncapa/loncapa_check.py
deleted file mode 100644
index 80a0a51545..0000000000
--- a/common/lib/sandbox-packages/loncapa/loncapa_check.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python  # lint-amnesty, pylint: disable=missing-module-docstring
-#
-# File:  mitx/lib/loncapa/loncapa_check.py
-#
-# Python functions which duplicate the standard comparison functions available to LON-CAPA problems.
-# Used in translating LON-CAPA problems to i4x problem specification language.
-
-
-import math
-import random
-from six.moves import range
-
-
-def lc_random(lower, upper, stepsize):
-    '''
-    like random.randrange but lower and upper can be non-integer
-    '''
-    nstep = int((upper - lower) / (1.0 * stepsize))
-    choices = [lower + x * stepsize for x in range(nstep)]
-    return random.choice(choices)
-
-
-def lc_choose(index, *args):
-    '''
-    return args[index]
-    '''
-    try:
-        return args[int(index) - 1]
-    except Exception as err:  # lint-amnesty, pylint: disable=broad-except, unused-variable
-        pass
-    if len(args):  # lint-amnesty, pylint: disable=len-as-condition
-        return args[0]
-    raise Exception(
-        "loncapa_check.lc_choose error, index={index}, args={args}".format(
-            index=index,
-            args=args,
-        )
-    )
-
-deg2rad = math.pi / 180.0
-rad2deg = 180.0 / math.pi
diff --git a/common/lib/sandbox-packages/setup.py b/common/lib/sandbox-packages/setup.py
deleted file mode 100644
index 3a02c854bc..0000000000
--- a/common/lib/sandbox-packages/setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# lint-amnesty, pylint: disable=missing-module-docstring
-
-from setuptools import setup
-
-setup(
-    name="sandbox-packages",
-    version="0.1.1",
-    packages=[
-        "loncapa",
-        "verifiers",
-    ],
-    py_modules=[
-        "eia",
-    ],
-    install_requires=[
-    ],
-)
diff --git a/common/lib/sandbox-packages/verifiers/draganddrop.py b/common/lib/sandbox-packages/verifiers/draganddrop.py
deleted file mode 100644
index 9d41366c58..0000000000
--- a/common/lib/sandbox-packages/verifiers/draganddrop.py
+++ /dev/null
@@ -1,433 +0,0 @@
-""" Grader of drag and drop input.
-
-Client side behavior: user can drag and drop images from list on base image.
-
-
- Then json returned from client is:
- {
-    "draggable": [
-        { "image1": "t1"  },
-        { "ant": "t2"  },
-        { "molecule": "t3"  },
-                ]
-}
-values are target names.
-
-or:
- {
-    "draggable": [
-        { "image1": "[10, 20]"  },
-        { "ant": "[30, 40]"  },
-        { "molecule": "[100, 200]"  },
-                ]
-}
-values are (x, y) coordinates of centers of dragged images.
-"""
-
-
-import json
-import six
-from six.moves import zip
-
-
-def flat_user_answer(user_answer):
-    """
-    Convert nested `user_answer` to flat format.
-
-        {'up': {'first': {'p': 'p_l'}}}
-
-        to
-
-        {'up': 'p_l[p][first]'}
-    """
-
-    def parse_user_answer(answer):
-        key = list(answer.keys())[0]
-        value = list(answer.values())[0]
-        if isinstance(value, dict):
-
-            # Make complex value:
-            # Example:
-            # Create like 'p_l[p][first]' from {'first': {'p': 'p_l'}
-            complex_value_list = []
-            v_value = value
-            while isinstance(v_value, dict):
-                v_key = list(v_value.keys())[0]
-                v_value = list(v_value.values())[0]
-                complex_value_list.append(v_key)
-
-            complex_value = '{0}'.format(v_value)
-            for i in reversed(complex_value_list):
-                complex_value = '{0}[{1}]'.format(complex_value, i)
-
-            res = {key: complex_value}
-            return res
-        else:
-            return answer
-
-    result = []
-    for answer in user_answer:
-        parse_answer = parse_user_answer(answer)
-        result.append(parse_answer)
-
-    return result
-
-
-class PositionsCompare(list):
-    """ Class for comparing positions.
-
-        Args:
-                list or string::
-                    "abc" - target
-                    [10, 20] - list of integers
-                    [[10, 20], 200] list of list and integer
-
-    """
-    def __eq__(self, other):
-        """ Compares two arguments.
-
-        Default lists behavior is conversion of string "abc" to  list
-        ["a", "b", "c"]. We will use that.
-
-        If self or other is empty - returns False.
-
-        Args:
-                self, other: str, unicode, list, int, float
-
-        Returns: bool
-        """
-        # checks if self or other is not empty list (empty lists  = false)
-        if not self or not other:
-            return False
-
-        if (isinstance(self[0], (list, int, float)) and
-                isinstance(other[0], (list, int, float))):
-            return self.coordinate_positions_compare(other)
-
-        elif (isinstance(self[0], (six.text_type, str)) and
-              isinstance(other[0], (six.text_type, str))):
-            return ''.join(self) == ''.join(other)
-        else:  # improper argument types: no (float / int or lists of list
-            #and float / int pair) or two string / unicode lists pair
-            return False
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def coordinate_positions_compare(self, other, r=10):
-        """ Checks if self is equal to other inside radius of forgiveness
-            (default 10 px).
-
-            Args:
-                self, other: [x, y] or [[x, y], r], where r is radius of
-                             forgiveness;
-                             x, y, r: int
-
-            Returns: bool.
-        """
-        # get max radius of forgiveness
-        if isinstance(self[0], list):  # [(x, y), r] case
-            r = max(self[1], r)
-            x1, y1 = self[0]
-        else:
-            x1, y1 = self
-
-        if isinstance(other[0], list):  # [(x, y), r] case
-            r = max(other[1], r)
-            x2, y2 = other[0]
-        else:
-            x2, y2 = other
-
-        if (x2 - x1) ** 2 + (y2 - y1) ** 2 > r * r:
-            return False
-
-        return True
-
-
-class DragAndDrop(object):
-    """ Grader class for drag and drop inputtype.
-    """
-
-    def grade(self):
-        ''' Grader user answer.
-
-        Checks if every draggable isplaced on proper target or  on proper
-        coordinates within radius of forgiveness (default is 10).
-
-        Returns: bool.
-        '''
-        for draggable in self.excess_draggables:
-            if self.excess_draggables[draggable]:
-                return False  # user answer has more draggables than correct answer
-
-        # Number of draggables in user_groups may be differ that in
-        # correct_groups, that is incorrect, except special case with 'number'
-        for index, draggable_ids in enumerate(self.correct_groups):
-            # 'number' rule special case
-            # for reusable draggables we may get in self.user_groups
-            # {'1': [u'2', u'2', u'2'], '0': [u'1', u'1'], '2': [u'3']}
-            # if '+number' is in rule - do not remove duplicates and strip
-            # '+number' from rule
-            current_rule = list(self.correct_positions[index].keys())[0]
-            if 'number' in current_rule:
-                rule_values = self.correct_positions[index][current_rule]
-                # clean rule, do not do clean duplicate items
-                self.correct_positions[index].pop(current_rule, None)
-                parsed_rule = current_rule.replace('+', '').replace('number', '')
-                self.correct_positions[index][parsed_rule] = rule_values
-            else:  # remove dublicates
-                self.user_groups[index] = list(set(self.user_groups[index]))
-
-            if sorted(draggable_ids) != sorted(self.user_groups[index]):
-                return False
-
-        # Check that in every group, for rule of that group, user positions of
-        # every element are equal with correct positions
-        for index, _ in enumerate(self.correct_groups):
-            rules_executed = 0
-            for rule in ('exact', 'anyof', 'unordered_equal'):
-                # every group has only one rule
-                if self.correct_positions[index].get(rule, None):
-                    rules_executed += 1
-                    if not self.compare_positions(
-                            self.correct_positions[index][rule],
-                            self.user_positions[index]['user'], flag=rule):
-                        return False
-            if not rules_executed:  # no correct rules for current group
-                # probably xml content mistake - wrong rules names
-                return False
-
-        return True
-
-    def compare_positions(self, correct, user, flag):
-        """ Compares two lists of positions with flag rules. Order of
-        correct/user arguments is matter only in 'anyof' flag.
-
-        Rules description:
-
-            'exact' means 1-1 ordered relationship::
-
-                [el1, el2, el3] is 'exact' equal to [el5, el6, el7] when
-                el1 == el5, el2 == el6, el3 == el7.
-                Equality function is custom, see below.
-
-
-            'anyof' means subset relationship::
-
-                user = [el1, el2] is 'anyof' equal to correct = [el1, el2, el3]
-                when
-                        set(user) <= set(correct).
-
-                'anyof' is ordered relationship. It always checks if user
-                is subset of correct
-
-                Equality function is custom, see below.
-
-                Examples:
-
-                     - many draggables per position:
-                    user ['1', '2', '2', '2'] is 'anyof' equal to ['1', '2', '3']
-
-                     - draggables can be placed in any order:
-                    user ['1', '2', '3', '4'] is 'anyof' equal to ['4', '2', '1', 3']
-
-            'unordered_equal' is same as 'exact' but disregards on order
-
-        Equality functions:
-
-        Equality functon depends on type of element. They declared in
-        PositionsCompare class. For position like targets
-        ids ("t1", "t2", etc..) it is string equality function. For coordinate
-        positions ([1, 2] or [[1, 2], 15]) it is coordinate_positions_compare
-        function (see docstrings in PositionsCompare class)
-
-        Args:
-            correst, user: lists of positions
-
-        Returns: True if within rule lists are equal, otherwise False.
-        """
-        if flag == 'exact':
-            if len(correct) != len(user):
-                return False
-            for el1, el2 in zip(correct, user):
-                if PositionsCompare(el1) != PositionsCompare(el2):
-                    return False
-
-        if flag == 'anyof':
-            for u_el in user:
-                for c_el in correct:
-                    if PositionsCompare(u_el) == PositionsCompare(c_el):
-                        break
-                else:
-                    # General: the else is executed after the for,
-                    # only if the for terminates normally (not by a break)
-
-                    # In this case, 'for' is terminated normally if every element
-                    # from 'correct' list isn't equal to concrete element from
-                    # 'user' list. So as we found one element from 'user' list,
-                    # that not in 'correct' list - we return False
-                    return False
-
-        if flag == 'unordered_equal':
-            if len(correct) != len(user):
-                return False
-            temp = correct[:]
-            for u_el in user:
-                for c_el in temp:
-                    if PositionsCompare(u_el) == PositionsCompare(c_el):
-                        temp.remove(c_el)
-                        break
-                else:
-                    # same as upper -  if we found element from 'user' list,
-                    # that not in 'correct' list - we return False.
-                    return False
-
-        return True
-
-    def __init__(self, correct_answer, user_answer):
-        """ Populates DragAndDrop variables from user_answer and correct_answer.
-        If correct_answer is dict, converts it to list.
-        Correct answer in dict form is simple structure for fast and simple
-        grading. Example of correct answer dict example::
-
-            correct_answer = {'name4': 't1',
-                            'name_with_icon': 't1',
-                            '5': 't2',
-                            '7': 't2'}
-
-            It is draggable_name: dragable_position mapping.
-
-            Advanced form converted from simple form uses 'exact' rule
-            for matching.
-
-        Correct answer in list form is designed for advanced cases::
-
-        correct_answers = [
-        {
-        'draggables': ['1', '2', '3', '4', '5', '6'],
-        'targets': [
-           's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1',  'p_pi_2'],
-        'rule': 'anyof'},
-        {
-        'draggables': ['7', '8', '9', '10'],
-        'targets': ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2'],
-        'rule': 'anyof'
-        }
-                        ]
-
-        Advanced answer in list form is list of dicts, and every dict must have
-        3 keys: 'draggables', 'targets' and 'rule'. 'Draggables' value is
-        list of draggables ids, 'targes' values are list of targets ids, 'rule'
-        value one of 'exact', 'anyof', 'unordered_equal', 'anyof+number',
-        'unordered_equal+number'
-
-        Advanced form uses "all dicts must match with their rule" logic.
-
-        Same draggable cannot appears more that in one dict.
-
-        Behavior is more widely explained in sphinx documentation.
-
-        Args:
-            user_answer: json
-            correct_answer: dict or list
-        """
-
-        self.correct_groups = []  # Correct groups from xml.
-        self.correct_positions = []  # Correct positions for comparing.
-        self.user_groups = []  # Will be populated from user answer.
-        self.user_positions = []  # Will be populated from user answer.
-
-        # Convert from dict answer format to list format.
-        if isinstance(correct_answer, dict):
-            tmp = []
-            for key in sorted(correct_answer.keys()):
-                value = correct_answer[key]
-                tmp.append({
-                    'draggables': [key],
-                    'targets': [value],
-                    'rule': 'exact'})
-            correct_answer = tmp
-
-        # Convert string `user_answer` to object.
-        user_answer = json.loads(user_answer)
-
-        # This dictionary will hold a key for each draggable the user placed on
-        # the image.  The value is True if that draggable is not mentioned in any
-        # correct_answer entries.  If the draggable is mentioned in at least one
-        # correct_answer entry, the value is False.
-        # default to consider every user answer excess until proven otherwise.
-        self.excess_draggables = dict(
-            (list(users_draggable.keys())[0], True)
-            for users_draggable in user_answer
-        )
-
-        # Convert nested `user_answer` to flat format.
-        user_answer = flat_user_answer(user_answer)
-
-        # Create identical data structures from user answer and correct answer.
-        for answer in correct_answer:
-            user_groups_data = []
-            user_positions_data = []
-            for draggable_dict in user_answer:
-                # Draggable_dict is 1-to-1 {draggable_name: position}.
-                draggable_name = list(draggable_dict.keys())[0]
-                if draggable_name in answer['draggables']:
-                    user_groups_data.append(draggable_name)
-                    user_positions_data.append(
-                        draggable_dict[draggable_name]
-                    )
-                    # proved that this is not excess
-                    self.excess_draggables[draggable_name] = False
-
-            self.correct_groups.append(answer['draggables'])
-            self.correct_positions.append({answer['rule']: answer['targets']})
-            self.user_groups.append(user_groups_data)
-            self.user_positions.append({'user': user_positions_data})
-
-
-def grade(user_input, correct_answer):
-    """ Creates DragAndDrop instance from user_input and correct_answer and
-        calls DragAndDrop.grade for grading.
-
-        Supports two interfaces for correct_answer: dict and list.
-
-        Args:
-            user_input: json. Format::
-
-                { "draggables":
-                [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
-
-                or
-
-                {"draggables": [{"1": "t1"}, \
-                {"name_with_icon": "t2"}]}
-
-            correct_answer: dict or list.
-
-                Dict form::
-
-                        {'1': 't1',  'name_with_icon': 't2'}
-
-                        or
-
-                        {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
-
-                List form::
-
-                    correct_answer = [
-                    {
-                        'draggables':  ['l3_o', 'l10_o'],
-                        'targets':  ['t1_o', 't9_o'],
-                        'rule': 'anyof'
-                    },
-                    {
-                        'draggables': ['l1_c', 'l8_c'],
-                        'targets': ['t5_c', 't6_c'],
-                        'rule': 'anyof'
-                    }
-                    ]
-
-        Returns: bool
-    """
-    return DragAndDrop(correct_answer=correct_answer,
-                       user_answer=user_input).grade()
diff --git a/common/lib/sandbox-packages/verifiers/tests_draganddrop.py b/common/lib/sandbox-packages/verifiers/tests_draganddrop.py
deleted file mode 100644
index 03bea08587..0000000000
--- a/common/lib/sandbox-packages/verifiers/tests_draganddrop.py
+++ /dev/null
@@ -1,843 +0,0 @@
-# lint-amnesty, pylint: disable=missing-module-docstring
-
-import json
-import unittest
-
-from . import draganddrop
-
-from .draganddrop import PositionsCompare
-
-
-class Test_PositionsCompare(unittest.TestCase):
-    """ describe"""
-
-    def test_nested_list_and_list1(self):
-        assert PositionsCompare([[1, 2], 40]) == PositionsCompare([1, 3])
-
-    def test_nested_list_and_list2(self):
-        assert PositionsCompare([1, 12]) != PositionsCompare([1, 1])
-
-    def test_list_and_list1(self):
-        assert PositionsCompare([[1, 2], 12]) != PositionsCompare([1, 15])
-
-    def test_list_and_list2(self):
-        assert PositionsCompare([1, 11]) == PositionsCompare([1, 1])
-
-    def test_numerical_list_and_string_list(self):
-        assert PositionsCompare([1, 2]) != PositionsCompare(['1'])
-
-    def test_string_and_string_list1(self):
-        assert PositionsCompare('1') == PositionsCompare(['1'])
-
-    def test_string_and_string_list2(self):
-        assert PositionsCompare('abc') == PositionsCompare('abc')
-
-    def test_string_and_string_list3(self):
-        assert PositionsCompare('abd') != PositionsCompare('abe')
-
-    def test_float_and_string(self):
-        assert PositionsCompare([3.5, 5.7]) != PositionsCompare(['1'])
-
-    def test_floats_and_ints(self):
-        assert PositionsCompare([3.5, 4.5]) == PositionsCompare([5, 7])
-
-
-class Test_DragAndDrop_Grade(unittest.TestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
-
-    def test_targets_are_draggable_1(self):
-        user_input = json.dumps([
-            {'p': 'p_l'},
-            {'up': {'first': {'p': 'p_l'}}}
-        ])
-
-        correct_answer = [
-            {
-                'draggables': ['p'],
-                'targets': ['p_l', 'p_r'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['up'],
-                'targets': [
-                    'p_l[p][first]'
-                ],
-                'rule': 'anyof'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_are_draggable_2(self):
-        user_input = json.dumps([
-            {'p': 'p_l'},
-            {'p': 'p_r'},
-            {'s': 's_l'},
-            {'s': 's_r'},
-            {'up': {'1': {'p': 'p_l'}}},
-            {'up': {'3': {'p': 'p_l'}}},
-            {'up': {'1': {'p': 'p_r'}}},
-            {'up': {'3': {'p': 'p_r'}}},
-            {'up_and_down': {'1': {'s': 's_l'}}},
-            {'up_and_down': {'1': {'s': 's_r'}}}
-        ])
-
-        correct_answer = [
-            {
-                'draggables': ['p'],
-                'targets': ['p_l', 'p_r'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['s'],
-                'targets': ['s_l', 's_r'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up_and_down'],
-                'targets': ['s_l[s][1]', 's_r[s][1]'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up'],
-                'targets': [
-                    'p_l[p][1]',
-                    'p_l[p][3]',
-                    'p_r[p][1]',
-                    'p_r[p][3]',
-                ],
-                'rule': 'unordered_equal'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_are_draggable_2_manual_parsing(self):
-        user_input = json.dumps([
-            {'up': 'p_l[p][1]'},
-            {'p': 'p_l'},
-            {'up': 'p_l[p][3]'},
-            {'up': 'p_r[p][1]'},
-            {'p': 'p_r'},
-            {'up': 'p_r[p][3]'},
-            {'up_and_down': 's_l[s][1]'},
-            {'s': 's_l'},
-            {'up_and_down': 's_r[s][1]'},
-            {'s': 's_r'}
-        ])
-
-        correct_answer = [
-            {
-                'draggables': ['p'],
-                'targets': ['p_l', 'p_r'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['s'],
-                'targets': ['s_l', 's_r'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up_and_down'],
-                'targets': ['s_l[s][1]', 's_r[s][1]'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up'],
-                'targets': [
-                    'p_l[p][1]',
-                    'p_l[p][3]',
-                    'p_r[p][1]',
-                    'p_r[p][3]',
-                ],
-                'rule': 'unordered_equal'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_are_draggable_3_nested(self):
-        user_input = json.dumps([
-            {'molecule': 'left_side_tagret'},
-            {'molecule': 'right_side_tagret'},
-            {'p': {'p_target': {'molecule': 'left_side_tagret'}}},
-            {'p': {'p_target': {'molecule': 'right_side_tagret'}}},
-            {'s': {'s_target': {'molecule': 'left_side_tagret'}}},
-            {'s': {'s_target': {'molecule': 'right_side_tagret'}}},
-            {'up': {'1': {'p': {'p_target': {'molecule': 'left_side_tagret'}}}}},
-            {'up': {'3': {'p': {'p_target': {'molecule': 'left_side_tagret'}}}}},
-            {'up': {'1': {'p': {'p_target': {'molecule': 'right_side_tagret'}}}}},
-            {'up': {'3': {'p': {'p_target': {'molecule': 'right_side_tagret'}}}}},
-            {'up_and_down': {'1': {'s': {'s_target': {'molecule': 'left_side_tagret'}}}}},
-            {'up_and_down': {'1': {'s': {'s_target': {'molecule': 'right_side_tagret'}}}}}
-        ])
-
-        correct_answer = [
-            {
-                'draggables': ['molecule'],
-                'targets': ['left_side_tagret', 'right_side_tagret'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['p'],
-                'targets': [
-                    'left_side_tagret[molecule][p_target]',
-                    'right_side_tagret[molecule][p_target]',
-                ],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['s'],
-                'targets': [
-                    'left_side_tagret[molecule][s_target]',
-                    'right_side_tagret[molecule][s_target]',
-                ],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up_and_down'],
-                'targets': [
-                    'left_side_tagret[molecule][s_target][s][1]',
-                    'right_side_tagret[molecule][s_target][s][1]',
-                ],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up'],
-                'targets': [
-                    'left_side_tagret[molecule][p_target][p][1]',
-                    'left_side_tagret[molecule][p_target][p][3]',
-                    'right_side_tagret[molecule][p_target][p][1]',
-                    'right_side_tagret[molecule][p_target][p][3]',
-                ],
-                'rule': 'unordered_equal'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_are_draggable_4_real_example(self):
-        user_input = json.dumps([
-            {'single_draggable': 's_l'},
-            {'single_draggable': 's_r'},
-            {'single_draggable': 'p_sigma'},
-            {'single_draggable': 'p_sigma*'},
-            {'single_draggable': 's_sigma'},
-            {'single_draggable': 's_sigma*'},
-            {'double_draggable': 'p_pi*'},
-            {'double_draggable': 'p_pi'},
-            {'triple_draggable': 'p_l'},
-            {'triple_draggable': 'p_r'},
-            {'up': {'1': {'triple_draggable': 'p_l'}}},
-            {'up': {'2': {'triple_draggable': 'p_l'}}},
-            {'up': {'2': {'triple_draggable': 'p_r'}}},
-            {'up': {'3': {'triple_draggable': 'p_r'}}},
-            {'up_and_down': {'1': {'single_draggable': 's_l'}}},
-            {'up_and_down': {'1': {'single_draggable': 's_r'}}},
-            {'up_and_down': {'1': {'single_draggable': 's_sigma'}}},
-            {'up_and_down': {'1': {'single_draggable': 's_sigma*'}}},
-            {'up_and_down': {'1': {'double_draggable': 'p_pi'}}},
-            {'up_and_down': {'2': {'double_draggable': 'p_pi'}}}
-        ])
-
-        # 10 targets:
-        # s_l, s_r, p_l, p_r, s_sigma, s_sigma*, p_pi, p_sigma, p_pi*, p_sigma*
-        #
-        # 3 draggable objects, which have targets (internal target ids - 1, 2, 3):
-        # single_draggable, double_draggable, triple_draggable
-        #
-        # 2 draggable objects:
-        # up, up_and_down
-        correct_answer = [
-            {
-                'draggables': ['triple_draggable'],
-                'targets': ['p_l', 'p_r'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['double_draggable'],
-                'targets': ['p_pi', 'p_pi*'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['single_draggable'],
-                'targets': ['s_l', 's_r', 's_sigma', 's_sigma*', 'p_sigma', 'p_sigma*'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up'],
-                'targets': [
-                    'p_l[triple_draggable][1]',
-                    'p_l[triple_draggable][2]',
-                    'p_r[triple_draggable][2]',
-                    'p_r[triple_draggable][3]',
-                ],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['up_and_down'],
-                'targets': [
-                    's_l[single_draggable][1]',
-                    's_r[single_draggable][1]',
-                    's_sigma[single_draggable][1]',
-                    's_sigma*[single_draggable][1]',
-                    'p_pi[double_draggable][1]',
-                    'p_pi[double_draggable][2]',
-                ],
-                'rule': 'unordered_equal'
-            },
-
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_true(self):
-        user_input = '[{"1": "t1"}, \
-         {"name_with_icon": "t2"}]'
-        correct_answer = {'1': 't1', 'name_with_icon': 't2'}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_expect_no_actions_wrong(self):
-        user_input = '[{"1": "t1"}, \
-         {"name_with_icon": "t2"}]'
-        correct_answer = []
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_expect_no_actions_right(self):
-        user_input = '[]'
-        correct_answer = []
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_false(self):
-        user_input = '[{"1": "t1"}, \
-        {"name_with_icon": "t2"}]'
-        correct_answer = {'1': 't3', 'name_with_icon': 't2'}
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_multiple_images_per_target_true(self):
-        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}, \
-        {"2": "t1"}]'
-        correct_answer = {'1': 't1', 'name_with_icon': 't2', '2': 't1'}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_multiple_images_per_target_false(self):
-        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}, \
-        {"2": "t1"}]'
-        correct_answer = {'1': 't2', 'name_with_icon': 't2', '2': 't1'}
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_targets_and_positions(self):
-        user_input = '[{"1": [10,10]}, \
-         {"name_with_icon": [[10,10],4]}]'
-        correct_answer = {'1': [10, 10], 'name_with_icon': [[10, 10], 4]}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_position_and_targets(self):
-        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}]'
-        correct_answer = {'1': 't1', 'name_with_icon': 't2'}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_positions_exact(self):
-        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
-        correct_answer = {'1': [10, 10], 'name_with_icon': [20, 20]}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_positions_false(self):
-        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
-        correct_answer = {'1': [25, 25], 'name_with_icon': [20, 20]}
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_positions_true_in_radius(self):
-        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
-        correct_answer = {'1': [14, 14], 'name_with_icon': [20, 20]}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_positions_true_in_manual_radius(self):
-        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
-        correct_answer = {'1': [[40, 10], 30], 'name_with_icon': [20, 20]}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_positions_false_in_manual_radius(self):
-        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
-        correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_correct_answer_not_has_key_from_user_answer(self):
-        user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}]'
-        correct_answer = {'3': 't3', 'name_with_icon': 't2'}
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_anywhere(self):
-        """Draggables can be places anywhere on base image.
-            Place grass in the middle of the image and ant in the
-            right upper corner."""
-        user_input = '[{"ant":[610.5,57.449951171875]},\
-            {"grass":[322.5,199.449951171875]}]'
-
-        correct_answer = {'grass': [[300, 200], 200], 'ant': [[500, 0], 200]}
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_lcao_correct(self):
-        """Describe carbon molecule in LCAO-MO"""
-        user_input = '[{"1":"s_left"}, \
-        {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
-        {"8":"p_left_2"},{"10":"p_right_1"},{"9":"p_right_2"}, \
-        {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
-        {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
-        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]'
-
-        correct_answer = [{
-            'draggables': ['1', '2', '3', '4', '5', '6'],
-            'targets': [
-                's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
-            ],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['7', '8', '9', '10'],
-            'targets': ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['11', '12'],
-            'targets': ['s_sigma_name', 'p_sigma_name'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['13', '14'],
-            'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['15'],
-            'targets': ['p_pi_name'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['16'],
-            'targets': ['p_pi_star_name'],
-            'rule': 'anyof'
-        }]
-
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_lcao_extra_element_incorrect(self):
-        """Describe carbon molecule in LCAO-MO"""
-        user_input = '[{"1":"s_left"}, \
-        {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
-        {"8":"p_left_2"},{"17":"p_left_3"},{"10":"p_right_1"},{"9":"p_right_2"}, \
-        {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
-        {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
-        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]'
-
-        correct_answer = [{
-            'draggables': ['1', '2', '3', '4', '5', '6'],
-            'targets': [
-                's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
-            ],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['7', '8', '9', '10'],
-            'targets': ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['11', '12'],
-            'targets': ['s_sigma_name', 'p_sigma_name'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['13', '14'],
-            'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['15'],
-            'targets': ['p_pi_name'],
-            'rule': 'anyof'
-        }, {
-            'draggables': ['16'],
-            'targets': ['p_pi_star_name'],
-            'rule': 'anyof'
-        }]
-
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_reuse_draggable_no_mupliples(self):
-        """Test reusable draggables (no mupltiple draggables per target)"""
-        user_input = '[{"1":"target1"}, \
-        {"2":"target2"},{"1":"target3"},{"2":"target4"},{"2":"target5"}, \
-        {"3":"target6"}]'
-        correct_answer = [
-            {
-                'draggables': ['1'],
-                'targets': ['target1', 'target3'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['2'],
-                'targets': ['target2', 'target4', 'target5'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['3'],
-                'targets': ['target6'],
-                'rule': 'anyof'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_reuse_draggable_with_mupliples(self):
-        """Test reusable draggables with mupltiple draggables per target"""
-        user_input = '[{"1":"target1"}, \
-        {"2":"target2"},{"1":"target1"},{"2":"target4"},{"2":"target4"}, \
-        {"3":"target6"}]'
-        correct_answer = [
-            {
-                'draggables': ['1'],
-                'targets': ['target1', 'target3'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['2'],
-                'targets': ['target2', 'target4'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['3'],
-                'targets': ['target6'],
-                'rule': 'anyof'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_reuse_many_draggable_with_mupliples(self):
-        """Test reusable draggables with mupltiple draggables per target"""
-        user_input = '[{"1":"target1"}, \
-        {"2":"target2"},{"1":"target1"},{"2":"target4"},{"2":"target4"}, \
-        {"3":"target6"}, {"4": "target3"}, {"5": "target4"}, \
-        {"5": "target5"}, {"6": "target2"}]'
-        correct_answer = [
-            {
-                'draggables': ['1', '4'],
-                'targets': ['target1', 'target3'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['2', '6'],
-                'targets': ['target2', 'target4'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['5'],
-                'targets': ['target4', 'target5'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['3'],
-                'targets': ['target6'],
-                'rule': 'anyof'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_reuse_many_draggable_with_mupliples_wrong(self):
-        """Test reusable draggables with mupltiple draggables per target"""
-        user_input = '[{"1":"target1"}, \
-        {"2":"target2"},{"1":"target1"}, \
-        {"2":"target3"}, \
-        {"2":"target4"}, \
-        {"3":"target6"}, {"4": "target3"}, {"5": "target4"}, \
-        {"5": "target5"}, {"6": "target2"}]'
-        correct_answer = [
-            {
-                'draggables': ['1', '4'],
-                'targets': ['target1', 'target3'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['2', '6'],
-                'targets': ['target2', 'target4'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['5'],
-                'targets': ['target4', 'target5'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['3'],
-                'targets': ['target6'],
-                'rule': 'anyof'
-            }]
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_label_10_targets_with_a_b_c_false(self):
-        """Test reusable draggables (no mupltiple draggables per target)"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
-        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target1"}]'
-        correct_answer = [
-            {
-                'draggables': ['a'],
-                'targets': ['target1', 'target4', 'target7', 'target10'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['b'],
-                'targets': ['target2', 'target5', 'target8'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['c'],
-                'targets': ['target3', 'target6', 'target9'],
-                'rule': 'unordered_equal'
-            }
-        ]
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_label_10_targets_with_a_b_c_(self):
-        """Test reusable draggables (no mupltiple draggables per target)"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
-        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target10"}]'
-        correct_answer = [
-            {
-                'draggables': ['a'],
-                'targets': ['target1', 'target4', 'target7', 'target10'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['b'],
-                'targets': ['target2', 'target5', 'target8'],
-                'rule': 'unordered_equal'
-            },
-            {
-                'draggables': ['c'],
-                'targets': ['target3', 'target6', 'target9'],
-                'rule': 'unordered_equal'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_label_10_targets_with_a_b_c_multiple(self):
-        """Test reusable draggables  (mupltiple draggables per target)"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
-        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target1"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'a', 'a'],
-                'targets': ['target1', 'target4', 'target7', 'target10'],
-                'rule': 'anyof+number'
-            },
-            {
-                'draggables': ['b', 'b', 'b'],
-                'targets': ['target2', 'target5', 'target8'],
-                'rule': 'anyof+number'
-            },
-            {
-                'draggables': ['c', 'c', 'c'],
-                'targets': ['target3', 'target6', 'target9'],
-                'rule': 'anyof+number'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_label_10_targets_with_a_b_c_multiple_false(self):
-        """Test reusable draggables  (mupltiple draggables per target)"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
-        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
-         {"a":"target1"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'a', 'a'],
-                'targets': ['target1', 'target4', 'target7', 'target10'],
-                'rule': 'anyof+number'
-            },
-            {
-                'draggables': ['b', 'b', 'b'],
-                'targets': ['target2', 'target5', 'target8'],
-                'rule': 'anyof+number'
-            },
-            {
-                'draggables': ['c', 'c', 'c'],
-                'targets': ['target3', 'target6', 'target9'],
-                'rule': 'anyof+number'
-            }
-        ]
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_label_10_targets_with_a_b_c_reused(self):
-        """Test a b c in 10 labels reused"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
-        {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
-         {"a":"target10"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'a'],
-                'targets': ['target1', 'target10'],
-                'rule': 'unordered_equal+number'
-            },
-            {
-                'draggables': ['b', 'b', 'b'],
-                'targets': ['target2', 'target5', 'target8'],
-                'rule': 'unordered_equal+number'
-            },
-            {
-                'draggables': ['c', 'c', 'c'],
-                'targets': ['target3', 'target6', 'target9'],
-                'rule': 'unordered_equal+number'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_label_10_targets_with_a_b_c_reused_false(self):
-        """Test a b c in 10 labels reused false"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"},{"b":"target5"}, {"a":"target8"},\
-        {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
-         {"a":"target10"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'a'],
-                'targets': ['target1', 'target10'],
-                'rule': 'unordered_equal+number'
-            },
-            {
-                'draggables': ['b', 'b', 'b'],
-                'targets': ['target2', 'target5', 'target8'],
-                'rule': 'unordered_equal+number'
-            },
-            {
-                'draggables': ['c', 'c', 'c'],
-                'targets': ['target3', 'target6', 'target9'],
-                'rule': 'unordered_equal+number'
-            }
-        ]
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_mixed_reuse_and_not_reuse(self):
-        """Test reusable draggables """
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"}, {"a":"target4"},\
-         {"a":"target5"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'b'],
-                'targets': ['target1', 'target2', 'target4', 'target5'],
-                'rule': 'anyof'
-            },
-            {
-                'draggables': ['c'],
-                'targets': ['target3'],
-                'rule': 'exact'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_mixed_reuse_and_not_reuse_number(self):
-        """Test reusable draggables with number """
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"}, {"a":"target4"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'a', 'b'],
-                'targets': ['target1', 'target2', 'target4'],
-                'rule': 'anyof+number'
-            },
-            {
-                'draggables': ['c'],
-                'targets': ['target3'],
-                'rule': 'exact'
-            }
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-    def test_mixed_reuse_and_not_reuse_number_false(self):
-        """Test reusable draggables with numbers, but wrong"""
-        user_input = '[{"a":"target1"}, \
-        {"b":"target2"},{"c":"target3"}, {"a":"target4"}, {"a":"target10"}]'
-        correct_answer = [
-            {
-                'draggables': ['a', 'a', 'b'],
-                'targets': ['target1', 'target2', 'target4', 'target10'],
-                'rule': 'anyof_number'
-            },
-            {
-                'draggables': ['c'],
-                'targets': ['target3'],
-                'rule': 'exact'
-            }
-        ]
-        assert not draganddrop.grade(user_input, correct_answer)
-
-    def test_alternative_correct_answer(self):
-        user_input = '[{"name_with_icon":"t1"},\
-        {"name_with_icon":"t1"},{"name_with_icon":"t1"},{"name4":"t1"}, \
-        {"name4":"t1"}]'
-        correct_answer = [
-            {'draggables': ['name4'], 'targets': ['t1', 't1'], 'rule': 'exact'},
-            {'draggables': ['name_with_icon'], 'targets': ['t1', 't1', 't1'],
-                'rule': 'exact'}
-        ]
-        assert draganddrop.grade(user_input, correct_answer)
-
-
-class Test_DragAndDrop_Populate(unittest.TestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
-
-    def test_1(self):
-        correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
-        user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]'
-        dnd = draganddrop.DragAndDrop(correct_answer, user_input)
-
-        correct_groups = [['1'], ['name_with_icon']]
-        correct_positions = [{'exact': [[[40, 10], 29]]}, {'exact': [[20, 20]]}]
-        user_groups = [['1'], ['name_with_icon']]
-        user_positions = [{'user': [[10, 10]]}, {'user': [[20, 20]]}]
-
-        assert correct_groups == dnd.correct_groups
-        assert correct_positions == dnd.correct_positions
-        assert user_groups == dnd.user_groups
-        assert user_positions == dnd.user_positions
-
-
-class Test_DraAndDrop_Compare_Positions(unittest.TestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
-
-    def test_1(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert dnd.compare_positions(correct=[[1, 1], [2, 3]], user=[[2, 3], [1, 1]], flag='anyof')
-
-    def test_2a(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert dnd.compare_positions(correct=[[1, 1], [2, 3]], user=[[2, 3], [1, 1]], flag='exact')
-
-    def test_2b(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert not dnd.compare_positions(correct=[[1, 1], [2, 3]], user=[[2, 13], [1, 1]], flag='exact')
-
-    def test_3(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert not dnd.compare_positions(correct=['a', 'b'], user=['a', 'b', 'c'], flag='anyof')
-
-    def test_4(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert dnd.compare_positions(correct=['a', 'b', 'c'], user=['a', 'b'], flag='anyof')
-
-    def test_5(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert not dnd.compare_positions(correct=['a', 'b', 'c'], user=['a', 'c', 'b'], flag='exact')
-
-    def test_6(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert dnd.compare_positions(correct=['a', 'b', 'c'], user=['a', 'c', 'b'], flag='anyof')
-
-    def test_7(self):
-        dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]')
-        assert not dnd.compare_positions(correct=['a', 'b', 'b'], user=['a', 'c', 'b'], flag='anyof')
-
-
-def suite():  # lint-amnesty, pylint: disable=missing-function-docstring
-
-    testcases = [Test_PositionsCompare,
-                 Test_DragAndDrop_Populate,
-                 Test_DragAndDrop_Grade,
-                 Test_DraAndDrop_Compare_Positions]
-    suites = []
-    for testcase in testcases:
-        suites.append(unittest.TestLoader().loadTestsFromTestCase(testcase))
-    return unittest.TestSuite(suites)
-
-if __name__ == "__main__":
-    unittest.TextTestRunner(verbosity=2).run(suite())
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 0000000000..e985d3c2a6
--- /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 064c0c81f8..225d9aa46b 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -490,6 +490,15 @@ class ProblemBlock(
 
         return self.display_name
 
+    @property
+    def debug(self):
+        """
+        If CAPA block fails to render, we want course authors to be able to see
+        the error in Studio. At the same time, in production, we don't want
+        to show errors to students.
+        """
+        return getattr(self.runtime, 'is_author_mode', False) or settings.DEBUG
+
     @classmethod
     def filter_templates(cls, template, course):
         """
@@ -618,7 +627,6 @@ class ProblemBlock(
             get_python_lib_zip=None,
             DEBUG=None,
             i18n=self.runtime.service(self, "i18n"),
-            node_path=None,
             render_template=None,
             resources_fs=self.runtime.resources_fs,
             seed=None,
@@ -680,7 +688,6 @@ class ProblemBlock(
             get_python_lib_zip=(lambda: get_python_lib_zip(contentstore, self.runtime.course_id)),
             DEBUG=None,
             i18n=self.runtime.service(self, "i18n"),
-            node_path=None,
             render_template=None,
             resources_fs=self.runtime.resources_fs,
             seed=1,
@@ -827,9 +834,8 @@ class ProblemBlock(
             cache=cache_service,
             can_execute_unsafe_code=sandbox_service.can_execute_unsafe_code,
             get_python_lib_zip=sandbox_service.get_python_lib_zip,
-            DEBUG=self.runtime.DEBUG,
+            DEBUG=self.debug,
             i18n=self.runtime.service(self, "i18n"),
-            node_path=self.runtime.node_path,
             render_template=self.runtime.service(self, 'mako').render_template,
             resources_fs=self.runtime.resources_fs,
             seed=seed,  # Why do we do this if we have self.seed?
@@ -1063,8 +1069,7 @@ class ProblemBlock(
             str(err)
         )
 
-        # TODO (vshnayder): another switch on DEBUG.
-        if self.runtime.DEBUG:
+        if self.debug:
             msg = HTML(
                 '[courseware.capa.capa_module] '
                 'Failed to generate HTML for problem {url}'
@@ -1780,7 +1785,7 @@ class ProblemBlock(
             self.set_last_submission_time()
 
         except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
-            if self.runtime.DEBUG:
+            if self.debug:
                 log.warning(
                     "StudentInputError in capa_module:problem_check",
                     exc_info=True
@@ -1814,7 +1819,7 @@ class ProblemBlock(
             self.set_state_from_lcp()
             self.set_score(self.score_from_lcp(self.lcp))
 
-            if self.runtime.DEBUG:
+            if self.debug:
                 msg = f"Error checking problem: {str(err)}"
                 msg += f'\nTraceback:\n{traceback.format_exc()}'
                 return {'success': msg}
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 8136ad3c50..417b9060cc 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -532,14 +532,6 @@ class CourseFields:  # lint-amnesty, pylint: disable=missing-class-docstring
         scope=Scope.settings
     )
     has_children = True
-    info_sidebar_name = String(
-        display_name=_("Course Home Sidebar Name"),
-        help=_(
-            "Enter the heading that you want students to see above your course handouts on the Course Home page. "
-            "Your course handouts appear in the right panel of the page."
-        ),
-        deprecated=True,
-        scope=Scope.settings, default=_('Course Handouts'))
     show_timezone = Boolean(
         help=_(
             "True if timezones should be shown on dates in the course. "
diff --git a/common/lib/xmodule/xmodule/library_content_module.py b/common/lib/xmodule/xmodule/library_content_module.py
index e7f1fbaff2..599656e676 100644
--- a/common/lib/xmodule/xmodule/library_content_module.py
+++ b/common/lib/xmodule/xmodule/library_content_module.py
@@ -8,6 +8,7 @@ import logging
 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 web_fragments.fragment import Fragment
 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
@@ -176,6 +177,14 @@ class LibraryContentBlock(
         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):
@@ -346,6 +355,27 @@ class LibraryContentBlock(
 
         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
@@ -383,7 +413,11 @@ class LibraryContentBlock(
             '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/lti_2_util.py b/common/lib/xmodule/xmodule/lti_2_util.py
index 17dfe680c0..93faa807c7 100644
--- a/common/lib/xmodule/xmodule/lti_2_util.py
+++ b/common/lib/xmodule/xmodule/lti_2_util.py
@@ -12,6 +12,7 @@ import re
 from unittest import mock
 from urllib import parse
 
+from django.conf import settings
 from oauthlib.oauth1 import Client
 from webob import Response
 from xblock.core import XBlock
@@ -63,7 +64,7 @@ class LTI20BlockMixin:
         Returns:
             webob.response:  response to this request.  See above for details.
         """
-        if self.system.debug:
+        if settings.DEBUG:
             self._log_correct_authorization_header(request)
 
         if not self.accept_grades_past_due and self.is_past_due():
@@ -78,7 +79,7 @@ class LTI20BlockMixin:
         except LTIError:
             return Response(status=401)  # Unauthorized in this case.  401 is right
 
-        real_user = self.system.service(self, 'user').get_user_by_anonymous_id(anon_id)
+        real_user = self.runtime.service(self, 'user').get_user_by_anonymous_id(anon_id)
         if not real_user:  # that means we can't save to database, as we do not have real user id.
             msg = f"[LTI]: Real user not found against anon_id: {anon_id}"
             log.info(msg)
@@ -170,7 +171,7 @@ class LTI20BlockMixin:
             "@context": "http://purl.imsglobal.org/ctx/lis/v2/Result",
             "@type": "Result"
         }
-        self.system.rebind_noauth_module_to_user(self, real_user)
+        self.runtime.service(self, 'rebind_user').rebind_noauth_module_to_user(self, real_user)
         if self.module_score is None:  # In this case, no score has been ever set
             return Response(json.dumps(base_json_obj).encode('utf-8'), content_type=LTI_2_0_JSON_CONTENT_TYPE)
 
@@ -253,10 +254,10 @@ class LTI20BlockMixin:
         else:
             scaled_score = None
 
-        self.system.rebind_noauth_module_to_user(self, user)
+        self.runtime.service(self, 'rebind_user').rebind_noauth_module_to_user(self, user)
 
         # have to publish for the progress page...
-        self.system.publish(
+        self.runtime.publish(
             self,
             'grade',
             {
diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py
index a2174f1f67..71be6d6b75 100644
--- a/common/lib/xmodule/xmodule/lti_module.py
+++ b/common/lib/xmodule/xmodule/lti_module.py
@@ -65,6 +65,7 @@ from urllib import parse
 
 import bleach
 import oauthlib.oauth1
+from django.conf import settings
 from lxml import etree
 from oauthlib.oauth1.rfc5849 import signature
 from pkg_resources import resource_string
@@ -274,6 +275,7 @@ class LTIFields:
 @XBlock.needs("i18n")
 @XBlock.needs("mako")
 @XBlock.needs("user")
+@XBlock.needs("rebind_user")
 class LTIBlock(
     LTIFields,
     LTI20BlockMixin,
@@ -584,7 +586,7 @@ class LTIBlock(
         i4x-2-3-lti-31de800015cf4afb973356dbe81496df this part of resource_link_id:
         makes resource_link_id to be unique among courses inside same system.
         """
-        return str(parse.quote(f"{self.system.hostname}-{self.location.html_id()}"))  # lint-amnesty, pylint: disable=line-too-long
+        return str(parse.quote(f"{settings.LMS_BASE}-{self.location.html_id()}"))
 
     def get_lis_result_sourcedid(self):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
index 55623b217e..4b6331589e 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
@@ -97,7 +97,6 @@ class SplitModuleTest(unittest.TestCase):
             "fields": {
                 "tabs": [
                     CourseTab.load('courseware'),
-                    CourseTab.load('course_info'),
                     CourseTab.load('discussion'),
                     CourseTab.load('wiki'),
                 ],
@@ -147,7 +146,6 @@ class SplitModuleTest(unittest.TestCase):
                             "end": _date_field.from_json("2013-04-13T04:30"),
                             "tabs": [
                                 CourseTab.load('courseware'),
-                                CourseTab.load('course_info'),
                                 CourseTab.load('discussion'),
                                 CourseTab.load('wiki'),
                                 CourseTab.load(
@@ -320,7 +318,6 @@ class SplitModuleTest(unittest.TestCase):
             "fields": {
                 "tabs": [
                     CourseTab.load('courseware'),
-                    CourseTab.load('course_info'),
                     CourseTab.load('discussion'),
                     CourseTab.load('wiki'),
                 ],
@@ -417,7 +414,6 @@ class SplitModuleTest(unittest.TestCase):
             "fields": {
                 "tabs": [
                     CourseTab.load('courseware'),
-                    CourseTab.load('course_info'),
                     CourseTab.load('discussion'),
                     CourseTab.load('wiki'),
                 ],
@@ -581,7 +577,7 @@ class SplitModuleCourseTests(SplitModuleTest):
         course = self.findByIdInResult(courses, "head12345")
         assert course.location.org == 'testx'
         assert course.category == 'course', 'wrong category'
-        assert len(course.tabs) == 6, 'wrong number of tabs'
+        assert len(course.tabs) == 5, 'wrong number of tabs'
         assert course.display_name == 'The Ancient Greek Hero', 'wrong display name'
         assert course.advertised_start == 'Fall 2013', 'advertised_start'
         assert len(course.children) == 4, 'children'
@@ -635,7 +631,7 @@ class SplitModuleCourseTests(SplitModuleTest):
             assert course.location.course_key.org == 'testx'
             assert course.location.course_key.course == 'wonderful'
             assert course.category == 'course', 'wrong category'
-            assert len(course.tabs) == 4, 'wrong number of tabs'
+            assert len(course.tabs) == 3, 'wrong number of tabs'
             assert course.display_name == 'The most wonderful course', course.display_name
             assert course.advertised_start is None
             assert len(course.children) == 0, 'children'
@@ -665,7 +661,7 @@ class SplitModuleCourseTests(SplitModuleTest):
         assert course.location.course_key.org is None
         assert course.location.version_guid == head_course.previous_version
         assert course.category == 'course'
-        assert len(course.tabs) == 6
+        assert len(course.tabs) == 5
         assert course.display_name == 'The Ancient Greek Hero'
         assert course.graceperiod == datetime.timedelta(hours=2)
         assert course.advertised_start is None
@@ -681,7 +677,7 @@ class SplitModuleCourseTests(SplitModuleTest):
         assert course.location.course_key.course == 'GreekHero'
         assert course.location.course_key.run == 'run'
         assert course.category == 'course'
-        assert len(course.tabs) == 6
+        assert len(course.tabs) == 5
         assert course.display_name == 'The Ancient Greek Hero'
         assert course.advertised_start == 'Fall 2013'
         assert len(course.children) == 4
@@ -933,7 +929,7 @@ class SplitModuleItemTests(SplitModuleTest):
             assert block.location.org == 'testx'
             assert block.location.course == 'GreekHero'
             assert block.location.run == 'run'
-            assert len(block.tabs) == 6, 'wrong number of tabs'
+            assert len(block.tabs) == 5, 'wrong number of tabs'
             assert block.display_name == 'The Ancient Greek Hero'
             assert block.advertised_start == 'Fall 2013'
             assert len(block.children) == 4
diff --git a/common/lib/xmodule/xmodule/services.py b/common/lib/xmodule/xmodule/services.py
index be5534e1c1..a45ad61a44 100644
--- a/common/lib/xmodule/xmodule/services.py
+++ b/common/lib/xmodule/xmodule/services.py
@@ -4,10 +4,26 @@ Module contains various XModule/XBlock services
 
 
 import inspect
+import logging
+
+from functools import partial
 
 from config_models.models import ConfigurationModel
 from django.conf import settings
+from edx_when.field_data import DateLookupFieldData
 from xmodule.modulestore.django import modulestore
+from xblock.reference.plugins import Service
+from xblock.runtime import KvsFieldData
+
+
+from lms.djangoapps.courseware.field_overrides import OverrideFieldData
+from lms.djangoapps.courseware.model_data import DjangoKeyValueStore, FieldDataCache
+from lms.djangoapps.lms_xblock.field_data import LmsFieldData
+from lms.djangoapps.lms_xblock.models import XBlockAsidesConfig
+from openedx.core.lib.courses import get_course_by_id
+
+
+log = logging.getLogger(__name__)
 
 
 class SettingsService:
@@ -119,3 +135,91 @@ class TeamsConfigurationService:
         if not self._course:
             self._course = self.get_course(course_id)
         return self._course.teams_configuration
+
+
+class RebindUserServiceError(Exception):
+    pass
+
+
+class RebindUserService(Service):
+    """
+    An XBlock Service that allows modules to get rebound to real users if it was previously bound to an AnonymousUser.
+
+    This used to be a local function inside the `lms.djangoapps.courseware.module_render.get_module_system_for_user`
+    method, and was passed as a constructor argument to x_module.ModuleSystem. This has been refactored out into a
+    service to simplify the ModuleSystem and lives in this module temporarily.
+
+    TODO: Only the old LTI XBlock uses it in 2 places for LTI 2.0 integration. As the LTI XBlock is deprecated in
+    favour of the LTI Consumer XBlock, this should be removed when the LTI XBlock is removed.
+
+    Arguments:
+        user (User) - A Django User object
+        course_id (str) - Course ID
+        course (Course) - Course Object
+        get_module_system_for_user (function) - The helper function that will be called to create a module system
+            for a specfic user. This is the parent function from which this service was reactored out.
+            `lms.djangoapps.courseware.module_render.get_module_system_for_user`
+        kwargs (dict) - all the keyword arguments that need to be passed to the `get_module_system_for_user`
+            function when it is called during rebinding
+    """
+    def __init__(self, user, course_id, get_module_system_for_user, **kwargs):
+        super().__init__(**kwargs)
+        self.user = user
+        self.course_id = course_id
+        self._ref = {
+            "get_module_system_for_user": get_module_system_for_user
+        }
+        self._kwargs = kwargs
+
+    def rebind_noauth_module_to_user(self, block, real_user):
+        """
+        Function that rebinds the module to the real_user.
+
+        Will only work within a module bound to an AnonymousUser, e.g. one that's instantiated by the noauth_handler.
+
+        Arguments:
+            block (any xblock type):  the module to rebind
+            real_user (django.contrib.auth.models.User):  the user to bind to
+
+        Returns:
+            nothing (but the side effect is that module is re-bound to real_user)
+        """
+        if self.user.is_authenticated:
+            err_msg = "rebind_noauth_module_to_user can only be called from a module bound to an anonymous user"
+            log.error(err_msg)
+            raise RebindUserServiceError(err_msg)
+
+        field_data_cache_real_user = FieldDataCache.cache_for_descriptor_descendents(
+            self.course_id,
+            real_user,
+            block,
+            asides=XBlockAsidesConfig.possible_asides(),
+        )
+        student_data_real_user = KvsFieldData(DjangoKeyValueStore(field_data_cache_real_user))
+
+        with modulestore().bulk_operations(self.course_id):
+            course = modulestore().get_course(course_key=self.course_id)
+
+        (inner_system, inner_student_data) = self._ref["get_module_system_for_user"](
+            user=real_user,
+            student_data=student_data_real_user,  # These have implicit user bindings, rest of args considered not to
+            descriptor=block,
+            course_id=self.course_id,
+            course=course,
+            **self._kwargs
+        )
+
+        block.bind_for_student(
+            inner_system,
+            real_user.id,
+            [
+                partial(DateLookupFieldData, course_id=self.course_id, user=self.user),
+                partial(OverrideFieldData.wrap, real_user, course),
+                partial(LmsFieldData, student_data=inner_student_data),
+            ],
+        )
+
+        block.scope_ids = block.scope_ids._replace(user_id=real_user.id)
+        # now bind the module to the new ModuleSystem instance and vice-versa
+        block.runtime = inner_system
+        inner_system.xmodule_instance = block
diff --git a/common/lib/xmodule/xmodule/tabs.py b/common/lib/xmodule/xmodule/tabs.py
index 1292db60ac..56c3faaf08 100644
--- a/common/lib/xmodule/xmodule/tabs.py
+++ b/common/lib/xmodule/xmodule/tabs.py
@@ -382,7 +382,6 @@ class CourseTabList(List):
         within the course.
         """
         course_tabs = [
-            CourseTab.load('course_info'),
             CourseTab.load('courseware')
         ]
 
@@ -481,14 +480,18 @@ class CourseTabList(List):
     @classmethod
     def upgrade_tabs(cls, tabs):
         """
-        Reverse and Rename Courseware to Course and Course Info to Home Tabs.
+        Remove course_info tab, and rename courseware tab to Course if needed.
         """
         if tabs and len(tabs) > 1:
+            # Reverse them so that course_info is first, and rename courseware to Course
             if tabs[0].get('type') == 'courseware' and tabs[1].get('type') == 'course_info':
                 tabs[0], tabs[1] = tabs[1], tabs[0]
-                tabs[0]['name'] = _('Home')
                 tabs[1]['name'] = _('Course')
 
+            # NOTE: this check used for legacy courses containing the course_info tab. course_info
+            # should be removed according to https://github.com/openedx/public-engineering/issues/56.
+            if tabs[0].get('type') == 'course_info':
+                tabs.pop(0)
         return tabs
 
     @classmethod
@@ -499,22 +502,15 @@ class CourseTabList(List):
 
         Specific rules checked:
         - if no tabs specified, that's fine
-        - if tabs specified, first two must have type 'courseware' and 'course_info', in that order.
+        - if tabs specified, first must have type 'courseware'.
 
         """
         if tabs is None or len(tabs) == 0:
             return
 
-        if len(tabs) < 2:
-            raise InvalidTabsException(f"Expected at least two tabs.  tabs: '{tabs}'")
-
-        if tabs[0].get('type') != 'course_info':
+        if tabs[0].get('type') != 'courseware':
             raise InvalidTabsException(
-                f"Expected first tab to have type 'course_info'.  tabs: '{tabs}'")
-
-        if tabs[1].get('type') != 'courseware':
-            raise InvalidTabsException(
-                f"Expected second tab to have type 'courseware'.  tabs: '{tabs}'")
+                f"Expected first tab to have type 'courseware'.  tabs: '{tabs}'")
 
         # the following tabs should appear only once
         # TODO: don't import openedx capabilities from common
diff --git a/common/lib/xmodule/xmodule/templates/html/raw.yaml b/common/lib/xmodule/xmodule/templates/html/raw.yaml
index 8d4c78ca89..d844f15403 100644
--- a/common/lib/xmodule/xmodule/templates/html/raw.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/raw.yaml
@@ -6,7 +6,6 @@ data: |
       <p>This template is similar to the Text template. The only difference is 
       that this template opens in the Raw HTML editor rather than in the Visual
       editor.</p>
-
       <p>The Raw HTML editor saves your HTML exactly as you enter it.
       You can switch to the Visual editor by clicking the Settings tab and 
       changing the Editor setting to Visual. Note, however, that some of your 
diff --git a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
index 1f04d45f73..52e02c42bf 100644
--- a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
@@ -11,7 +11,7 @@ data: |
             <customresponse cfn="test_str" expect="python">
             <script type="text/python" system_path="python_lib">
     def test_str(expect, ans):
-      print expect, ans
+      print(expect, ans)
       ans = ans.strip("'")
       ans = ans.strip('"')
       return expect == ans.lower()
@@ -19,7 +19,7 @@ data: |
     def hint_fn(answer_ids, student_answers, new_cmap, old_cmap):
       aid = answer_ids[0]
       ans = str(student_answers[aid]).lower()
-      print 'hint_fn called, ans=', ans
+      print('hint_fn called, ans=', ans)
       hint = ''
       if 'java' in ans:
          hint = 'that is only good for drinking'
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index fd38c6f64d..6b5f903553 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -153,8 +153,6 @@ def get_test_system(
         static_url='/static',
         track_function=Mock(name='get_test_system.track_function'),
         get_module=get_module,
-        debug=True,
-        hostname="edx.org",
         services={
             'user': user_service,
             'mako': mako_service,
@@ -168,7 +166,6 @@ def get_test_system(
             ),
             'replace_urls': replace_url_service
         },
-        node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
         course_id=course_id,
         error_descriptor_class=ErrorBlock,
         descriptor_runtime=descriptor_system,
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index 26ff575f81..41acc05a93 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -17,6 +17,7 @@ import ddt
 import requests
 import webob
 from codejail.safe_exec import SafeExecException
+from django.test import override_settings
 from django.utils.encoding import smart_str
 from edx_user_state_client.interface import XBlockUserState
 from lxml import etree
@@ -961,6 +962,7 @@ class ProblemBlockTest(unittest.TestCase):  # lint-amnesty, pylint: disable=miss
             # but that this was considered the second attempt for grading purposes
             assert module.lcp.context['attempt'] == 2
 
+    @override_settings(DEBUG=True)
     def test_submit_problem_other_errors(self):
         """
         Test that errors other than the expected kinds give an appropriate message.
@@ -970,9 +972,6 @@ class ProblemBlockTest(unittest.TestCase):  # lint-amnesty, pylint: disable=miss
         # Create the module
         module = CapaFactory.create(attempts=1, user_is_staff=False)
 
-        # Ensure that DEBUG is on
-        module.system.DEBUG = True
-
         # Simulate answering a problem that raises the exception
         with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
             error_msg = "Superterrible error happened: ☠"
@@ -1711,9 +1710,6 @@ class ProblemBlockTest(unittest.TestCase):  # lint-amnesty, pylint: disable=miss
         # is asked to render itself as HTML
         module.lcp.get_html = Mock(side_effect=Exception("Test"))
 
-        # Turn off DEBUG
-        module.system.DEBUG = False
-
         # Try to render the module with DEBUG turned off
         html = module.get_problem_html()
 
@@ -1727,6 +1723,31 @@ class ProblemBlockTest(unittest.TestCase):  # lint-amnesty, pylint: disable=miss
         # Expect that the module has created a new dummy problem with the error
         assert original_problem != module.lcp
 
+    def test_get_problem_html_error_preview(self):
+        """
+        Test the html response when an error occurs with DEBUG off in Studio.
+        """
+        render_template = Mock(return_value="<div>Test Template HTML</div>")
+        module = CapaFactory.create(render_template=render_template)
+
+        # Simulate throwing an exception when the capa problem
+        # is asked to render itself as HTML
+        error_msg = "Superterrible error happened: ☠"
+        module.lcp.get_html = Mock(side_effect=Exception(error_msg))
+
+        module.system.is_author_mode = True
+
+        # Try to render the module with the author mode turned on
+        html = module.get_problem_html()
+
+        assert html is not None
+
+        # Check the rendering context
+        render_args, _ = render_template.call_args
+        context = render_args[1]
+        assert error_msg in context['problem']['html']
+
+    @override_settings(DEBUG=True)
     def test_get_problem_html_error_w_debug(self):
         """
         Test the html response when an error occurs with DEBUG on
@@ -1739,9 +1760,6 @@ class ProblemBlockTest(unittest.TestCase):  # lint-amnesty, pylint: disable=miss
         error_msg = "Superterrible error happened: ☠"
         module.lcp.get_html = Mock(side_effect=Exception(error_msg))
 
-        # Make sure DEBUG is on
-        module.system.DEBUG = True
-
         # Try to render the module with DEBUG turned on
         html = module.get_problem_html()
 
diff --git a/common/lib/xmodule/xmodule/tests/test_library_content.py b/common/lib/xmodule/xmodule/tests/test_library_content.py
index 628f471e88..748a962f1d 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 @@ Basic unit tests for LibraryContentBlock
 
 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 lxml import etree
 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.modulestore.tests.utils import MixedSplitTestCase
 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 @@ class TestLibraryContentExportImport(LibraryContentTest):
         self._verify_xblock_properties(imported_lc_block)
 
 
+@ddt.ddt
 class LibraryContentBlockTestMixin:
     """
     Basic unit tests for LibraryContentBlock
@@ -378,6 +383,45 @@ class LibraryContentBlockTestMixin:
         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_lti20_unit.py b/common/lib/xmodule/xmodule/tests/test_lti20_unit.py
index aca04ea955..253945cb6d 100644
--- a/common/lib/xmodule/xmodule/tests/test_lti20_unit.py
+++ b/common/lib/xmodule/xmodule/tests/test_lti20_unit.py
@@ -24,12 +24,12 @@ class LTI20RESTResultServiceTest(unittest.TestCase):
 
     def setUp(self):
         super().setUp()
-        self.system = get_test_system(user=self.USER_STANDIN)
+        self.runtime = get_test_system(user=self.USER_STANDIN)
         self.environ = {'wsgi.url_scheme': 'http', 'REQUEST_METHOD': 'POST'}
-        self.system.publish = Mock()
-        self.system.rebind_noauth_module_to_user = Mock()
+        self.runtime.publish = Mock()
+        self.runtime._services['rebind_user'] = Mock()  # pylint: disable=protected-access
 
-        self.xmodule = LTIBlock(self.system, DictFieldData({}), Mock())
+        self.xmodule = LTIBlock(self.runtime, DictFieldData({}), Mock())
         self.lti_id = self.xmodule.lti_id
         self.xmodule.due = None
         self.xmodule.graceperiod = None
@@ -250,7 +250,7 @@ class LTI20RESTResultServiceTest(unittest.TestCase):
         assert response.status_code == 200
         assert self.xmodule.module_score is None
         assert self.xmodule.score_comment == ''
-        (_, evt_type, called_grade_obj), _ = self.system.publish.call_args  # pylint: disable=unpacking-non-sequence
+        (_, evt_type, called_grade_obj), _ = self.runtime.publish.call_args  # pylint: disable=unpacking-non-sequence
         assert called_grade_obj ==\
                {'user_id': self.USER_STANDIN.id, 'value': None, 'max_value': None, 'score_deleted': True}
         assert evt_type == 'grade'
@@ -271,7 +271,7 @@ class LTI20RESTResultServiceTest(unittest.TestCase):
         assert response.status_code == 200
         assert self.xmodule.module_score is None
         assert self.xmodule.score_comment == ''
-        (_, evt_type, called_grade_obj), _ = self.system.publish.call_args  # pylint: disable=unpacking-non-sequence
+        (_, evt_type, called_grade_obj), _ = self.runtime.publish.call_args  # pylint: disable=unpacking-non-sequence
         assert called_grade_obj ==\
                {'user_id': self.USER_STANDIN.id, 'value': None, 'max_value': None, 'score_deleted': True}
         assert evt_type == 'grade'
@@ -288,7 +288,7 @@ class LTI20RESTResultServiceTest(unittest.TestCase):
         assert response.status_code == 200
         assert self.xmodule.module_score == 0.1
         assert self.xmodule.score_comment == 'ಠ益ಠ'
-        (_, evt_type, called_grade_obj), _ = self.system.publish.call_args  # pylint: disable=unpacking-non-sequence
+        (_, evt_type, called_grade_obj), _ = self.runtime.publish.call_args  # pylint: disable=unpacking-non-sequence
         assert evt_type == 'grade'
         assert called_grade_obj ==\
                {'user_id': self.USER_STANDIN.id, 'value': 0.1, 'max_value': 1.0, 'score_deleted': False}
@@ -370,7 +370,7 @@ class LTI20RESTResultServiceTest(unittest.TestCase):
         Test that we get a 404 when the supplied user does not exist
         """
         self.setup_system_xmodule_mocks_for_lti20_request_test()
-        self.system._services['user'] = StubUserService(user=None)  # pylint: disable=protected-access
+        self.runtime._services['user'] = StubUserService(user=None)  # pylint: disable=protected-access
         mock_request = self.get_signed_lti20_mock_request(self.GOOD_JSON_PUT)
         response = self.xmodule.lti_2_0_result_rest_handler(mock_request, "user/abcd")
         assert response.status_code == 404
diff --git a/common/lib/xmodule/xmodule/tests/test_lti_unit.py b/common/lib/xmodule/xmodule/tests/test_lti_unit.py
index 103cdaeb53..2ca2a6492c 100644
--- a/common/lib/xmodule/xmodule/tests/test_lti_unit.py
+++ b/common/lib/xmodule/xmodule/tests/test_lti_unit.py
@@ -3,12 +3,14 @@
 
 import datetime
 import textwrap
-import unittest
 from copy import copy
 from unittest.mock import Mock, PropertyMock, patch
 from urllib import parse
 
+
 import pytest
+from django.conf import settings
+from django.test import TestCase, override_settings
 from lxml import etree
 from opaque_keys.edx.locator import BlockUsageLocator
 from pytz import UTC
@@ -16,6 +18,7 @@ from webob.request import Request
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
 
+
 from common.djangoapps.xblock_django.constants import ATTR_KEY_ANONYMOUS_USER_ID
 from xmodule.fields import Timedelta
 from xmodule.lti_2_util import LTIError
@@ -25,7 +28,8 @@ from xmodule.tests.helpers import StubUserService
 from . import get_test_system
 
 
-class LTIBlockTest(unittest.TestCase):
+@override_settings(LMS_BASE="edx.org")
+class LTIBlockTest(TestCase):
     """Logic tests for LTI module."""
 
     def setUp(self):
@@ -59,7 +63,7 @@ class LTIBlockTest(unittest.TestCase):
             """)
         self.system = get_test_system()
         self.system.publish = Mock()
-        self.system.rebind_noauth_module_to_user = Mock()
+        self.system._services['rebind_user'] = Mock()  # pylint: disable=protected-access
 
         self.xmodule = LTIBlock(
             self.system,
@@ -69,8 +73,9 @@ class LTIBlockTest(unittest.TestCase):
         current_user = self.system.service(self.xmodule, 'user').get_current_user()
         self.user_id = current_user.opt_attrs.get(ATTR_KEY_ANONYMOUS_USER_ID)
         self.lti_id = self.xmodule.lti_id
+
         self.unquoted_resource_link_id = '{}-i4x-2-3-lti-31de800015cf4afb973356dbe81496df'.format(
-            self.xmodule.runtime.hostname
+            settings.LMS_BASE
         )
 
         sourced_id = ':'.join(parse.quote(i) for i in (self.lti_id, self.unquoted_resource_link_id, self.user_id))  # lint-amnesty, pylint: disable=line-too-long
diff --git a/common/lib/xmodule/xmodule/tests/test_tabs.py b/common/lib/xmodule/xmodule/tests/test_tabs.py
new file mode 100644
index 0000000000..b38292d659
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_tabs.py
@@ -0,0 +1,117 @@
+"""
+Tests for CourseTabsListTestCase.
+"""
+from unittest import TestCase
+import ddt
+
+from xmodule.tabs import CourseTabList, InvalidTabsException
+
+
+@ddt.ddt
+class CourseTabsListTestCase(TestCase):
+    """
+    Class containing CourseTabsListTestCase tests.
+    """
+
+    @ddt.data(
+        [
+            [],
+            []
+        ],
+        [
+            [
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Courseware'},
+                {'type': 'course_info', 'course_staff_only': False, 'name': 'Course Info'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+            [
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+        ],
+        [
+            [
+                {'type': 'course_info', 'course_staff_only': False, 'name': 'Home'},
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+            [
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+        ]
+    )
+    @ddt.unpack
+    def test_upgrade_tabs(self, tabs, expected_result):
+        CourseTabList.upgrade_tabs(tabs)
+        self.assertEqual(tabs, expected_result)
+
+    @ddt.data(
+        [
+            [],
+            True
+        ],
+        [
+            [
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+            ],
+            True
+        ],
+        [
+            [
+                {'type': 'course_info', 'course_staff_only': False, 'name': 'Home'},
+            ],
+            False
+        ],
+        [
+            [
+                {'type': 'course_info', 'course_staff_only': False, 'name': 'Home'},
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+            False
+        ],
+        [
+            [
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+            False
+        ],
+        [
+            [
+                {'type': 'courseware', 'course_staff_only': False, 'name': 'Course'},
+                {'type': 'discussion', 'course_staff_only': False, 'name': 'Discussion'},
+                {'type': 'wiki', 'course_staff_only': False, 'name': 'Wiki'},
+                {'type': 'textbooks', 'course_staff_only': False, 'name': 'Textbooks'},
+                {'type': 'progress', 'course_staff_only': False, 'name': 'Progress'}
+            ],
+            True
+        ]
+    )
+    @ddt.unpack
+    def test_validate_tabs(self, tabs, expected_success):
+        if not expected_success:
+            with self.assertRaises(InvalidTabsException):
+                CourseTabList.validate_tabs(tabs)
+        else:
+            CourseTabList.validate_tabs(tabs)
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 307d7c8155..adff5c8635 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -1609,6 +1609,47 @@ class ModuleSystemShim:
         )
         return self.resources_fs
 
+    @property
+    def node_path(self):
+        """
+        Path to node_modules. Doesn't seem to be used by any ModuleSystem dependent core XBlock anymore.
+
+        Deprecated.
+        """
+        warnings.warn(
+            'node_path is deprecated. Please use other methods of finding the node_modules location.',
+            DeprecationWarning, stacklevel=3
+        )
+
+    @property
+    def hostname(self):
+        """
+        Hostname of the site as set in the Django settings `LMS_BASE`
+        Deprecated in favour of direct import of `django.conf.settings`
+        """
+        warnings.warn(
+            'runtime.hostname is deprecated. Please use `LMS_BASE` from `django.conf.settings`.',
+            DeprecationWarning, stacklevel=3,
+        )
+        from django.conf import settings
+        return settings.LMS_BASE
+
+    @property
+    def rebind_noauth_module_to_user(self):
+        """
+        A function that was used to bind modules initialized by AnonymousUsers to real users. Mainly used
+        by the LTI Module to connect the right users with the requests from LTI tools.
+
+        Deprecated in favour of the "rebind_user" service.
+        """
+        warnings.warn(
+            "rebind_noauth_module_to_user is deprecated. Please use the 'rebind_user' service instead.",
+            DeprecationWarning, stacklevel=3
+        )
+        rebind_user_service = self._services.get('rebind_user')
+        if rebind_user_service:
+            return partial(rebind_user_service.rebind_noauth_module_to_user)
+
 
 class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, ModuleSystemShim, Runtime):
     """
@@ -1624,11 +1665,17 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, ModuleSystemShim,
     """
 
     def __init__(
-            self, static_url, track_function, get_module,
-            descriptor_runtime, debug=False, hostname="", publish=None,
-            node_path="", course_id=None, error_descriptor_class=None,
-            field_data=None, rebind_noauth_module_to_user=None,
-            **kwargs):
+        self,
+        static_url,
+        track_function,
+        get_module,
+        descriptor_runtime,
+        publish=None,
+        course_id=None,
+        error_descriptor_class=None,
+        field_data=None,
+        **kwargs,
+    ):
         """
         Create a closure around the system environment.
 
@@ -1652,9 +1699,6 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, ModuleSystemShim,
         error_descriptor_class - The class to use to render XModules with errors
 
         field_data - the `FieldData` to use for backing XBlock storage.
-
-        rebind_noauth_module_to_user - rebinds module bound to AnonymousUser to a real user...used in LTI
-           modules, which have an anonymous handler, to set legitimate users' data
         """
 
         # Usage_store is unused, and field_data is often supplanted with an
@@ -1666,9 +1710,6 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, ModuleSystemShim,
         self.STATIC_URL = static_url
         self.track_function = track_function
         self.get_module = get_module
-        self.DEBUG = self.debug = debug
-        self.HOSTNAME = self.hostname = hostname
-        self.node_path = node_path
         self.course_id = course_id
 
         if publish:
@@ -1677,7 +1718,6 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, ModuleSystemShim,
         self.xmodule_instance = None
 
         self.descriptor_runtime = descriptor_runtime
-        self.rebind_noauth_module_to_user = rebind_noauth_module_to_user
 
     def get(self, attr):
         """	provide uniform access to attributes (like etree)."""
diff --git a/common/test/data/scoreable/policies/course/policy.json b/common/test/data/scoreable/policies/course/policy.json
index e177e5d444..714366c0f0 100644
--- a/common/test/data/scoreable/policies/course/policy.json
+++ b/common/test/data/scoreable/policies/course/policy.json
@@ -27,10 +27,6 @@
         "minimum_grade_credit": 0.8,
         "start": "2030-01-01T00:00:00Z",
         "tabs": [
-            {
-                "name": "Home",
-                "type": "course_info"
-            },
             {
                 "name": "Course",
                 "type": "courseware"
diff --git a/common/test/test-theme/lms/templates/courseware/courses.html b/common/test/test-theme/lms/templates/courseware/courses.html
index 0500a293df..c21f247d89 100644
--- a/common/test/test-theme/lms/templates/courseware/courses.html
+++ b/common/test/test-theme/lms/templates/courseware/courses.html
@@ -3,6 +3,6 @@
 # Include template which does not exist in the theme.
 <%include file="/courseware/error-message.html" />
 # Include template which is overriden in the theme.
-<%include file="/courseware/info.html" />
+<%include file="/courseware/progress.html" />
 # Include custom template which only exists in the theme.
 <%include file="/courseware/test-theme-custom.html" />
diff --git a/common/test/test-theme/lms/templates/courseware/info.html b/common/test/test-theme/lms/templates/courseware/info.html
deleted file mode 100644
index b47b665532..0000000000
--- a/common/test/test-theme/lms/templates/courseware/info.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<%page expression_filter="h"/>
-<p>This overrides the courseware/info.html template.</p>
diff --git a/common/test/test-theme/lms/templates/courseware/progress.html b/common/test/test-theme/lms/templates/courseware/progress.html
new file mode 100644
index 0000000000..29c3baf550
--- /dev/null
+++ b/common/test/test-theme/lms/templates/courseware/progress.html
@@ -0,0 +1,2 @@
+<%page expression_filter="h"/>
+<p>This overrides the courseware/progress.html template.</p>
diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo
index bf214c3961..ddfd6a01b8 100644
Binary files a/conf/locale/ar/LC_MESSAGES/django.mo and b/conf/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
index 418c6772d5..5cc7520111 100644
--- a/conf/locale/ar/LC_MESSAGES/django.po
+++ b/conf/locale/ar/LC_MESSAGES/django.po
@@ -252,7 +252,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: NELC Open edX Translation <openedx@elc.edu.sa>, 2020\n"
 "Language-Team: Arabic (https://www.transifex.com/open-edx/teams/6205/ar/)\n"
@@ -2409,6 +2409,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "سواء يجب أن يظهر زرّ ’حفظ‘ على الصفحة أم لا"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "آظهر زرّ إعادة الضبط"
 
@@ -3972,6 +3973,12 @@ msgstr ""
 "يُرجى اختيار نوع مسألة معيّن لجلبه من المكتبة. لا يجري تطبيق أي ترشيح في حال"
 " اخترت ’أي نوع\"‘ أو ’Any Type‘."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "انقضت مدّة هذا المكوِّن. حُدّثت المكتبة بمحتوى جديد الآن. "
@@ -6923,17 +6930,6 @@ msgstr "تهانينا، لقد تأهلت للحصول على شهادة!"
 msgid "You've earned a certificate for this course."
 msgstr "لقد حصلت على شهادة في هذا المساق."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "الشهادة غير متاحة "
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr "لم تحصل على شهادتك لأنك لم تقم بتأكيد هويتك في {platform_name}."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "ستكون شهادتك متاحة قريبًا!"
@@ -6950,6 +6946,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "شهادتك جاهزة"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "الشهادة غير متاحة "
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr "لم تحصل على شهادتك لأنك لم تقم بتأكيد هويتك في {platform_name}."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7099,9 +7106,11 @@ msgid "Good"
 msgstr "جيّد"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7109,6 +7118,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9150,13 +9164,11 @@ msgid "You have signed out."
 msgstr "لقد قمت بتسجيل خروجك."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}أُنقر{end_anchor} لحذف جلسة (SSO) لتسجيل الدخول الفردي الخاص "
-"بك."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9172,13 +9184,12 @@ msgstr ""
 "هذا قد يستغرق دقيقة واحدة. إذا لم تتم إعادة توجيهك، فانتقل إلى الصفحة الرئيسية."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"إذا لم تتم إعادة توجيهك خلال ٥ ثوان، {start_anchor} انقر هنا للذهاب إلى "
-"الصفحة الرئيسية {end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11471,6 +11482,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "لا يمكن تعديل الحقل '{field_name}'."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "يُرجى إدخال اسم مستخدم صحيح:"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11971,10 +11987,6 @@ msgstr "رمز الدخول ’access_token‘ غير صحيح. "
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "لا يمكن أن يحتوي الاسم الكامل على الأحرف التالية: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "يُرجى إدخال اسم مستخدم صحيح:"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "يجب إدخال عنوان بريد إلكتروني بصيغة ملائمة"
@@ -14735,6 +14747,10 @@ msgstr "ينتهي في {date}"
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "تحميل مشغّل الفيديو"
@@ -16539,8 +16555,8 @@ msgid "Share with friends and family!"
 msgstr "شارِك ذلك مع الأصدقاء والعائلة!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "سجّلتُ لتوّي في {number} {title} باستخدام الحساب {url} :{account}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.mo b/conf/locale/ar/LC_MESSAGES/djangojs.mo
index 5d4c26755f..3e30595f16 100644
Binary files a/conf/locale/ar/LC_MESSAGES/djangojs.mo and b/conf/locale/ar/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.po b/conf/locale/ar/LC_MESSAGES/djangojs.po
index bcf7ee0789..e7c8f572ab 100644
--- a/conf/locale/ar/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ar/LC_MESSAGES/djangojs.po
@@ -189,7 +189,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Roaa Nader <roaanader002005@gmail.com>, 2021\n"
 "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n"
@@ -448,11 +448,11 @@ msgstr "جاري تحديث المحتوى"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "جاري التحميل..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "الكتل المحددة"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2203,7 +2203,7 @@ msgstr "انتقل لأعلى"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "التصفح"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2787,19 +2787,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "التفاصيل"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "بأسرع وقت ممكن للرد والمساعدة!"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "إنشاء تذكرة دعم"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "كيف يمكننا مساعدتك، {username}؟"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2807,7 +2807,7 @@ msgstr "يُرجى تسجيل الدخول إلى {platform} لنتمكن من 
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "هل تحتاج مساعدة في تسجيل الدخول؟"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3712,52 +3712,47 @@ msgstr "ساهم معنا في تطوير تجربة استخدام edX للجم
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "لماذا تجمع edX هذه المعلومات؟"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"حدث خطأ أثناء محاولة استرداد أو حفظ المعلومات أدناه، يرجى المحاولة مرة أخرى "
-"لاحقًا."
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
 msgstr ""
-"ما مجموع الدخل العام خلال الاثنا عشر شهرًا الماضية لجميع أفراد عائلتك؟"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"هل سبق أن قمت بالخدمة العسكرية في القوات المسلحة أو الجيش الوطني أو القوة "
-"الاحتياطية؟"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
-msgstr "ما المستوى التعليمي الأعلى الذي حصلت عليه؟"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
-msgstr "ما المستوى التعليمي الأعلى الذي حصل عليه أحد والديك / الوصي عليك؟"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "فضلًا حدد حالتك الوظيفية"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "ماهو مجال عملك حاليًا؟"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "ما المجال الذي ترغب العمل به؟"
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3773,19 +3768,19 @@ msgstr "إغلاق الاستبيان"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "الإنهاء لاحقًا"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "العودة إلى لوحة معلوماتي"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "الإنهاء لاحقًا"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "الصفحة التالية"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -6096,25 +6091,24 @@ msgstr "نأسف لحدوث خطأ في عملية التحميل."
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "المؤسّسة:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "رقم المساق:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "تشغيل المساق:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(للقراءة فقط)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "مساق مشغَّل مرّة أخرى"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "عرض النسخة الحالية المنشورة"
diff --git a/conf/locale/ca/LC_MESSAGES/django.mo b/conf/locale/ca/LC_MESSAGES/django.mo
index d995bb794c..e44f23ed1a 100644
Binary files a/conf/locale/ca/LC_MESSAGES/django.mo and b/conf/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ca/LC_MESSAGES/django.po b/conf/locale/ca/LC_MESSAGES/django.po
index 8e6ff7756a..925476518f 100644
--- a/conf/locale/ca/LC_MESSAGES/django.po
+++ b/conf/locale/ca/LC_MESSAGES/django.po
@@ -66,7 +66,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/open-edx/teams/6205/ca/)\n"
@@ -2019,6 +2019,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3360,6 +3361,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -5973,17 +5980,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -5998,6 +5994,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6140,9 +6147,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6150,6 +6159,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8037,10 +8051,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8055,10 +8069,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: cms/templates/base.html lms/templates/main.html
@@ -10194,6 +10209,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10634,10 +10654,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -13315,6 +13331,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Càrrega de reproductor de vídeo"
@@ -15170,8 +15190,8 @@ msgid "Share with friends and family!"
 msgstr "Comparteix-ho amb amics i familiars!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Acabo d'inscriure en {number} {title} a través de {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/ca/LC_MESSAGES/djangojs.po b/conf/locale/ca/LC_MESSAGES/djangojs.po
index 7688b8e8a1..cce23d30ee 100644
--- a/conf/locale/ca/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ca/LC_MESSAGES/djangojs.po
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Catalan (http://www.transifex.com/open-edx/edx-platform/language/ca/)\n"
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.mo b/conf/locale/de_DE/LC_MESSAGES/django.mo
index d993922d67..6a140f0a61 100644
Binary files a/conf/locale/de_DE/LC_MESSAGES/django.mo and b/conf/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.po b/conf/locale/de_DE/LC_MESSAGES/django.po
index cc965f0bbb..21b737a7f8 100644
--- a/conf/locale/de_DE/LC_MESSAGES/django.po
+++ b/conf/locale/de_DE/LC_MESSAGES/django.po
@@ -173,7 +173,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Stefania Trabucchi <stefania.trabucchi@abstract-technology.de>, 2019\n"
 "Language-Team: German (Germany) (https://www.transifex.com/open-edx/teams/6205/de_DE/)\n"
@@ -2305,6 +2305,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Zwang der Anzeige des Speichern-Knopfes auf der Seite"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Zurücksetzen-Schaltfläche anzeigen"
 
@@ -3916,6 +3917,12 @@ msgstr ""
 "Wählen Sie einen Problemtyp aus, den Sie aus der Bibliothek holen möchten. "
 "Wenn \"Any Type\" ausgewählt ist, wird keine Filterung angewendet."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Die Aufgabe ist abgelaufen. Die Bibliothek hat neue Inhalte."
@@ -6959,19 +6966,6 @@ msgstr "Gratulation, du hast Dich für ein Zertifikat qualifiziert!"
 msgid "You've earned a certificate for this course."
 msgstr "Sie haben ein Zertifikat für diesen Kurs erhalten."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Zertifikat nicht verfügbar"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Sie können keine Zertifikate erhalten, da Ihr Konto bei der {platform_name} "
-"noch nicht verifiziert wurde."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6986,6 +6980,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Dein Zertifikat ist verfügbar"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Zertifikat nicht verfügbar"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Sie können keine Zertifikate erhalten, da Ihr Konto bei der {platform_name} "
+"noch nicht verifiziert wurde."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7147,9 +7154,11 @@ msgid "Good"
 msgstr "Gut"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7157,6 +7166,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9240,13 +9254,11 @@ msgid "You have signed out."
 msgstr "Sie sind ausgeloggt. "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}Klicken Sie hier{end_anchor}, um Ihre Single Sign On (SSO) "
-"Sitzung zu löschen."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9263,13 +9275,12 @@ msgstr ""
 "                "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Wenn Sie nicht innerhalb von 5 Sekunden weitergeleitet werden, "
-"{start_anchor}klicken Sie hier, um zur Startseite zu gelangen{end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11615,6 +11626,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Das Feld '{field_name}' kann nicht editiert werden."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -12124,10 +12140,6 @@ msgstr "Der angegebene access_token ist ungültig."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Der vollständige Name darf folgende Zeichen nicht enthalten: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Eine korrekt formatierte E-Mail-Adresse ist nötig."
@@ -14913,6 +14925,10 @@ msgstr "Abgabe am  {date}"
 msgid "Past due"
 msgstr "Überfällig"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Video laden"
@@ -16827,10 +16843,8 @@ msgid "Share with friends and family!"
 msgstr "Über Netzwerke teilen!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
-"Ich habe mich gerade eingeschrieben in {number} {title} mittels {account}: "
-"{url}"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/de_DE/LC_MESSAGES/djangojs.mo b/conf/locale/de_DE/LC_MESSAGES/djangojs.mo
index 41c02392c4..f128c2bdd3 100644
Binary files a/conf/locale/de_DE/LC_MESSAGES/djangojs.mo and b/conf/locale/de_DE/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/de_DE/LC_MESSAGES/djangojs.po b/conf/locale/de_DE/LC_MESSAGES/djangojs.po
index e115ab7fb8..f8e6d5e42a 100644
--- a/conf/locale/de_DE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/de_DE/LC_MESSAGES/djangojs.po
@@ -130,7 +130,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Stefania Trabucchi <stefania.trabucchi@abstract-technology.de>, 2018-2021\n"
 "Language-Team: German (Germany) (http://www.transifex.com/open-edx/edx-platform/language/de_DE/)\n"
@@ -390,11 +390,11 @@ msgstr "Aktualisiere mit den neuesten Bibliotheken"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "Lade..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "Ausgewählte Blöcke"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2112,7 +2112,7 @@ msgstr "Aufwärts navigieren"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Durchsuchen"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2691,19 +2691,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Details"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "desto schneller und gezielter können wir Ihnen antworten!"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "Erstellen Sie ein Supportticket"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Wie können wir Ihnen helfen, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2713,7 +2713,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Brauchen Sie Hilfe beim einloggen?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3614,55 +3614,47 @@ msgstr "Wollen Sie helfen, edX zu verbessern?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "Warum braucht edX diese Information?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"Beim Versuch, die nachstehenden Informationen abzurufen oder zu speichern, "
-"ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal."
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
 msgstr ""
-"Wie hoch war das gemeinsame Gesamteinkommen aller Mitglieder Ihrer Familie "
-"in den letzten 12 Monaten? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"Haben Sie jemals im aktiven Dienst in den US-Streitkräften, Reserven oder "
-"der Nationalgarde gedient?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
-msgstr "Was ist der höchste Bildungsabschluss, den Sie erreicht haben?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
 msgstr ""
-"Welches ist der höchste Bildungsabschluss, den ein Elternteil oder "
-"Erziehungsberechtigter von Ihnen erreicht hat?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "Wählen Sie Ihren Beschäftigungsstatus"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "In welcher Branche arbeiten Sie derzeit?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "In welcher Branchen wollen Sie arbeiten?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3678,19 +3670,19 @@ msgstr "Fragebogen schließen"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "Später beenden"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "Zurück zu meinem Dashboard"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "Später beenden"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "nächste Seite"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -6063,28 +6055,27 @@ msgstr "Es gab einen Fehler beim Upload"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organisation:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Kursnummer:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Kurslaufzeit:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Nur Lesezugriff)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Neue Kurslaufzeit"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
-msgstr "Live betrachten"
+msgstr "Seite ansehen"
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
diff --git a/conf/locale/el/LC_MESSAGES/django.mo b/conf/locale/el/LC_MESSAGES/django.mo
index 9c6f66e5f2..81e114e0dd 100644
Binary files a/conf/locale/el/LC_MESSAGES/django.mo and b/conf/locale/el/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/el/LC_MESSAGES/django.po b/conf/locale/el/LC_MESSAGES/django.po
index 8f19360f1c..6b9e44bec0 100644
--- a/conf/locale/el/LC_MESSAGES/django.po
+++ b/conf/locale/el/LC_MESSAGES/django.po
@@ -14,6 +14,7 @@
 # Georgios Vasileiadis <gvasileiadis@outlook.com.gr>, 2014
 # Katerina Ligkovanli <kaligova@gmail.com>, 2016-2021
 # Konstantina Samara <kon.samara@hotmail.com>, 2015
+# Konstantinos Fragoulis, 2022
 # kostas kalatzis <koskalat@gmail.com>, 2015
 # Nick Gikopoulos, 2014-2017
 # Panos Chronis <panosfyra4@yahoo.gr>, 2014
@@ -90,7 +91,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Greek (https://www.transifex.com/open-edx/teams/6205/el/)\n"
@@ -2109,6 +2110,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3465,6 +3467,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -6129,17 +6137,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6154,6 +6151,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6293,9 +6301,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6303,6 +6313,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8219,10 +8234,10 @@ msgid "You have signed out."
 msgstr "Έχετε αποσυνδεθεί."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8237,13 +8252,12 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Αν δεν ανακατευθυνθείτε αυτόματα εντός 5 δευτερολέπτων,  {start_anchor}κάντε"
-" κλικ εδώ για να μεταφερθείτε στην αρχική σελίδα{end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -10380,6 +10394,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10862,10 +10881,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Απαιτείται μία έγκυρη διεύθυνση e-mail"
@@ -13489,6 +13504,10 @@ msgstr "είναι ληξιπρόθεσμη στις {date}"
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr ""
@@ -14979,8 +14998,8 @@ msgid "Share with friends and family!"
 msgstr "Ενημερώστε τους φίλους σας!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Μόλις εγγράφηκα στο μάθημα {number} {title} του {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/el/LC_MESSAGES/djangojs.mo b/conf/locale/el/LC_MESSAGES/djangojs.mo
index 995e207b44..ff29b33b4b 100644
Binary files a/conf/locale/el/LC_MESSAGES/djangojs.mo and b/conf/locale/el/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/el/LC_MESSAGES/djangojs.po b/conf/locale/el/LC_MESSAGES/djangojs.po
index b3636df773..d938f630c0 100644
--- a/conf/locale/el/LC_MESSAGES/djangojs.po
+++ b/conf/locale/el/LC_MESSAGES/djangojs.po
@@ -83,7 +83,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Ioannis Stavrakakis <gsalone@gmail.com>, 2020\n"
 "Language-Team: Greek (http://www.transifex.com/open-edx/edx-platform/language/el/)\n"
@@ -2554,7 +2554,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Ξεχάσατε τον κωδικό σας;"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -5615,8 +5615,9 @@ msgid "Re-run Course"
 msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
+#: cms/templates/js/show-textbook.underscore
 msgid "View Live"
-msgstr "Παρακολουθήστε ζωντανά"
+msgstr ""
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po
index 0d21f1b88e..2512e007f0 100644
--- a/conf/locale/en/LC_MESSAGES/django.po
+++ b/conf/locale/en/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-29 20:42+0000\n"
-"PO-Revision-Date: 2022-05-29 20:42:17.222392\n"
+"POT-Creation-Date: 2022-06-13 20:01+0000\n"
+"PO-Revision-Date: 2022-06-13 20:01:05.089992\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: en\n"
@@ -49,6 +49,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.8.0\n"
 
+#: cms/djangoapps/contentstore/utils.py
+#: cms/djangoapps/contentstore/views/component.py
+#: cms/djangoapps/contentstore/views/item.py
+#: common/lib/xmodule/xmodule/html_module.py
+msgid "Text"
+msgstr ""
+
 #. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
 #. Translators: 'Discussion' refers to the tab in the courseware that leads to
 #. the discussion forums
@@ -62,11 +69,6 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: cms/djangoapps/contentstore/views/component.py
-#: common/lib/xmodule/xmodule/html_module.py
-msgid "Text"
-msgstr ""
-
 #: cms/djangoapps/contentstore/views/component.py
 #: openedx/core/djangoapps/content_libraries/constants.py
 msgid "Problem"
@@ -1995,6 +1997,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -2687,22 +2690,6 @@ msgstr ""
 msgid "Enter the names of the advanced modules to use in your course."
 msgstr ""
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Course Home Sidebar Name"
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter the heading that you want students to see above your course handouts "
-"on the Course Home page. Your course handouts appear in the right panel of "
-"the page."
-msgstr ""
-
-#: common/lib/xmodule/xmodule/course_module.py
-#: lms/templates/courseware/info.html
-msgid "Course Handouts"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "True if timezones should be shown on dates in the course. Deprecated in "
@@ -3337,6 +3324,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -4042,11 +4035,6 @@ msgstr ""
 msgid "External Discussion"
 msgstr ""
 
-#: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py
-#: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
-msgid "Home"
-msgstr ""
-
 #: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py
 #: lms/djangoapps/courseware/views/views.py
 #: openedx/features/course_experience/__init__.py
@@ -5970,17 +5958,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -5995,6 +5972,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6135,9 +6123,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s: Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6145,6 +6135,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8058,10 +8053,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8076,10 +8071,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10034,10 +10030,6 @@ msgstr ""
 msgid "Upgrade to earn a verified certificate in %(first_course_name)s"
 msgstr ""
 
-#: openedx/core/djangoapps/self_paced/models.py
-msgid "Enable course home page improvements."
-msgstr ""
-
 #: openedx/core/djangoapps/theming/views.py
 #, python-brace-format
 msgid "Site theme changed to {site_theme}"
@@ -10208,6 +10200,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10662,10 +10659,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -11163,6 +11156,10 @@ msgid ""
 "administrator at {enterprise_customer_name}."
 msgstr ""
 
+#: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
+msgid "Home"
+msgstr ""
+
 #: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
 msgid "Enterprise Course Enrollments"
 msgstr ""
@@ -13242,6 +13239,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr ""
@@ -14725,7 +14726,7 @@ msgid "Share with friends and family!"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
@@ -14851,49 +14852,6 @@ msgstr ""
 msgid "next page"
 msgstr ""
 
-#: lms/templates/courseware/info.html
-msgid "{course_number} Course Info"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "You are not enrolled yet"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid ""
-"You are not currently enrolled in this course. {link_start}Enroll "
-"now!{link_end}"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "Welcome to {org}'s {course_title}!"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "Welcome to {course_title}!"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-#: lms/templates/dashboard/_dashboard_course_resume.html
-msgid "Resume Course"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "View Updates in Studio"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "Course Updates and News"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "Handout Navigation"
-msgstr ""
-
-#: lms/templates/courseware/info.html
-msgid "Course Tools"
-msgstr ""
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr ""
@@ -15032,10 +14990,6 @@ msgstr ""
 msgid "Opens in a new browser window"
 msgstr ""
 
-#: lms/templates/courseware/progress.html
-msgid "Download Your Certificate"
-msgstr ""
-
 #: lms/templates/courseware/progress.html
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Request Certificate"
@@ -15267,20 +15221,6 @@ msgstr ""
 msgid "View my {cert_name_short}"
 msgstr ""
 
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid "This link will open/download a PDF document"
-msgstr ""
-
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid "Download my {cert_name_short}"
-msgstr ""
-
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid ""
-"This link will open/download a PDF document of your verified "
-"{cert_name_long}."
-msgstr ""
-
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Complete our course feedback survey"
 msgstr ""
@@ -15427,6 +15367,10 @@ msgstr ""
 msgid "Upgrade"
 msgstr ""
 
+#: lms/templates/dashboard/_dashboard_course_resume.html
+msgid "Resume Course"
+msgstr ""
+
 #. Translators: provider_name is the name of a credit provider or university
 #. (e.g. State University)
 #: lms/templates/dashboard/_dashboard_credit_info.html
diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po
index 4800c637c7..793b4ec999 100644
--- a/conf/locale/en/LC_MESSAGES/djangojs.po
+++ b/conf/locale/en/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-29 20:41+0000\n"
-"PO-Revision-Date: 2022-05-29 20:42:17.236317\n"
+"POT-Creation-Date: 2022-06-13 20:00+0000\n"
+"PO-Revision-Date: 2022-06-13 20:01:04.863306\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: en\n"
@@ -3619,6 +3619,10 @@ msgstr ""
 msgid "Invalid email address: {email}"
 msgstr ""
 
+#: lms/static/js/groups/views/cohort_editor.js
+msgid "Cohort assignment not allowed: {email_or_username}"
+msgstr ""
+
 #: lms/static/js/groups/views/cohort_editor.js
 msgid "There was an error when trying to add learners:"
 msgid_plural "{numErrors} learners could not be added to this cohort:"
@@ -7164,10 +7168,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Download URL"
-msgstr ""
-
 #: lms/djangoapps/support/static/support/templates/certificates_results.underscore
 msgid "Grade"
 msgstr ""
@@ -7176,14 +7176,6 @@ msgstr ""
 msgid "Last Updated"
 msgstr ""
 
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Download the user's certificate"
-msgstr ""
-
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Not available"
-msgstr ""
-
 #: lms/djangoapps/support/static/support/templates/certificates_results.underscore
 msgid "Regenerate"
 msgstr ""
diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
index c385484686..4422e26cfb 100644
Binary files a/conf/locale/eo/LC_MESSAGES/django.mo and b/conf/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
index b7f584ef0c..d7da1ed00b 100644
--- a/conf/locale/eo/LC_MESSAGES/django.po
+++ b/conf/locale/eo/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-29 20:42+0000\n"
-"PO-Revision-Date: 2022-05-29 20:42:17.222392\n"
+"POT-Creation-Date: 2022-06-13 20:01+0000\n"
+"PO-Revision-Date: 2022-06-13 20:01:05.089992\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: eo\n"
@@ -49,6 +49,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.8.0\n"
 
+#: cms/djangoapps/contentstore/utils.py
+#: cms/djangoapps/contentstore/views/component.py
+#: cms/djangoapps/contentstore/views/item.py
+#: common/lib/xmodule/xmodule/html_module.py
+msgid "Text"
+msgstr "Téxt Ⱡ'σяєм ι#"
+
 #. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
 #. Translators: 'Discussion' refers to the tab in the courseware that leads to
 #. the discussion forums
@@ -62,11 +69,6 @@ msgstr ""
 msgid "Discussion"
 msgstr "Dïsçüssïön Ⱡ'σяєм ιρѕυм ∂σłσ#"
 
-#: cms/djangoapps/contentstore/views/component.py
-#: common/lib/xmodule/xmodule/html_module.py
-msgid "Text"
-msgstr "Téxt Ⱡ'σяєм ι#"
-
 #: cms/djangoapps/contentstore/views/component.py
 #: openedx/core/djangoapps/content_libraries/constants.py
 msgid "Problem"
@@ -2434,6 +2436,7 @@ msgstr ""
 "ѕιт αмєт, ¢σηѕє¢тєтυя α#"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Shöw Rését Büttön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
 
@@ -3357,30 +3360,6 @@ msgstr ""
 "Éntér thé nämés öf thé ädvänçéd mödülés tö üsé ïn ýöür çöürsé. Ⱡ'σяєм ιρѕυм "
 "∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Course Home Sidebar Name"
-msgstr "Çöürsé Hömé Sïdéßär Nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter the heading that you want students to see above your course handouts "
-"on the Course Home page. Your course handouts appear in the right panel of "
-"the page."
-msgstr ""
-"Éntér thé héädïng thät ýöü wänt stüdénts tö séé äßövé ýöür çöürsé händöüts "
-"ön thé Çöürsé Hömé pägé. Ýöür çöürsé händöüts äppéär ïn thé rïght pänél öf "
-"thé pägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ "
-"єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм"
-" νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα "
-"¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт"
-" єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт "
-"¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυη#"
-
-#: common/lib/xmodule/xmodule/course_module.py
-#: lms/templates/courseware/info.html
-msgid "Course Handouts"
-msgstr "Çöürsé Händöüts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "True if timezones should be shown on dates in the course. Deprecated in "
@@ -4293,6 +4272,14 @@ msgstr ""
 "Çhöösé ä prößlém týpé tö fétçh fröm thé lïßrärý. Ìf \"Àný Týpé\" ïs séléçtéd"
 " nö fïltérïng ïs äpplïéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+"Détérmïnés whéthér ä 'Rését Prößléms' ßüttön ïs shöwn, sö üsérs mäý rését "
+"théïr änswérs änd réshüfflé séléçtéd ïtéms. Ⱡ'σяєм ιρѕυм ∂#"
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -5265,11 +5252,6 @@ msgstr ""
 msgid "External Discussion"
 msgstr "Éxtérnäl Dïsçüssïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
 
-#: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py
-#: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
-msgid "Home"
-msgstr "Hömé Ⱡ'σяєм ι#"
-
 #: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py
 #: lms/djangoapps/courseware/views/views.py
 #: openedx/features/course_experience/__init__.py
@@ -7785,19 +7767,6 @@ msgstr ""
 "Ýöü'vé éärnéd ä çértïfïçäté för thïs çöürsé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
 "¢σηѕє¢тєтυя #"
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Çértïfïçäté ünäväïläßlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Ýöü hävé nöt réçéïvéd ä çértïfïçäté ßéçäüsé ýöü dö nöt hävé ä çürrént "
-"{platform_name} vérïfïéd ïdéntïtý. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -7816,6 +7785,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Ýöür çértïfïçäté ïs äväïläßlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Çértïfïçäté ünäväïläßlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Ýöü hävé nöt réçéïvéd ä çértïfïçäté ßéçäüsé ýöü dö nöt hävé ä çürrént "
+"{platform_name} vérïfïéd ïdéntïtý. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7997,6 +7979,21 @@ msgid "Good"
 msgstr "Gööd Ⱡ'σяєм ι#"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
+#, python-format
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
+msgstr ""
+"\n"
+"                        %(course_name)s: Répörtéd çöntént äwäïts révïéw\n"
+"                     Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
+
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+msgid "Go to Discussion"
+msgstr "Gö tö Dïsçüssïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
 msgid "%(course_name)s: Reported content awaits review"
@@ -8004,11 +8001,6 @@ msgstr ""
 "%(course_name)s: Répörtéd çöntént äwäïts révïéw Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,"
 " ¢σηѕє¢тєт#"
 
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
-msgid "Go to Discussion"
-msgstr "Gö tö Dïsçüssïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
-
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -10450,13 +10442,14 @@ msgid "You have signed out."
 msgstr "Ýöü hävé sïgnéd öüt. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}Çlïçk héré{end_anchor} tö délété ýöür sïnglé sïgnéd ön (SSÖ) "
-"séssïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Çlïçk héré{end_anchor} tö "
+"délété ýöür sïnglé sïgnéd ön (SSÖ) séssïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
+"¢σηѕє¢тєтυя #"
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -10473,13 +10466,15 @@ msgstr ""
 "                 Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Ìf ýöü äré nöt rédïréçtéd wïthïn 5 séçönds, {start_anchor}çlïçk héré tö gö "
-"tö thé hömé pägé{end_anchor}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
+"Ìf ýöü äré nöt rédïréçtéd wïthïn 5 séçönds, "
+"{start_anchor}%(target)s{middle_anchor}çlïçk héré tö gö tö thé hömé "
+"pägé{end_anchor}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -12989,12 +12984,6 @@ msgstr ""
 "Ûpgrädé tö éärn ä vérïfïéd çértïfïçäté ïn %(first_course_name)s Ⱡ'σяєм ιρѕυм"
 " ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #"
 
-#: openedx/core/djangoapps/self_paced/models.py
-msgid "Enable course home page improvements."
-msgstr ""
-"Énäßlé çöürsé hömé pägé ïmprövéménts. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυ#"
-
 #: openedx/core/djangoapps/theming/views.py
 #, python-brace-format
 msgid "Site theme changed to {site_theme}"
@@ -13199,6 +13188,11 @@ msgstr ""
 "Thé '{field_name}' fïéld çännöt ßé édïtéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
 "¢σηѕє¢тє#"
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "Éntér ä välïd nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -13770,10 +13764,6 @@ msgstr ""
 "Füll Nämé çännöt çöntäïn thé föllöwïng çhäräçtérs: < > Ⱡ'σяєм ιρѕυм ∂σłσя "
 "ѕιт αмєт, ¢σηѕє¢тєтυя α#"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "Éntér ä välïd nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -14426,6 +14416,10 @@ msgstr ""
 "ädmïnïsträtör ät {enterprise_customer_name}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
 "¢σηѕє#"
 
+#: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
+msgid "Home"
+msgstr "Hömé Ⱡ'σяєм ι#"
+
 #: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
 msgid "Enterprise Course Enrollments"
 msgstr "Éntérprïsé Çöürsé Énröllménts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
@@ -16938,6 +16932,10 @@ msgstr "Düé {date} Ⱡ'σяєм ιρѕυм #"
 msgid "Past due"
 msgstr "Päst düé Ⱡ'σяєм ιρѕυм ∂#"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr "Rését Prößléms Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Löädïng vïdéö pläýér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
@@ -18979,9 +18977,9 @@ msgid "Share with friends and family!"
 msgstr "Shäré wïth frïénds änd fämïlý! Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
-"Ì jüst énrölléd ïn {number} {title} thröügh {account}: {url} Ⱡ'σяєм ιρѕυм "
+"Ì jüst énrölléd ïn {number} {title} thröügh {account} {url} Ⱡ'σяєм ιρѕυм "
 "∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
@@ -19125,51 +19123,6 @@ msgstr "öf Ⱡ'σя#"
 msgid "next page"
 msgstr "néxt pägé Ⱡ'σяєм ιρѕυм ∂σł#"
 
-#: lms/templates/courseware/info.html
-msgid "{course_number} Course Info"
-msgstr "{course_number} Çöürsé Ìnfö Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
-
-#: lms/templates/courseware/info.html
-msgid "You are not enrolled yet"
-msgstr "Ýöü äré nöt énrölléd ýét Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"
-
-#: lms/templates/courseware/info.html
-msgid ""
-"You are not currently enrolled in this course. {link_start}Enroll "
-"now!{link_end}"
-msgstr ""
-"Ýöü äré nöt çürréntlý énrölléd ïn thïs çöürsé. {link_start}Énröll "
-"nöw!{link_end} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
-
-#: lms/templates/courseware/info.html
-msgid "Welcome to {org}'s {course_title}!"
-msgstr "Wélçömé tö {org}'s {course_title}! Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
-
-#: lms/templates/courseware/info.html
-msgid "Welcome to {course_title}!"
-msgstr "Wélçömé tö {course_title}! Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
-
-#: lms/templates/courseware/info.html
-#: lms/templates/dashboard/_dashboard_course_resume.html
-msgid "Resume Course"
-msgstr "Résümé Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
-
-#: lms/templates/courseware/info.html
-msgid "View Updates in Studio"
-msgstr "Vïéw Ûpdätés ïn Stüdïö Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
-
-#: lms/templates/courseware/info.html
-msgid "Course Updates and News"
-msgstr "Çöürsé Ûpdätés änd Néws Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
-
-#: lms/templates/courseware/info.html
-msgid "Handout Navigation"
-msgstr "Händöüt Nävïgätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
-
-#: lms/templates/courseware/info.html
-msgid "Course Tools"
-msgstr "Çöürsé Tööls Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "Néws - MÌTx 6.002x Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
@@ -19317,10 +19270,6 @@ msgstr "Vïéw Çértïfïçäté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α
 msgid "Opens in a new browser window"
 msgstr "Öpéns ïn ä néw ßröwsér wïndöw Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
 
-#: lms/templates/courseware/progress.html
-msgid "Download Your Certificate"
-msgstr "Döwnlöäd Ýöür Çértïfïçäté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
-
 #: lms/templates/courseware/progress.html
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Request Certificate"
@@ -19640,24 +19589,6 @@ msgstr ""
 msgid "View my {cert_name_short}"
 msgstr "Vïéw mý {cert_name_short} Ⱡ'σяєм ιρѕυм ∂σłσя #"
 
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid "This link will open/download a PDF document"
-msgstr ""
-"Thïs lïnk wïll öpén/döwnlöäd ä PDF döçümént Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυя #"
-
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid "Download my {cert_name_short}"
-msgstr "Döwnlöäd mý {cert_name_short} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
-
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid ""
-"This link will open/download a PDF document of your verified "
-"{cert_name_long}."
-msgstr ""
-"Thïs lïnk wïll öpén/döwnlöäd ä PDF döçümént öf ýöür vérïfïéd "
-"{cert_name_long}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
-
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Complete our course feedback survey"
 msgstr ""
@@ -19836,6 +19767,10 @@ msgstr ""
 msgid "Upgrade"
 msgstr "Ûpgrädé Ⱡ'σяєм ιρѕυм #"
 
+#: lms/templates/dashboard/_dashboard_course_resume.html
+msgid "Resume Course"
+msgstr "Résümé Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
+
 #. Translators: provider_name is the name of a credit provider or university
 #. (e.g. State University)
 #: lms/templates/dashboard/_dashboard_credit_info.html
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo
index b8b4da1c43..58dbd51518 100644
Binary files a/conf/locale/eo/LC_MESSAGES/djangojs.mo and b/conf/locale/eo/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po
index e8bcb11de2..e74a1ab1ba 100644
--- a/conf/locale/eo/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eo/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-29 20:41+0000\n"
-"PO-Revision-Date: 2022-05-29 20:42:17.236317\n"
+"POT-Creation-Date: 2022-06-13 20:00+0000\n"
+"PO-Revision-Date: 2022-06-13 20:01:04.863306\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: eo\n"
@@ -4139,6 +4139,12 @@ msgstr "Ûnknöwn üsérnämé: {user} Ⱡ'σяєм ιρѕυм ∂σłσя ѕι
 msgid "Invalid email address: {email}"
 msgstr "Ìnvälïd émäïl äddréss: {email} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
 
+#: lms/static/js/groups/views/cohort_editor.js
+msgid "Cohort assignment not allowed: {email_or_username}"
+msgstr ""
+"Çöhört ässïgnmént nöt ällöwéd: {email_or_username} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
+"αмєт, ¢σηѕє¢тєт#"
+
 #: lms/static/js/groups/views/cohort_editor.js
 msgid "There was an error when trying to add learners:"
 msgid_plural "{numErrors} learners could not be added to this cohort:"
@@ -8558,10 +8564,6 @@ msgstr "Çöürsé Kéý Ⱡ'σяєм ιρѕυм ∂σłσ#"
 msgid "Status"
 msgstr "Stätüs Ⱡ'σяєм ιρѕυ#"
 
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Download URL"
-msgstr "Döwnlöäd ÛRL Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
-
 #: lms/djangoapps/support/static/support/templates/certificates_results.underscore
 msgid "Grade"
 msgstr "Grädé Ⱡ'σяєм ιρѕ#"
@@ -8570,14 +8572,6 @@ msgstr "Grädé Ⱡ'σяєм ιρѕ#"
 msgid "Last Updated"
 msgstr "Läst Ûpdätéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Download the user's certificate"
-msgstr "Döwnlöäd thé üsér's çértïfïçäté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
-
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Not available"
-msgstr "Nöt äväïläßlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
-
 #: lms/djangoapps/support/static/support/templates/certificates_results.underscore
 msgid "Regenerate"
 msgstr "Régénéräté Ⱡ'σяєм ιρѕυм ∂σłσ#"
diff --git a/conf/locale/es_419/LC_MESSAGES/django.mo b/conf/locale/es_419/LC_MESSAGES/django.mo
index ed5b7e75fe..d430a15acb 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/django.mo and b/conf/locale/es_419/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/django.po b/conf/locale/es_419/LC_MESSAGES/django.po
index 0f0a66d1f4..f70a91dff0 100644
--- a/conf/locale/es_419/LC_MESSAGES/django.po
+++ b/conf/locale/es_419/LC_MESSAGES/django.po
@@ -270,7 +270,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Albeiro Gonzalez <albeiro.gonzalez@edunext.co>, 2019\n"
 "Language-Team: Spanish (Latin America) (https://www.transifex.com/open-edx/teams/6205/es_419/)\n"
@@ -2455,6 +2455,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Presiona el botón guardar para que aparezca en la página"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Mostrar botón de reiniciar"
 
@@ -4068,6 +4069,12 @@ msgstr ""
 "Elija un tipo de problema para traer de la librería. Si elige \"cualquier "
 "tipo\" no se aplica ningún filtro."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -7188,19 +7195,6 @@ msgstr "¡Felicitaciones, usted califica para recibir un certificado!"
 msgid "You've earned a certificate for this course."
 msgstr "Has obtenido un certificado para este curso."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Certificado no disponible"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Usted no ha recibido un certificado porque no tiene actualmente una "
-"identidad verificada en {platform_name}."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "¡Pronto estará disponible tu certificado!"
@@ -7217,6 +7211,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Tu certificado está disponible"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Certificado no disponible"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Usted no ha recibido un certificado porque no tiene actualmente una "
+"identidad verificada en {platform_name}."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7377,9 +7384,11 @@ msgid "Good"
 msgstr "Bien"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7387,6 +7396,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9539,12 +9553,11 @@ msgid "You have signed out."
 msgstr "Ha cerrado su sesión."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}hacer clic aquí{end_anchor} para eliminar su sesión (SSO)."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9561,13 +9574,12 @@ msgstr ""
 "                "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Si no eres redireccionado en 5 segundos, {start_anchor} debes hacer clic "
-"aquí para ir a la página principal{end_anchor}. "
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11962,6 +11974,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "El campo '{field_name}' no puede ser editado."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "Introduce un nombre válido"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -12480,10 +12497,6 @@ msgstr "El access_token suministrado no es válido."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "El Nombre Completo no puede contener los siguientes caracteres: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "Introduce un nombre válido"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Se requiere una dirección de correo electrónico válida."
@@ -15316,6 +15329,10 @@ msgstr "Fecha límite: {date}"
 msgid "Past due"
 msgstr "Vencidos"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Cargando reproductor de video"
@@ -17225,8 +17242,8 @@ msgid "Share with friends and family!"
 msgstr "Compartir con amigos y familiares"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Acabo de inscribirme en {number} {title} a través de {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.mo b/conf/locale/es_419/LC_MESSAGES/djangojs.mo
index ca1fb847b1..4838fcbd4f 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/djangojs.mo and b/conf/locale/es_419/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.po b/conf/locale/es_419/LC_MESSAGES/djangojs.po
index 3c459ef55f..9c63c5aec0 100644
--- a/conf/locale/es_419/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_419/LC_MESSAGES/djangojs.po
@@ -175,7 +175,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Carolina De Mares <carolina.demares@edunext.co>, 2021\n"
 "Language-Team: Spanish (Latin America) (http://www.transifex.com/open-edx/edx-platform/language/es_419/)\n"
@@ -435,11 +435,11 @@ msgstr "Actualizando con el más reciente contenido de la librería"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "Cargando..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "Bloques seleccionados"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2165,7 +2165,7 @@ msgstr "Navegue hacia arriba"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Explorando"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2745,19 +2745,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Detalles"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "Cuantos más detalles, más rápido y mejor podremos responder"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "Crear caso de soporte"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "¿En qué podemos ayudarte, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2765,7 +2765,7 @@ msgstr "Ingrese a  {platform} para que podamos ayudarle mejor."
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "¿Necesita ayuda para iniciar sesión?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3687,56 +3687,47 @@ msgstr "¡Ayuda a edX a ser mejor para todos!"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "¿Por qué edX recoleta esta información?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"Se produjo un error al intentar recuperar recuperar o guardar la información"
-" a continuación. Por favor intenta de nuevo mas tarde. "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
 msgstr ""
-"¿Cual fue el ingreso total combinado, durante los ultimo 12 meses, de todos "
-"los miembros de tu familia? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"¿Alguna vez has servido en un deber activo en las Fuerzas Armadas de Estados"
-" Unidos de America, Reservas, o Guardia Nacional? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
 msgstr ""
-"¿Cual es el nivel mas alto de educación que has obtenido hasta la fecha?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
 msgstr ""
-"¿Cual es el nivel de educación mas alto que alguno de tus padres o "
-"responsables ha adquirido? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "Seleccionar estatus laboral"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "¿En que industria trabajas actualmente?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "¿En que industria te gustaría trabajar?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3752,19 +3743,19 @@ msgstr "questionario cerrado"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "terminar despues"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "Volver a mi panel de control"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "Terminar despues"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "Siguiente página"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -6133,25 +6124,24 @@ msgstr "Ha habido un error con la subida del archivo"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organización:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Número del curso:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Edición del Curso:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Solo-lectura)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Relanzar Curso"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Ver en vivo"
diff --git a/conf/locale/eu_ES/LC_MESSAGES/django.po b/conf/locale/eu_ES/LC_MESSAGES/django.po
index 94d84a92fe..febac745e3 100644
--- a/conf/locale/eu_ES/LC_MESSAGES/django.po
+++ b/conf/locale/eu_ES/LC_MESSAGES/django.po
@@ -64,7 +64,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Abel Camacho <abelcama@gmail.com>, 2019\n"
 "Language-Team: Basque (Spain) (https://www.transifex.com/open-edx/teams/6205/eu_ES/)\n"
@@ -2065,6 +2065,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Behartu gorde botoia orrian agertzen ala ez"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Erakutsi Garbitu botoia"
 
@@ -3461,6 +3462,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -6162,17 +6169,6 @@ msgstr "Zorionak, ziurtagiria lortzeko maila duzu!"
 msgid "You've earned a certificate for this course."
 msgstr "Ikastaro honen ziurtagiria lortu duzu."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6187,6 +6183,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Zure ziurtagiria eskuragarri dago"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6329,9 +6336,11 @@ msgid "Good"
 msgstr "Ona"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6339,6 +6348,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8274,10 +8288,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8292,10 +8306,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10435,6 +10450,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}' eremua ezin da editatu."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10896,10 +10916,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Formatu egokia duen e-posta behar da"
@@ -13493,6 +13509,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Bideo-erreproduzitzailea igotzen"
@@ -14984,7 +15004,7 @@ msgid "Share with friends and family!"
 msgstr "Partekatu lagun eta familiarekin!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
diff --git a/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo b/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo
index fb96e7c3e5..f10c0d624c 100644
Binary files a/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo and b/conf/locale/eu_ES/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/eu_ES/LC_MESSAGES/djangojs.po b/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
index 0d785bb418..0d8f916877 100644
--- a/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Abel Camacho <abelcama@gmail.com>, 2017,2019-2020\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/open-edx/edx-platform/language/eu_ES/)\n"
@@ -2545,7 +2545,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Xehetasunak"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -2557,7 +2557,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Zertan lagundu ahal dizugu, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2565,7 +2565,7 @@ msgstr "Hasi saioa {platform} plataforman laguntza hobea eman ahal izateko."
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Laguntza behar duzu saioa hasteko?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3467,7 +3467,7 @@ msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "hurrengo orria"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -5575,25 +5575,24 @@ msgstr "Errorea gertatu da igotzean"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Erakundea:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Ikastaro-zenbakia"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Ikastaroa ematea:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Irakurtzekoa baino ez)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Errepikatu ikastaroa"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Ikusi zuzenean"
diff --git a/conf/locale/fr/LC_MESSAGES/django.mo b/conf/locale/fr/LC_MESSAGES/django.mo
index 9b09457739..04b764f4b3 100644
Binary files a/conf/locale/fr/LC_MESSAGES/django.mo and b/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po
index 2b9f164b13..e52d752d56 100644
--- a/conf/locale/fr/LC_MESSAGES/django.po
+++ b/conf/locale/fr/LC_MESSAGES/django.po
@@ -58,6 +58,7 @@
 # Mireille Cabuay, 2018
 # moocit-france <contact@moocit.fr>, 2014-2018,2020
 # mtyaka <mtyaka@gmail.com>, 2015-2016
+# Nicolas François Leperlier <leperlier.n@gmail.com>, 2022
 # Nikolaos Maris, 2013
 # Nikolaos Maris, 2013
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013
@@ -206,7 +207,7 @@
 # Ramarohetra Malalatiana <mtiana8@gmail.com>, 2014
 # Muhammad Ayub khan <ayubkhan@edx.org>, 2018
 # eddy01 <ngwa.edwin@yahoo.com>, 2014
-# Nicolas François Leperlier <leperlier.n@gmail.com>, 2021
+# Nicolas François Leperlier <leperlier.n@gmail.com>, 2021-2022
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013
 # PETIT Yannick <yannick.petit@gmail.com>, 2013
@@ -312,7 +313,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Alexandre DS <alexandre@cleverm8.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/open-edx/teams/6205/fr/)\n"
@@ -970,7 +971,7 @@ msgstr "Inscription impossible"
 
 #: common/djangoapps/student/views/management.py
 msgid "Unenrollment is currently disabled"
-msgstr "La désinscription est actuellement désactivée"
+msgstr ""
 
 #: common/djangoapps/student/views/management.py
 msgid "You are not enrolled in this course"
@@ -2514,6 +2515,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Forcer le bouton enregistrer pour apparaître sur la page"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Afficher le bouton Réinitialiser"
 
@@ -4128,6 +4130,12 @@ msgstr ""
 "Choisir un type de problème à récupérer de la bibliothèque. If \"Tout Type\""
 " est sélectionné aucun filtre n'est appliqué."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Ce composant est obsolète. La bibliothèque a de nouveaux contenus."
@@ -6794,7 +6802,6 @@ msgstr ""
 "Veuillez contacter l'administrateur de votre diplôme ou le {platform_name} "
 "si vous avez des questions."
 
-#: lms/djangoapps/course_home_api/outline/views.py
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
 msgstr "Ce cours est complet"
@@ -7104,23 +7111,21 @@ msgstr ""
 
 #: lms/djangoapps/courseware/models.py
 msgid "Internal API Base URL"
-msgstr "URL de base de l&#39;API interne"
+msgstr ""
 
 #: lms/djangoapps/courseware/models.py
 msgid "Financial Assistance Backend API Base URL."
-msgstr "URL de base de l&#39;API Backend de l&#39;assistance financière."
+msgstr ""
 
 #: lms/djangoapps/courseware/models.py
 msgid ""
 "Username created for Financial Assistance Backend, e.g. "
 "financial_assistance_service_user."
 msgstr ""
-"Nom d&#39;utilisateur créé pour Financial Assistance Backend, par exemple "
-"financial_assistance_service_user."
 
 #: lms/djangoapps/courseware/models.py
 msgid "Percentage of courses allowed to use edx-financial-assistance"
-msgstr "Pourcentage de cours autorisés à utiliser edx-financial-assistance"
+msgstr ""
 
 #: lms/djangoapps/courseware/plugins.py lms/djangoapps/courseware/tabs.py
 #: lms/templates/peer_grading/peer_grading.html
@@ -7262,19 +7267,6 @@ msgstr "Félicitations, vous êtes qualifié pour un certificat!"
 msgid "You've earned a certificate for this course."
 msgstr "Vous avez obtenu un certificat pour ce cours."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Certificat non disponible"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Vous n'avez pas reçu de certificat parce que vous n'avez actuellement pas "
-"d'identité vérifiée sur {platform_name}."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "Votre attestation sera bientôt disponible!"
@@ -7291,6 +7283,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Votre certificat est disponible"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Certificat non disponible"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Vous n'avez pas reçu de certificat parce que vous n'avez actuellement pas "
+"d'identité vérifiée sur {platform_name}."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7453,9 +7458,11 @@ msgid "Good"
 msgstr "Bien"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7463,6 +7470,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9618,12 +9630,11 @@ msgid "You have signed out."
 msgstr "Vous vous êtes déconnecté."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}Cliquer ici{end_anchor} pour supprimer votre session (SSO)."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9639,13 +9650,12 @@ msgstr ""
 "Ceci prendra une minute. Si vous n'êtes pas redirigés, allez à la page d'accueil."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Si vous n'êtes pas redirigé dans les 5 secondes, {start_anchor} cliquez ici "
-"pour accéder à la page d'accueil {end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -12047,6 +12057,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Le champ '{field_name}' ne peut pas être modifié."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "Entrez un nom valide"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -12570,10 +12585,6 @@ msgstr "L'access_token fourni n'est pas valide."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Le Nom complet ne peut pas contenir les caractères: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "Entrez un nom valide"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Une adresse e-mail valide est requise"
@@ -12758,7 +12769,6 @@ msgid "{header_open}{title}{header_close}"
 msgstr "{header_open}{title}{header_close}"
 
 #: openedx/core/djangoapps/util/user_messages.py
-#: cms/templates/course_outline.html cms/templates/index.html
 msgid "Dismiss"
 msgstr "Renvoyer"
 
@@ -15418,6 +15428,10 @@ msgstr "Échéance {date}"
 msgid "Past due"
 msgstr "En retard"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Chargement du lecteur vidéo"
@@ -17341,8 +17355,8 @@ msgid "Share with friends and family!"
 msgstr "Partager avec ses amis et sa famille !"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Je me suis inscrit à {number} {title} via {account} : {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr "Je viens de m&#39;inscrire à {number} {title} via {account} {url}"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
@@ -22235,7 +22249,7 @@ msgstr ""
 
 #: cms/templates/course_outline.html
 msgid "Course Outline"
-msgstr "Plan du Cours"
+msgstr ""
 
 #: cms/templates/course_outline.html
 msgid ""
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.mo b/conf/locale/fr/LC_MESSAGES/djangojs.mo
index 220740c17b..803fc29c49 100644
Binary files a/conf/locale/fr/LC_MESSAGES/djangojs.mo and b/conf/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.po b/conf/locale/fr/LC_MESSAGES/djangojs.po
index 6162317e31..a69bb0d4d3 100644
--- a/conf/locale/fr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fr/LC_MESSAGES/djangojs.po
@@ -45,6 +45,7 @@
 # moocit-france <contact@moocit.fr>, 2015-2018
 # Manjari <mringuet@gmail.com>, 2014
 # Muhammad Ayub khan <ayubkhan@edx.org>, 2018
+# Nicolas François Leperlier <leperlier.n@gmail.com>, 2022
 # Olivier Lebon <oliv.lebon@wanadoo.fr>, 2015
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013
 # Olivier Marquez <oliviermarquez@gmail.com>, 2013
@@ -216,7 +217,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: iderr <ibrahim@derraz.fr>, 2021-2022\n"
 "Language-Team: French (http://www.transifex.com/open-edx/edx-platform/language/fr/)\n"
@@ -476,11 +477,11 @@ msgstr "Mise à jour des derniers ajouts à la bibliothèque"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "Chargement..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "Blocs sélectionnés"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2207,7 +2208,7 @@ msgstr "Naviguer vers le haut"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Navigation"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2798,19 +2799,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Détails"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "le plus rapidement et efficacement que nous pouvons répondre !"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "Créer un billet de support"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "A quoi pouvons-nous vous être utile, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2818,7 +2819,7 @@ msgstr "Se connecter à {platform} pour nous permettre de mieux vous aider."
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Besoin d'aide pour vous connecter ?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3747,57 +3748,47 @@ msgstr "Aidez-nous à rendre edX meilleur pour tous !"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "Pourquoi edX collecte-t-il ces informations ?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"Une erreur s'est produite lors de la tentative de récupération ou "
-"d'enregistrement des informations ci-dessous. Veuillez réessayer plus tard."
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
 msgstr ""
-"Quel a été le revenu total combiné, au cours des 12 derniers mois, de tous "
-"les membres de votre famille?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"Avez-vous déjà servi en service actif dans les forces armées, les réserves "
-"ou la garde nationale?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
 msgstr ""
-"Quel est le niveau d'éducation le plus élevé que vous ayez atteint jusqu'à "
-"présent?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
 msgstr ""
-"Quel est le niveau de scolarité le plus élevé que l'un de vos parents ou "
-"tuteurs ait atteint?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "Sélectionnez le statut d'emploi"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "Dans quel secteur travaillez-vous actuellement?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "Dans quel secteur souhaitez-vous travailler?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3813,19 +3804,19 @@ msgstr "Fermer le questionnaire"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "terminer plus tard"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "Retour à mon tableau de bord"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "Terminer plus tard"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "page suivante"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -6214,25 +6205,24 @@ msgstr "Il y a eu une erreur pendant le téléchargement"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organisation:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Numéro du cours :"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Session :"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Lecture-seule)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Relancer le cours"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Aperçu réel"
diff --git a/conf/locale/id/LC_MESSAGES/django.mo b/conf/locale/id/LC_MESSAGES/django.mo
index 131db7e99c..a61c2f1eb5 100644
Binary files a/conf/locale/id/LC_MESSAGES/django.mo and b/conf/locale/id/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/id/LC_MESSAGES/django.po b/conf/locale/id/LC_MESSAGES/django.po
index 98b152d972..edf13914f5 100644
--- a/conf/locale/id/LC_MESSAGES/django.po
+++ b/conf/locale/id/LC_MESSAGES/django.po
@@ -105,7 +105,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Aprisa Chrysantina <aprisa.chrysantina@gmail.com>, 2019\n"
 "Language-Team: Indonesian (https://www.transifex.com/open-edx/teams/6205/id/)\n"
@@ -2150,6 +2150,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Memaksa tombol simpan di halaman ataupun tidak"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Tampilkan Tombol Ganti"
 
@@ -3696,6 +3697,12 @@ msgstr ""
 "Pilih jenis soal untuk ditarik dari library. Jika Anda memilih \"Jenis "
 "Apapun\" maka filter tidak diaktifkan"
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Komponen ini telah kadaluarsa. Library telah memiliki konten baru"
@@ -6585,19 +6592,6 @@ msgstr "Selamat, Anda bisa mendapatkan sertifikat!"
 msgid "You've earned a certificate for this course."
 msgstr "Anda telah mendapatkan sertifikat untuk pelatihan ini."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Sertifikat Tidak Tersedia"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Anda belum menerima sertifikat karena Anda tidak memiliki identitas "
-"terverifikasi {platform_name} saat ini."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6612,6 +6606,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Sertifikat Anda sudah tersedia"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Sertifikat Tidak Tersedia"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Anda belum menerima sertifikat karena Anda tidak memiliki identitas "
+"terverifikasi {platform_name} saat ini."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6757,9 +6764,11 @@ msgid "Good"
 msgstr "Baik"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6767,6 +6776,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8768,10 +8782,10 @@ msgid "You have signed out."
 msgstr "Anda sudah keluar."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8786,10 +8800,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10965,6 +10980,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Isian '{field_name}' tidak dapat diubah."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11439,10 +11459,6 @@ msgstr "Access_token yang disediakan tidak valid."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Nama Lengkap tidak dapat mengandung karakter berikut: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "E-mail dengan format yang benar dibutuhkan"
@@ -14094,6 +14110,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Muat pemutar video"
@@ -15948,8 +15968,8 @@ msgid "Share with friends and family!"
 msgstr "Berbagi dengan kawan dan keluarga!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Saya baru saja mendaftar di {number} {title} melalui {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/id/LC_MESSAGES/djangojs.mo b/conf/locale/id/LC_MESSAGES/djangojs.mo
index 763d998220..e0f756e6a0 100644
Binary files a/conf/locale/id/LC_MESSAGES/djangojs.mo and b/conf/locale/id/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/id/LC_MESSAGES/djangojs.po b/conf/locale/id/LC_MESSAGES/djangojs.po
index 0540569ae9..fb77bb4bb3 100644
--- a/conf/locale/id/LC_MESSAGES/djangojs.po
+++ b/conf/locale/id/LC_MESSAGES/djangojs.po
@@ -82,7 +82,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Aprisa Chrysantina <aprisa.chrysantina@gmail.com>, 2019\n"
 "Language-Team: Indonesian (http://www.transifex.com/open-edx/edx-platform/language/id/)\n"
@@ -2012,7 +2012,7 @@ msgstr "Navigasi naik"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Jelajah"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2552,7 +2552,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Detil"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -2564,7 +2564,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Ada yang bisa kami bantu, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -5762,15 +5762,15 @@ msgstr "Terjadi kesalahan dengan unggahnya"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organisasi:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Nomor Kursus:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Kursus Berjalan:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
@@ -5780,7 +5780,6 @@ msgstr ""
 msgid "Re-run Course"
 msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Tampilkan Live"
diff --git a/conf/locale/it_IT/LC_MESSAGES/django.mo b/conf/locale/it_IT/LC_MESSAGES/django.mo
index 15842d1e7e..b1802e0b98 100644
Binary files a/conf/locale/it_IT/LC_MESSAGES/django.mo and b/conf/locale/it_IT/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/it_IT/LC_MESSAGES/django.po b/conf/locale/it_IT/LC_MESSAGES/django.po
index adfb469e99..b611a2da9e 100644
--- a/conf/locale/it_IT/LC_MESSAGES/django.po
+++ b/conf/locale/it_IT/LC_MESSAGES/django.po
@@ -125,7 +125,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Ilaria Botti <ilabotti@gmail.com>, 2021\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/open-edx/teams/6205/it_IT/)\n"
@@ -2322,6 +2322,7 @@ msgstr ""
 "pagina"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Mostra il pulsante di reset"
 
@@ -3936,6 +3937,12 @@ msgstr ""
 "Scegliere un tipo di problema da prendere dalla libreria. Se \"Any Type\" è "
 "selezionato, nessun filtro viene applicato."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -7006,19 +7013,6 @@ msgstr "Congratulazioni! Ti sei qualificato per ottenere un certificato!"
 msgid "You've earned a certificate for this course."
 msgstr "Hai ottenuto un certificato per questo corso."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Certificato non disponibile"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Non è stato ricevuto un certificato perché non si dispone di un'identità "
-"verificata {platform_name} corrente."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "Il tuo certificato sarà presto disponibile!"
@@ -7035,6 +7029,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Il tuo certificato è disponibile"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Certificato non disponibile"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Non è stato ricevuto un certificato perché non si dispone di un'identità "
+"verificata {platform_name} corrente."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7192,9 +7199,11 @@ msgid "Good"
 msgstr "Buono"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7202,6 +7211,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9324,13 +9338,11 @@ msgid "You have signed out."
 msgstr "Ti sei disconnesso."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}Fare clic qui{end_anchor} per eliminare la propria sessione "
-"SSO (Single Signed On)."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9347,13 +9359,12 @@ msgstr ""
 "                "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Se non si è reindirizzati in 5 secondi, {start_anchor}far clic qui per "
-"passare alla home page{end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11718,6 +11729,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Impossibile modificare il campo '{field_name}'."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -12223,10 +12239,6 @@ msgstr "L'access_token fornito non è valido."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Il nome non può contenere i seguenti caratteri: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "una e-mail strutturata correttamente è richiesta"
@@ -15042,6 +15054,10 @@ msgstr "Scadenza {date}"
 msgid "Past due"
 msgstr "Scaduto "
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Caricamento del riproduttore video"
@@ -16927,8 +16943,8 @@ msgid "Share with friends and family!"
 msgstr "Condividi con i tuoi amici!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Mi sono iscritto a {number} {title} tramite {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/it_IT/LC_MESSAGES/djangojs.mo b/conf/locale/it_IT/LC_MESSAGES/djangojs.mo
index 898348adce..c82e01812c 100644
Binary files a/conf/locale/it_IT/LC_MESSAGES/djangojs.mo and b/conf/locale/it_IT/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/it_IT/LC_MESSAGES/djangojs.po b/conf/locale/it_IT/LC_MESSAGES/djangojs.po
index 416d435653..8b9c8b9b4e 100644
--- a/conf/locale/it_IT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/it_IT/LC_MESSAGES/djangojs.po
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Mauri Macera, 2021\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/open-edx/edx-platform/language/it_IT/)\n"
@@ -371,11 +371,11 @@ msgstr "Aggiornamento con gli ultimi contenuti della libreria"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "Caricamento..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "Blocchi selezionati"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2099,7 +2099,7 @@ msgstr "Naviga su"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Esplorazione"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2667,19 +2667,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Dettagli"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "rispondere nel modo più veloce e utile possibile. "
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "Crea ticket di supporto"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Come possiamo aiutarti, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2687,7 +2687,7 @@ msgstr "Accedi a {platform} in modo da consentirci di aiutarti meglio."
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Hai bisogno di aiuto per l'accesso?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3590,56 +3590,47 @@ msgstr "Aiutaci a rendere edX migliore per tutti!"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "Perché edX raccoglie queste informazioni?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"Si è verificato un errore durante il tentativo di recuperare o salvare le "
-"informazioni seguenti. Prova di nuovo più tardi."
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
 msgstr ""
-"Qual è stato il reddito totale complessivo, negli ultimi 12 mesi, di tutti i"
-" membri della tua famiglia? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"Hai mai prestato servizio attivo nelle forze armate, nelle riserve o nella "
-"guardia nazionale degli Stati Uniti? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
 msgstr ""
-"Qual è il livello di istruzione più elevato che hai raggiunto finora? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
 msgstr ""
-"Qual è il livello di istruzione più elevato raggiunto da uno dei tuoi "
-"genitori o tutori? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "Seleziona occupazione"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "In quale settore lavori attualmente? "
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "In quale settore vuoi lavorare? "
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3655,19 +3646,19 @@ msgstr "chiudi questionario"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "termina più tardi"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "Torna alla mia dashboard"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "Termina più tardi"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "pagina successiva"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -6036,25 +6027,24 @@ msgstr "Si è verificato un errore durante il caricamento"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organizzazione:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Numero Corso"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Esecuzione corso:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Sola lettura)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Riesegui il corso"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Vedi Live"
diff --git a/conf/locale/ja_JP/LC_MESSAGES/django.mo b/conf/locale/ja_JP/LC_MESSAGES/django.mo
index 5a9986b7fb..a9e9f1474a 100644
Binary files a/conf/locale/ja_JP/LC_MESSAGES/django.mo and b/conf/locale/ja_JP/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ja_JP/LC_MESSAGES/django.po b/conf/locale/ja_JP/LC_MESSAGES/django.po
index f17d008e8c..5c20c95a9c 100644
--- a/conf/locale/ja_JP/LC_MESSAGES/django.po
+++ b/conf/locale/ja_JP/LC_MESSAGES/django.po
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Japanese (Japan) (https://www.transifex.com/open-edx/teams/6205/ja_JP/)\n"
@@ -2063,6 +2063,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "保存ボタンを表示させるか否か"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "リセットボタンを表示"
 
@@ -3446,6 +3447,12 @@ msgid ""
 " no filtering is applied."
 msgstr "ライブラリから取得する問題タイプを選んでください。\"全タイプ\"を選択するとフィルタリングは適用されません。"
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "このコンポーネントは期限切れです。ライブラリに新しいコンテンツがあります。"
@@ -6105,17 +6112,6 @@ msgstr "おめでとうございます！修了証の基準を達成しました
 msgid "You've earned a certificate for this course."
 msgstr "あなたはこの講座の修了証を取得しました。"
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "修了証は取得できません"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr "現在 {platform_name} の本人認証がないため、修了証が受理されていません。"
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6130,6 +6126,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "あなたの修了証は入手可能です"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "修了証は取得できません"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr "現在 {platform_name} の本人認証がないため、修了証が受理されていません。"
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6274,9 +6281,11 @@ msgid "Good"
 msgstr "良い"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6284,6 +6293,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8206,10 +8220,10 @@ msgid "You have signed out."
 msgstr "サインアウトしました。"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8224,10 +8238,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10320,6 +10335,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}' 欄は編集できません。"
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10771,10 +10791,6 @@ msgstr "入力されたaccess_tokenは有効ではありません。"
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "適切なフォーマットのメールが必要です"
@@ -13367,6 +13383,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "動画プレイヤーを読込中"
@@ -14872,8 +14892,8 @@ msgid "Share with friends and family!"
 msgstr "友人や家族とシェア！"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "{account}で{number}{title}に受講登録しました: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/ja_JP/LC_MESSAGES/djangojs.po b/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
index 5c83e72a4f..03700b16da 100644
--- a/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Kyoto University <edxkyotoux@gmail.com>, 2017\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/open-edx/edx-platform/language/ja_JP/)\n"
diff --git a/conf/locale/ka/LC_MESSAGES/django.mo b/conf/locale/ka/LC_MESSAGES/django.mo
index b84d7781ad..88cb999c55 100644
Binary files a/conf/locale/ka/LC_MESSAGES/django.mo and b/conf/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/ka/LC_MESSAGES/django.po b/conf/locale/ka/LC_MESSAGES/django.po
index 755c8e2525..370ccfda78 100644
--- a/conf/locale/ka/LC_MESSAGES/django.po
+++ b/conf/locale/ka/LC_MESSAGES/django.po
@@ -60,7 +60,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/open-edx/teams/6205/ka/)\n"
@@ -2081,6 +2081,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "გამოჩნდეს თუ არა გვერდზე შენახვის ღილაკი"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "ჩამოყრის ღილაკის გამოჩენა"
 
@@ -3614,6 +3615,12 @@ msgstr ""
 "აირჩიეთ, რა ტიპის ამოცანის გადმოტანა გსურთ ბიბლიოთეკიდან. \"ნებისმიერი "
 "ტიპი\"-ს მონიშვნის შემთხვევაში არ მოხდება ფილტრაცია."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "ეს კომპონენტი ვადაგასულია. ბიბლიოთეკას ახალი შინაარსი აქვს."
@@ -6482,19 +6489,6 @@ msgstr "გილოცავთ, თქვენ სერტიფიკატ
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "სერტიფიკატი არ არის ხელმისაწვდომი"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"თქვენ არ მიგიღიათ სერტიფიკატი, რადგან არ გაქვთ მიმდინარე {platform_name}-ის "
-"მიერ დამოწმებული იდენტობა."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6509,6 +6503,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "თქვენი სერტიფიკატი ხელმისაწვდომია"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "სერტიფიკატი არ არის ხელმისაწვდომი"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"თქვენ არ მიგიღიათ სერტიფიკატი, რადგან არ გაქვთ მიმდინარე {platform_name}-ის "
+"მიერ დამოწმებული იდენტობა."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6657,9 +6664,11 @@ msgid "Good"
 msgstr "კარგია"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6667,6 +6676,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8656,10 +8670,10 @@ msgid "You have signed out."
 msgstr "თქვენ გამოხვედით სისტემიდან."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8674,10 +8688,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10829,6 +10844,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}' ველი რედაქტირებას არ ექვემდებარება."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11296,10 +11316,6 @@ msgstr "წარმოდგენილი access_token-ი არასწო
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "მიუთითეთ ელფოსტის მისამართი სათანადო ფორმატით"
@@ -13950,6 +13966,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "ვიდეო დამკვრელის ჩატვირთვა"
@@ -15593,8 +15613,8 @@ msgid "Share with friends and family!"
 msgstr "გაუზიარეთ მეგობრებსა და ოჯახის წევრებს!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "ახლახანს ჩავირიცხე {number} {title}-ში {account}-ის მეშვეობით: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/ka/LC_MESSAGES/djangojs.po b/conf/locale/ka/LC_MESSAGES/djangojs.po
index ff87a6e53f..ddccbc845f 100644
--- a/conf/locale/ka/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ka/LC_MESSAGES/djangojs.po
@@ -56,7 +56,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Lasha Kokilashvili, 2018\n"
 "Language-Team: Georgian (http://www.transifex.com/open-edx/edx-platform/language/ka/)\n"
diff --git a/conf/locale/lt_LT/LC_MESSAGES/django.mo b/conf/locale/lt_LT/LC_MESSAGES/django.mo
index 367c3cf544..9c1c8c6477 100644
Binary files a/conf/locale/lt_LT/LC_MESSAGES/django.mo and b/conf/locale/lt_LT/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/lt_LT/LC_MESSAGES/django.po b/conf/locale/lt_LT/LC_MESSAGES/django.po
index 5e96bba5f5..11362a4058 100644
--- a/conf/locale/lt_LT/LC_MESSAGES/django.po
+++ b/conf/locale/lt_LT/LC_MESSAGES/django.po
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/open-edx/teams/6205/lt_LT/)\n"
@@ -2031,6 +2031,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3381,6 +3382,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -5993,17 +6000,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6018,6 +6014,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6156,9 +6163,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6166,6 +6175,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8040,10 +8054,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8058,10 +8072,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10158,6 +10173,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10584,10 +10604,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -13234,6 +13250,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Įkeliamas vaizdo leistuvas"
@@ -14751,8 +14771,8 @@ msgid "Share with friends and family!"
 msgstr "Pasidalinkite su draugais ir šeimos nariais!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Aš užsiregistravau į {number} {title} per {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/lt_LT/LC_MESSAGES/djangojs.po b/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
index a8e88c0ba2..6e72f6ad35 100644
--- a/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Riina <ciairdabar@yahoo.com>, 2014-2015\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/open-edx/edx-platform/language/lt_LT/)\n"
diff --git a/conf/locale/lv/LC_MESSAGES/django.mo b/conf/locale/lv/LC_MESSAGES/django.mo
index d247ed3ef2..27beb79a4f 100644
Binary files a/conf/locale/lv/LC_MESSAGES/django.mo and b/conf/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/lv/LC_MESSAGES/django.po b/conf/locale/lv/LC_MESSAGES/django.po
index 48d7566c90..ce9b72f9cb 100644
--- a/conf/locale/lv/LC_MESSAGES/django.po
+++ b/conf/locale/lv/LC_MESSAGES/django.po
@@ -49,7 +49,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Latvian (https://www.transifex.com/open-edx/teams/6205/lv/)\n"
@@ -2121,6 +2121,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Vai saglabāšanas taustiņu parādīt lapā piespiedu kārtā"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Parādīt atiestates taustiņu"
 
@@ -3668,6 +3669,12 @@ msgstr ""
 "Izvēlieties problēmas veidu, kuru ienest no bibliotēkas. Ja \\”Jebkura "
 "veida\" ir izvēlēts, netiks piemērota filtrēšana."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Šis komponents ir novecojis. Bibliotēkā ir jauns saturs."
@@ -6558,19 +6565,6 @@ msgstr "Apsveicam, Jūs kvalificējāties uz sertifikātu!"
 msgid "You've earned a certificate for this course."
 msgstr "Jūs esat nopelnījuši sertifikātu šim kursam."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Sertifikāts nav pieejams"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Jūs neesat saņēmuši sertifikātu, jo Jums nav pašreizējas, {platform_name} "
-"verificētas identitātes."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6585,6 +6579,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Jūsu sertifikāts ir pieejams"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Sertifikāts nav pieejams"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Jūs neesat saņēmuši sertifikātu, jo Jums nav pašreizējas, {platform_name} "
+"verificētas identitātes."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6734,9 +6741,11 @@ msgid "Good"
 msgstr "Labi"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6744,6 +6753,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8743,10 +8757,10 @@ msgid "You have signed out."
 msgstr "Jūs esat izrakstījušies"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8761,10 +8775,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -11008,6 +11023,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Lauku '{field_name}' nevar rediģēt."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11488,10 +11508,6 @@ msgstr "Sniegtais access_token ir nederīgs."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Vārds nevar saturēt norādītās rakstzīmes: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Nepieciešams pareizi formatēts e-pasts"
@@ -14145,6 +14161,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Ielādēt video atskaņotāju"
@@ -15785,8 +15805,8 @@ msgid "Share with friends and family!"
 msgstr "Kopīgojiet ar draugiem un ģimeni!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Es tikko reģistrējos {number} {title} ar {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/lv/LC_MESSAGES/djangojs.mo b/conf/locale/lv/LC_MESSAGES/djangojs.mo
index c29a1e9a1d..beb9e30bb3 100644
Binary files a/conf/locale/lv/LC_MESSAGES/djangojs.mo and b/conf/locale/lv/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/lv/LC_MESSAGES/djangojs.po b/conf/locale/lv/LC_MESSAGES/djangojs.po
index fa0cee8bfa..bab7d0b216 100644
--- a/conf/locale/lv/LC_MESSAGES/djangojs.po
+++ b/conf/locale/lv/LC_MESSAGES/djangojs.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: LTMC Latvijas Tiesnešu mācību centrs <ltmc.training@gmail.com>, 2019\n"
 "Language-Team: Latvian (http://www.transifex.com/open-edx/edx-platform/language/lv/)\n"
@@ -1989,7 +1989,7 @@ msgstr "Doties uz augšu"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Pārlūko"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2556,7 +2556,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Apraksts"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -2568,7 +2568,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Kā mēs varam Jums palīdzēt, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -5772,15 +5772,15 @@ msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organizācija:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Kursa numurs:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Kursa izpildes reize:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
diff --git a/conf/locale/mn/LC_MESSAGES/django.po b/conf/locale/mn/LC_MESSAGES/django.po
index 9e80fcf5a9..db39a34c97 100644
--- a/conf/locale/mn/LC_MESSAGES/django.po
+++ b/conf/locale/mn/LC_MESSAGES/django.po
@@ -74,7 +74,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Mongolian (https://www.transifex.com/open-edx/teams/6205/mn/)\n"
@@ -2081,6 +2081,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Дахин эхлүүлэх товчийг харуулах"
 
@@ -3435,6 +3436,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -6039,17 +6046,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6064,6 +6060,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6204,9 +6211,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6214,6 +6223,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8093,10 +8107,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8111,10 +8125,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: cms/templates/base.html lms/templates/main.html
@@ -10242,6 +10257,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr " '{field_name}' талбарыг засах боломжгүй."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10690,10 +10710,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Нэр дараах тэмдэгтүүдийг агуулсан байж болохгүй: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Зөв форматтай имэйл оруулах шаардлагатай"
@@ -13273,6 +13289,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Видео тоглуулагчийг ачаалж байна "
@@ -14754,7 +14774,7 @@ msgid "Share with friends and family!"
 msgstr "Найз нөхөд, гэр бүлийнхэнтэйгээ хуваалцах!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
diff --git a/conf/locale/mn/LC_MESSAGES/djangojs.mo b/conf/locale/mn/LC_MESSAGES/djangojs.mo
index db5992d022..daeee599a7 100644
Binary files a/conf/locale/mn/LC_MESSAGES/djangojs.mo and b/conf/locale/mn/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/mn/LC_MESSAGES/djangojs.po b/conf/locale/mn/LC_MESSAGES/djangojs.po
index a5280fa003..86bd2fde51 100644
--- a/conf/locale/mn/LC_MESSAGES/djangojs.po
+++ b/conf/locale/mn/LC_MESSAGES/djangojs.po
@@ -63,7 +63,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Myagmarjav Enkhbileg <miigaa.lucky@gmail.com>, 2018\n"
 "Language-Team: Mongolian (http://www.transifex.com/open-edx/edx-platform/language/mn/)\n"
@@ -2479,7 +2479,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Дэлгэрэнгүй"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -5463,15 +5463,15 @@ msgstr "Файл хуулахад алдаа гарлаа."
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Байгууллага:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Хичээлийн дугаар:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Хичээлийн хугацаа:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
@@ -5481,10 +5481,9 @@ msgstr ""
 msgid "Re-run Course"
 msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
-msgstr "LMS-д үзэх"
+msgstr "LMS-д харах"
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
diff --git a/conf/locale/pl/LC_MESSAGES/django.mo b/conf/locale/pl/LC_MESSAGES/django.mo
index 9b2ef9fca0..6106165cd2 100644
Binary files a/conf/locale/pl/LC_MESSAGES/django.mo and b/conf/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/pl/LC_MESSAGES/django.po b/conf/locale/pl/LC_MESSAGES/django.po
index d3f2eef056..3d852924f5 100644
--- a/conf/locale/pl/LC_MESSAGES/django.po
+++ b/conf/locale/pl/LC_MESSAGES/django.po
@@ -22,6 +22,7 @@
 # Magdalena Dulęba <magdalena.duleba@e-science.pl>, 2021-2022
 # Magdalena Jarosińska <m.jarosinska@stud.elka.pw.edu.pl>, 2015-2016
 # Marcin Miłek, 2021-2022
+# Marta Litwinowicz, 2022
 # Martyna Boguszewicz <martyna.boguszewicz@bluesoft.com>, 2020
 # Martyna Bogusz <piotr.boguszewicz@bluesoft.com>, 2020
 # Mateusz <blue90pl@gmail.com>, 2014
@@ -146,7 +147,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Marcin Miłek, 2022\n"
 "Language-Team: Polish (https://www.transifex.com/open-edx/teams/6205/pl/)\n"
@@ -2243,6 +2244,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Czy zmuszać do wyświetlania przycisku zapisu na tej stronie"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Pokazuj przycisk resetu"
 
@@ -3807,6 +3809,12 @@ msgstr ""
 "Wybierz typ ćwiczenia do pobrania z biblioteki. W przypadku wyboru opcji "
 "\"Dowolny typ\" nie zostanie zastosowany jakikolwiek filtr."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Ten element jest przestarzały. Biblioteka zawiera nową wersję treści."
@@ -6715,19 +6723,6 @@ msgstr "Gratulacje, kwalifikujesz się do uzyskania certyfikatu!"
 msgid "You've earned a certificate for this course."
 msgstr "Otrzymałeś/aś certyfikat za ukończenie tego kursu."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Certyfikat niedostępny"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Nie otrzymałeś certyfikatu, ponieważ nie posiadasz zweryfikowanej tożsamości"
-" dla potrzeb korzystania z platformy {platform_name}."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6742,6 +6737,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Twój certyfikat jest dostępny"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Certyfikat niedostępny"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Nie otrzymałeś certyfikatu, ponieważ nie posiadasz zweryfikowanej tożsamości"
+" dla potrzeb korzystania z platformy {platform_name}."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6890,9 +6898,11 @@ msgid "Good"
 msgstr "Dobrze"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6900,6 +6910,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8911,10 +8926,10 @@ msgid "You have signed out."
 msgstr "Zostałeś wylogowany"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8929,10 +8944,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -11142,6 +11158,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Pola '{field_name}' nie można edytować."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11612,10 +11633,6 @@ msgstr "Wskazany access_token jest nieprawidłowy."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Nazwisko nie może zawierać następujących znaków: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Wymagany jest poprawny format adresu e-mail."
@@ -14316,6 +14333,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Wczytywanie odtwarzacza filmów"
@@ -15877,9 +15898,8 @@ msgid "Share with friends and family!"
 msgstr "Podziel się z rodziną i znajomymi!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
-"Właśnie zapisałem się na kurs {number} {title} na koncie {account} {url}"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/pl/LC_MESSAGES/djangojs.po b/conf/locale/pl/LC_MESSAGES/djangojs.po
index 80f179a593..b7f97a1fdd 100644
--- a/conf/locale/pl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pl/LC_MESSAGES/djangojs.po
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Aleks Ada, 2022\n"
 "Language-Team: Polish (http://www.transifex.com/open-edx/edx-platform/language/pl/)\n"
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
index b91cd10f21..608c4cc45e 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -246,7 +246,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Rodrigo Rocha <prof.rodrigorocha@yahoo.com>, 2020\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/open-edx/edx-platform/language/pt_BR/)\n"
diff --git a/conf/locale/pt_PT/LC_MESSAGES/django.mo b/conf/locale/pt_PT/LC_MESSAGES/django.mo
index c3538c221f..dfb6f7079a 100644
Binary files a/conf/locale/pt_PT/LC_MESSAGES/django.mo and b/conf/locale/pt_PT/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/pt_PT/LC_MESSAGES/django.po b/conf/locale/pt_PT/LC_MESSAGES/django.po
index 9d57a08644..c287c7453d 100644
--- a/conf/locale/pt_PT/LC_MESSAGES/django.po
+++ b/conf/locale/pt_PT/LC_MESSAGES/django.po
@@ -140,7 +140,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Cátia Lopes <catia.lopes@bridgelk.com>, 2019\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/open-edx/teams/6205/pt_PT/)\n"
@@ -2308,6 +2308,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Se forçar o botão de guardar a aparecer na página"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Mostrar botão de reiniciar"
 
@@ -3904,6 +3905,12 @@ msgstr ""
 "Escolher um tipo de problema para ir buscar à biblioteca. Se for "
 "seleccionado \"Qualquer Tipo\", não é aplicada qualquer filtragem."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Este componente está desatualizado. A biblioteca tem conteúdo novo."
@@ -6948,19 +6955,6 @@ msgstr "Parabéns, qualificou-se para um certificado!"
 msgid "You've earned a certificate for this course."
 msgstr "Obteve um certificado para este curso."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Certificado indisponível"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Não recebeu um certificado porque não possui uma identidade verificada em "
-"{platform_name}."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "O seu certificado estará disponível em breve!"
@@ -6977,6 +6971,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "O seu certificado está disponível"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Certificado indisponível"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Não recebeu um certificado porque não possui uma identidade verificada em "
+"{platform_name}."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -7138,9 +7145,11 @@ msgid "Good"
 msgstr "Bom"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7148,6 +7157,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9271,13 +9285,11 @@ msgid "You have signed out."
 msgstr "Terminou a sessão."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor} Clique aqui{end_anchor} para apagar a sua sessão de Single "
-"Signed On (SSO)."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9294,13 +9306,12 @@ msgstr ""
 "                "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Se não for redirecionado dentro de 5 segundos, {start_anchor}clique aqui "
-"para ir para a página inicial{end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11656,6 +11667,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "O campo '{field_name}' não pode ser editado."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "Introduza um nome válido"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -12169,10 +12185,6 @@ msgstr "O access_token fornecido é inválido."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "O Nome Completo não pode conter os seguintes caracteres: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "Introduza um nome válido"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "É necessário um email corretamente formatado"
@@ -14992,6 +15004,10 @@ msgstr "Termina a {date}"
 msgid "Past due"
 msgstr "Data limite"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Carregamento do leitor de vídeo"
@@ -16877,9 +16893,8 @@ msgid "Share with friends and family!"
 msgstr "Partilhe com amigos e família!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
-"Acabei de me inscrever em {number} {title} através de {account}: {url}"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo b/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo
index 2678e5511d..9083373ef5 100644
Binary files a/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo and b/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/pt_PT/LC_MESSAGES/djangojs.po b/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
index 70154ef972..05315e0a49 100644
--- a/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Nika Shahidian, 2022\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/open-edx/edx-platform/language/pt_PT/)\n"
@@ -371,11 +371,11 @@ msgstr "A atualizar com o conteúdo mais recente"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "Carregando..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "Blocos selecionados"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2100,7 +2100,7 @@ msgstr "Subir"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Navegação"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2678,19 +2678,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Detalhes"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "O mais rápido e útil que conseguimos responder!"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "Criar Pedido de Apoio"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Em que podemos ajudá-lo, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2698,7 +2698,7 @@ msgstr "Autentique-se na {platform} para que o possamos ajudar."
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Precisa de ajuda para iniciar sessão?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3624,54 +3624,47 @@ msgstr "Ajude a tornar o edX melhor para todos!"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "Por que é que a edX recolhe estas informações?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"Ocorreu um erro ao tentar recuperar ou salvar as informações abaixo. Por "
-"favor, tente novamente mais tarde."
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
 msgstr ""
-"Qual foi o rendimento total combinado, de todos os seus membros da sua "
-"família, durante os últimos 12 meses? "
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"Já serviu, em ativo, nas Forças Armadas, Reservas ou Guarda Nacional dos "
-"EUA?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
-msgstr "Qual o nível mais alto de educação que atingiu até agora?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
 msgstr ""
-"Qual o nível mais alto de educação que um dos seus pais ou tutores atingiu?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "Selecione o estatuto profissional."
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "Em que sector trabalha atualmente?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "Em que sector pretende trabalhar?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3687,19 +3680,19 @@ msgstr "fechar questionário"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "terminar mais tarde"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "Voltar ao meu painel"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "Terminar mais tarde"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "página seguinte"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -6052,28 +6045,27 @@ msgstr "Ocorreu um erro com o carregamento"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Organização:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Número do Curso:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Curso de Formação:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Só leitura)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Reexecutar Curso"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
-msgstr "Ver em directo"
+msgstr "Visualizar ao vivo"
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
diff --git a/conf/locale/rtl/LC_MESSAGES/django.mo b/conf/locale/rtl/LC_MESSAGES/django.mo
index 3c012ee8a0..8a180150a4 100644
Binary files a/conf/locale/rtl/LC_MESSAGES/django.mo and b/conf/locale/rtl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/rtl/LC_MESSAGES/django.po b/conf/locale/rtl/LC_MESSAGES/django.po
index 14eba22bc6..fc641da0e0 100644
--- a/conf/locale/rtl/LC_MESSAGES/django.po
+++ b/conf/locale/rtl/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-29 20:42+0000\n"
-"PO-Revision-Date: 2022-05-29 20:42:17.222392\n"
+"POT-Creation-Date: 2022-06-13 20:01+0000\n"
+"PO-Revision-Date: 2022-06-13 20:01:05.089992\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: rtl\n"
@@ -49,6 +49,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.8.0\n"
 
+#: cms/djangoapps/contentstore/utils.py
+#: cms/djangoapps/contentstore/views/component.py
+#: cms/djangoapps/contentstore/views/item.py
+#: common/lib/xmodule/xmodule/html_module.py
+msgid "Text"
+msgstr "Ŧǝxʇ"
+
 #. #-#-#-#-#  django-partial.po (0.1a)  #-#-#-#-#
 #. Translators: 'Discussion' refers to the tab in the courseware that leads to
 #. the discussion forums
@@ -62,11 +69,6 @@ msgstr ""
 msgid "Discussion"
 msgstr "Đᴉsɔnssᴉøn"
 
-#: cms/djangoapps/contentstore/views/component.py
-#: common/lib/xmodule/xmodule/html_module.py
-msgid "Text"
-msgstr "Ŧǝxʇ"
-
 #: cms/djangoapps/contentstore/views/component.py
 #: openedx/core/djangoapps/content_libraries/constants.py
 msgid "Problem"
@@ -2139,6 +2141,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Wɥǝʇɥǝɹ ʇø ɟøɹɔǝ ʇɥǝ sɐʌǝ bnʇʇøn ʇø ɐddǝɐɹ øn ʇɥǝ dɐƃǝ"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Sɥøʍ Ɍǝsǝʇ Ƀnʇʇøn"
 
@@ -2928,25 +2931,6 @@ msgstr "Ⱥdʌɐnɔǝd Mødnlǝ Łᴉsʇ"
 msgid "Enter the names of the advanced modules to use in your course."
 msgstr "Ɇnʇǝɹ ʇɥǝ nɐɯǝs øɟ ʇɥǝ ɐdʌɐnɔǝd ɯødnlǝs ʇø nsǝ ᴉn ʎønɹ ɔønɹsǝ."
 
-#: common/lib/xmodule/xmodule/course_module.py
-msgid "Course Home Sidebar Name"
-msgstr "Ȼønɹsǝ Ħøɯǝ Sᴉdǝbɐɹ Nɐɯǝ"
-
-#: common/lib/xmodule/xmodule/course_module.py
-msgid ""
-"Enter the heading that you want students to see above your course handouts "
-"on the Course Home page. Your course handouts appear in the right panel of "
-"the page."
-msgstr ""
-"Ɇnʇǝɹ ʇɥǝ ɥǝɐdᴉnƃ ʇɥɐʇ ʎøn ʍɐnʇ sʇndǝnʇs ʇø sǝǝ ɐbøʌǝ ʎønɹ ɔønɹsǝ ɥɐndønʇs "
-"øn ʇɥǝ Ȼønɹsǝ Ħøɯǝ dɐƃǝ. Ɏønɹ ɔønɹsǝ ɥɐndønʇs ɐddǝɐɹ ᴉn ʇɥǝ ɹᴉƃɥʇ dɐnǝl øɟ "
-"ʇɥǝ dɐƃǝ."
-
-#: common/lib/xmodule/xmodule/course_module.py
-#: lms/templates/courseware/info.html
-msgid "Course Handouts"
-msgstr "Ȼønɹsǝ Ħɐndønʇs"
-
 #: common/lib/xmodule/xmodule/course_module.py
 msgid ""
 "True if timezones should be shown on dates in the course. Deprecated in "
@@ -3696,6 +3680,14 @@ msgstr ""
 "Ȼɥøøsǝ ɐ dɹøblǝɯ ʇʎdǝ ʇø ɟǝʇɔɥ ɟɹøɯ ʇɥǝ lᴉbɹɐɹʎ. Ɨɟ \"Ⱥnʎ Ŧʎdǝ\" ᴉs sǝlǝɔʇǝd"
 " nø ɟᴉlʇǝɹᴉnƃ ᴉs ɐddlᴉǝd."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+"Đǝʇǝɹɯᴉnǝs ʍɥǝʇɥǝɹ ɐ 'Ɍǝsǝʇ Ᵽɹøblǝɯs' bnʇʇøn ᴉs sɥøʍn, sø nsǝɹs ɯɐʎ ɹǝsǝʇ "
+"ʇɥǝᴉɹ ɐnsʍǝɹs ɐnd ɹǝsɥnɟɟlǝ sǝlǝɔʇǝd ᴉʇǝɯs."
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Ŧɥᴉs ɔøɯdønǝnʇ ᴉs ønʇ øɟ dɐʇǝ. Ŧɥǝ lᴉbɹɐɹʎ ɥɐs nǝʍ ɔønʇǝnʇ."
@@ -4521,11 +4513,6 @@ msgstr "Ŧɥᴉs ɔønʇǝnʇ ǝxdǝɹᴉɯǝnʇ ɥɐs ᴉssnǝs ʇɥɐʇ ɐɟɟ
 msgid "External Discussion"
 msgstr "Ɇxʇǝɹnɐl Đᴉsɔnssᴉøn"
 
-#: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py
-#: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
-msgid "Home"
-msgstr "Ħøɯǝ"
-
 #: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py
 #: lms/djangoapps/courseware/views/views.py
 #: openedx/features/course_experience/__init__.py
@@ -6713,19 +6700,6 @@ msgstr "Ȼønƃɹɐʇnlɐʇᴉøns, ʎøn bnɐlᴉɟᴉǝd ɟøɹ ɐ ɔǝɹʇᴉ
 msgid "You've earned a certificate for this course."
 msgstr "Ɏøn'ʌǝ ǝɐɹnǝd ɐ ɔǝɹʇᴉɟᴉɔɐʇǝ ɟøɹ ʇɥᴉs ɔønɹsǝ."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Ȼǝɹʇᴉɟᴉɔɐʇǝ nnɐʌɐᴉlɐblǝ"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Ɏøn ɥɐʌǝ nøʇ ɹǝɔǝᴉʌǝd ɐ ɔǝɹʇᴉɟᴉɔɐʇǝ bǝɔɐnsǝ ʎøn dø nøʇ ɥɐʌǝ ɐ ɔnɹɹǝnʇ "
-"{platform_name} ʌǝɹᴉɟᴉǝd ᴉdǝnʇᴉʇʎ."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "Ɏønɹ ɔǝɹʇᴉɟᴉɔɐʇǝ ʍᴉll bǝ ɐʌɐᴉlɐblǝ søøn!"
@@ -6742,6 +6716,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Ɏønɹ ɔǝɹʇᴉɟᴉɔɐʇǝ ᴉs ɐʌɐᴉlɐblǝ"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Ȼǝɹʇᴉɟᴉɔɐʇǝ nnɐʌɐᴉlɐblǝ"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Ɏøn ɥɐʌǝ nøʇ ɹǝɔǝᴉʌǝd ɐ ɔǝɹʇᴉɟᴉɔɐʇǝ bǝɔɐnsǝ ʎøn dø nøʇ ɥɐʌǝ ɐ ɔnɹɹǝnʇ "
+"{platform_name} ʌǝɹᴉɟᴉǝd ᴉdǝnʇᴉʇʎ."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6898,16 +6885,26 @@ msgid "Good"
 msgstr "Ǥøød"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s: Reported content awaits review"
-msgstr "%(course_name)s: Ɍǝdøɹʇǝd ɔønʇǝnʇ ɐʍɐᴉʇs ɹǝʌᴉǝʍ"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
+msgstr ""
+"\n"
+"                        %(course_name)s: Ɍǝdøɹʇǝd ɔønʇǝnʇ ɐʍɐᴉʇs ɹǝʌᴉǝʍ\n"
+"                    "
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 msgid "Go to Discussion"
 msgstr "Ǥø ʇø Đᴉsɔnssᴉøn"
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr "%(course_name)s: Ɍǝdøɹʇǝd ɔønʇǝnʇ ɐʍɐᴉʇs ɹǝʌᴉǝʍ"
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8991,13 +8988,13 @@ msgid "You have signed out."
 msgstr "Ɏøn ɥɐʌǝ sᴉƃnǝd ønʇ."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"{start_anchor}Ȼlᴉɔʞ ɥǝɹǝ{end_anchor} ʇø dǝlǝʇǝ ʎønɹ sᴉnƃlǝ sᴉƃnǝd øn (SSØ) "
-"sǝssᴉøn."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Ȼlᴉɔʞ ɥǝɹǝ{end_anchor} ʇø "
+"dǝlǝʇǝ ʎønɹ sᴉnƃlǝ sᴉƃnǝd øn (SSØ) sǝssᴉøn."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9014,13 +9011,15 @@ msgstr ""
 "                "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"Ɨɟ ʎøn ɐɹǝ nøʇ ɹǝdᴉɹǝɔʇǝd ʍᴉʇɥᴉn 5 sǝɔønds, {start_anchor}ɔlᴉɔʞ ɥǝɹǝ ʇø ƃø "
-"ʇø ʇɥǝ ɥøɯǝ dɐƃǝ{end_anchor}."
+"Ɨɟ ʎøn ɐɹǝ nøʇ ɹǝdᴉɹǝɔʇǝd ʍᴉʇɥᴉn 5 sǝɔønds, "
+"{start_anchor}%(target)s{middle_anchor}ɔlᴉɔʞ ɥǝɹǝ ʇø ƃø ʇø ʇɥǝ ɥøɯǝ "
+"dɐƃǝ{end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11172,10 +11171,6 @@ msgstr "Ʉdƃɹɐdǝ ʇø ǝɐɹn ɐ ʌǝɹᴉɟᴉǝd ɔǝɹʇᴉɟᴉɔɐʇǝ
 msgid "Upgrade to earn a verified certificate in %(first_course_name)s"
 msgstr "Ʉdƃɹɐdǝ ʇø ǝɐɹn ɐ ʌǝɹᴉɟᴉǝd ɔǝɹʇᴉɟᴉɔɐʇǝ ᴉn %(first_course_name)s"
 
-#: openedx/core/djangoapps/self_paced/models.py
-msgid "Enable course home page improvements."
-msgstr "Ɇnɐblǝ ɔønɹsǝ ɥøɯǝ dɐƃǝ ᴉɯdɹøʌǝɯǝnʇs."
-
 #: openedx/core/djangoapps/theming/views.py
 #, python-brace-format
 msgid "Site theme changed to {site_theme}"
@@ -11361,6 +11356,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Ŧɥǝ '{field_name}' ɟᴉǝld ɔɐnnøʇ bǝ ǝdᴉʇǝd."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "Ɇnʇǝɹ ɐ ʌɐlᴉd nɐɯǝ"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11860,10 +11860,6 @@ msgstr "Ŧɥǝ dɹøʌᴉdǝd ɐɔɔǝss_ʇøʞǝn ᴉs nøʇ ʌɐlᴉd."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Fnll Nɐɯǝ ɔɐnnøʇ ɔønʇɐᴉn ʇɥǝ ɟølløʍᴉnƃ ɔɥɐɹɐɔʇǝɹs: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "Ɇnʇǝɹ ɐ ʌɐlᴉd nɐɯǝ"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Ⱥ dɹødǝɹlʎ ɟøɹɯɐʇʇǝd ǝ-ɯɐᴉl ᴉs ɹǝbnᴉɹǝd"
@@ -12430,6 +12426,10 @@ msgstr ""
 "Ɨɟ ʎøn ɥɐʌǝ ɔønɔǝɹns ɐbønʇ sɥɐɹᴉnƃ ʎønɹ dɐʇɐ, dlǝɐsǝ ɔønʇɐɔʇ ʎønɹ "
 "ɐdɯᴉnᴉsʇɹɐʇøɹ ɐʇ {enterprise_customer_name}."
 
+#: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
+msgid "Home"
+msgstr "Ħøɯǝ"
+
 #: openedx/features/enterprise_support/templates/enterprise_support/admin/enrollment_attributes_override.html
 msgid "Enterprise Course Enrollments"
 msgstr "Ɇnʇǝɹdɹᴉsǝ Ȼønɹsǝ Ɇnɹøllɯǝnʇs"
@@ -14636,6 +14636,10 @@ msgstr "Đnǝ {date}"
 msgid "Past due"
 msgstr "Ᵽɐsʇ dnǝ"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr "Ɍǝsǝʇ Ᵽɹøblǝɯs"
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Łøɐdᴉnƃ ʌᴉdǝø dlɐʎǝɹ"
@@ -16490,8 +16494,8 @@ msgid "Share with friends and family!"
 msgstr "Sɥɐɹǝ ʍᴉʇɥ ɟɹᴉǝnds ɐnd ɟɐɯᴉlʎ!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Ɨ ɾnsʇ ǝnɹøllǝd ᴉn {number} {title} ʇɥɹønƃɥ {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr "Ɨ ɾnsʇ ǝnɹøllǝd ᴉn {number} {title} ʇɥɹønƃɥ {account} {url}"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
@@ -16620,51 +16624,6 @@ msgstr "øɟ"
 msgid "next page"
 msgstr "nǝxʇ dɐƃǝ"
 
-#: lms/templates/courseware/info.html
-msgid "{course_number} Course Info"
-msgstr "{course_number} Ȼønɹsǝ Ɨnɟø"
-
-#: lms/templates/courseware/info.html
-msgid "You are not enrolled yet"
-msgstr "Ɏøn ɐɹǝ nøʇ ǝnɹøllǝd ʎǝʇ"
-
-#: lms/templates/courseware/info.html
-msgid ""
-"You are not currently enrolled in this course. {link_start}Enroll "
-"now!{link_end}"
-msgstr ""
-"Ɏøn ɐɹǝ nøʇ ɔnɹɹǝnʇlʎ ǝnɹøllǝd ᴉn ʇɥᴉs ɔønɹsǝ. {link_start}Ɇnɹøll "
-"nøʍ!{link_end}"
-
-#: lms/templates/courseware/info.html
-msgid "Welcome to {org}'s {course_title}!"
-msgstr "Wǝlɔøɯǝ ʇø {org}'s {course_title}!"
-
-#: lms/templates/courseware/info.html
-msgid "Welcome to {course_title}!"
-msgstr "Wǝlɔøɯǝ ʇø {course_title}!"
-
-#: lms/templates/courseware/info.html
-#: lms/templates/dashboard/_dashboard_course_resume.html
-msgid "Resume Course"
-msgstr "Ɍǝsnɯǝ Ȼønɹsǝ"
-
-#: lms/templates/courseware/info.html
-msgid "View Updates in Studio"
-msgstr "Vᴉǝʍ Ʉddɐʇǝs ᴉn Sʇndᴉø"
-
-#: lms/templates/courseware/info.html
-msgid "Course Updates and News"
-msgstr "Ȼønɹsǝ Ʉddɐʇǝs ɐnd Nǝʍs"
-
-#: lms/templates/courseware/info.html
-msgid "Handout Navigation"
-msgstr "Ħɐndønʇ Nɐʌᴉƃɐʇᴉøn"
-
-#: lms/templates/courseware/info.html
-msgid "Course Tools"
-msgstr "Ȼønɹsǝ Ŧøøls"
-
 #: lms/templates/courseware/news.html
 msgid "News - MITx 6.002x"
 msgstr "Nǝʍs - MƗŦx 6.002x"
@@ -16805,10 +16764,6 @@ msgstr "Vᴉǝʍ Ȼǝɹʇᴉɟᴉɔɐʇǝ"
 msgid "Opens in a new browser window"
 msgstr "Ødǝns ᴉn ɐ nǝʍ bɹøʍsǝɹ ʍᴉndøʍ"
 
-#: lms/templates/courseware/progress.html
-msgid "Download Your Certificate"
-msgstr "Đøʍnløɐd Ɏønɹ Ȼǝɹʇᴉɟᴉɔɐʇǝ"
-
 #: lms/templates/courseware/progress.html
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Request Certificate"
@@ -17078,22 +17033,6 @@ msgstr "Ŧɥᴉs lᴉnʞ ʍᴉll ødǝn ʇɥǝ ɔǝɹʇᴉɟᴉɔɐʇǝ ʍǝb ʌ
 msgid "View my {cert_name_short}"
 msgstr "Vᴉǝʍ ɯʎ {cert_name_short}"
 
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid "This link will open/download a PDF document"
-msgstr "Ŧɥᴉs lᴉnʞ ʍᴉll ødǝn/døʍnløɐd ɐ ⱣĐF døɔnɯǝnʇ"
-
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid "Download my {cert_name_short}"
-msgstr "Đøʍnløɐd ɯʎ {cert_name_short}"
-
-#: lms/templates/dashboard/_dashboard_certificate_information.html
-msgid ""
-"This link will open/download a PDF document of your verified "
-"{cert_name_long}."
-msgstr ""
-"Ŧɥᴉs lᴉnʞ ʍᴉll ødǝn/døʍnløɐd ɐ ⱣĐF døɔnɯǝnʇ øɟ ʎønɹ ʌǝɹᴉɟᴉǝd "
-"{cert_name_long}."
-
 #: lms/templates/dashboard/_dashboard_certificate_information.html
 msgid "Complete our course feedback survey"
 msgstr "Ȼøɯdlǝʇǝ ønɹ ɔønɹsǝ ɟǝǝdbɐɔʞ snɹʌǝʎ"
@@ -17248,6 +17187,10 @@ msgstr ""
 msgid "Upgrade"
 msgstr "Ʉdƃɹɐdǝ"
 
+#: lms/templates/dashboard/_dashboard_course_resume.html
+msgid "Resume Course"
+msgstr "Ɍǝsnɯǝ Ȼønɹsǝ"
+
 #. Translators: provider_name is the name of a credit provider or university
 #. (e.g. State University)
 #: lms/templates/dashboard/_dashboard_credit_info.html
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.mo b/conf/locale/rtl/LC_MESSAGES/djangojs.mo
index 636b10fb32..e2519b5293 100644
Binary files a/conf/locale/rtl/LC_MESSAGES/djangojs.mo and b/conf/locale/rtl/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.po b/conf/locale/rtl/LC_MESSAGES/djangojs.po
index c089c6d5e0..3d51fd25d4 100644
--- a/conf/locale/rtl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/rtl/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-29 20:41+0000\n"
-"PO-Revision-Date: 2022-05-29 20:42:17.236317\n"
+"POT-Creation-Date: 2022-06-13 20:00+0000\n"
+"PO-Revision-Date: 2022-06-13 20:01:04.863306\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: rtl\n"
@@ -3792,6 +3792,10 @@ msgstr "Ʉnʞnøʍn nsǝɹnɐɯǝ: {user}"
 msgid "Invalid email address: {email}"
 msgstr "Ɨnʌɐlᴉd ǝɯɐᴉl ɐddɹǝss: {email}"
 
+#: lms/static/js/groups/views/cohort_editor.js
+msgid "Cohort assignment not allowed: {email_or_username}"
+msgstr "Ȼøɥøɹʇ ɐssᴉƃnɯǝnʇ nøʇ ɐlløʍǝd: {email_or_username}"
+
 #: lms/static/js/groups/views/cohort_editor.js
 msgid "There was an error when trying to add learners:"
 msgid_plural "{numErrors} learners could not be added to this cohort:"
@@ -7627,10 +7631,6 @@ msgstr "Ȼønɹsǝ Ꝁǝʎ"
 msgid "Status"
 msgstr "Sʇɐʇns"
 
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Download URL"
-msgstr "Đøʍnløɐd ɄɌŁ"
-
 #: lms/djangoapps/support/static/support/templates/certificates_results.underscore
 msgid "Grade"
 msgstr "Ǥɹɐdǝ"
@@ -7639,14 +7639,6 @@ msgstr "Ǥɹɐdǝ"
 msgid "Last Updated"
 msgstr "Łɐsʇ Ʉddɐʇǝd"
 
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Download the user's certificate"
-msgstr "Đøʍnløɐd ʇɥǝ nsǝɹ's ɔǝɹʇᴉɟᴉɔɐʇǝ"
-
-#: lms/djangoapps/support/static/support/templates/certificates_results.underscore
-msgid "Not available"
-msgstr "Nøʇ ɐʌɐᴉlɐblǝ"
-
 #: lms/djangoapps/support/static/support/templates/certificates_results.underscore
 msgid "Regenerate"
 msgstr "Ɍǝƃǝnǝɹɐʇǝ"
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.mo b/conf/locale/ru/LC_MESSAGES/djangojs.mo
index f4c86c8970..f7cf93f999 100644
Binary files a/conf/locale/ru/LC_MESSAGES/djangojs.mo and b/conf/locale/ru/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.po b/conf/locale/ru/LC_MESSAGES/djangojs.po
index eeed26b030..919e66ac55 100644
--- a/conf/locale/ru/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -191,7 +191,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: ashed <craysy@gmail.com>, 2022\n"
 "Language-Team: Russian (http://www.transifex.com/open-edx/edx-platform/language/ru/)\n"
@@ -2717,7 +2717,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Подробности"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
diff --git a/conf/locale/sk/LC_MESSAGES/django.po b/conf/locale/sk/LC_MESSAGES/django.po
index 9c6c419855..d4773e23af 100644
--- a/conf/locale/sk/LC_MESSAGES/django.po
+++ b/conf/locale/sk/LC_MESSAGES/django.po
@@ -55,7 +55,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Slovak (https://www.transifex.com/open-edx/teams/6205/sk/)\n"
@@ -2056,6 +2056,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3410,6 +3411,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -6050,17 +6057,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6075,6 +6071,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6215,9 +6222,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6225,6 +6234,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8142,10 +8156,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8160,10 +8174,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10264,6 +10279,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10718,10 +10738,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -13333,6 +13349,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr ""
@@ -14814,7 +14834,7 @@ msgid "Share with friends and family!"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
diff --git a/conf/locale/sk/LC_MESSAGES/djangojs.mo b/conf/locale/sk/LC_MESSAGES/djangojs.mo
index b0d219ee5d..f25265ec5e 100644
Binary files a/conf/locale/sk/LC_MESSAGES/djangojs.mo and b/conf/locale/sk/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/sk/LC_MESSAGES/djangojs.po b/conf/locale/sk/LC_MESSAGES/djangojs.po
index 525e5fec90..d3672296d2 100644
--- a/conf/locale/sk/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sk/LC_MESSAGES/djangojs.po
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: \n"
 "Language-Team: Slovak (http://www.transifex.com/open-edx/edx-platform/language/sk/)\n"
@@ -2484,7 +2484,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Podrobnosti"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
diff --git a/conf/locale/sw_KE/LC_MESSAGES/django.mo b/conf/locale/sw_KE/LC_MESSAGES/django.mo
index 250bc61340..8d7d818489 100644
Binary files a/conf/locale/sw_KE/LC_MESSAGES/django.mo and b/conf/locale/sw_KE/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/sw_KE/LC_MESSAGES/django.po b/conf/locale/sw_KE/LC_MESSAGES/django.po
index 8bf8264fc2..bdee88f21d 100644
--- a/conf/locale/sw_KE/LC_MESSAGES/django.po
+++ b/conf/locale/sw_KE/LC_MESSAGES/django.po
@@ -85,7 +85,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Swahili (Kenya) (https://www.transifex.com/open-edx/teams/6205/sw_KE/)\n"
@@ -2085,6 +2085,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3494,6 +3495,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -6149,19 +6156,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Cheti hakipatikani"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Hujapokea cheti kwasababu huna utambulisho wa sasa wa {platform_name} "
-"uliohakikiwa."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6176,6 +6170,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Cheti chako kinapatikana"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Cheti hakipatikani"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Hujapokea cheti kwasababu huna utambulisho wa sasa wa {platform_name} "
+"uliohakikiwa."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6318,9 +6325,11 @@ msgid "Good"
 msgstr "Vizuri"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6328,6 +6337,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8239,10 +8253,10 @@ msgid "You have signed out."
 msgstr "Umetoka mtandaoni."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8257,10 +8271,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10383,6 +10398,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Hii '{field_name}' sehemu haiwezi kuhaririwa."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10846,10 +10866,6 @@ msgstr "Alama_ya kuingia mtandaoni iliyotolewa ni batili."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Anwani ya barua pepe iliyo na mfumo sahihi inahitajika"
@@ -13507,6 +13523,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Kupakia uchezeshaji wa video"
@@ -15130,8 +15150,8 @@ msgid "Share with friends and family!"
 msgstr "Tuma kwa marafiki na jamii"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Nimejisajili katika {number} {title} kupitia {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/sw_KE/LC_MESSAGES/djangojs.po b/conf/locale/sw_KE/LC_MESSAGES/djangojs.po
index 81035fbca9..eaa676aa68 100644
--- a/conf/locale/sw_KE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sw_KE/LC_MESSAGES/djangojs.po
@@ -71,7 +71,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: YAHAYA MWAVURIZI <translations_1@camara.ie>, 2017\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/open-edx/edx-platform/language/sw_KE/)\n"
diff --git a/conf/locale/th/LC_MESSAGES/django.mo b/conf/locale/th/LC_MESSAGES/django.mo
index 352fc4ef4a..dd71ce0bd8 100644
Binary files a/conf/locale/th/LC_MESSAGES/django.mo and b/conf/locale/th/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/th/LC_MESSAGES/django.po b/conf/locale/th/LC_MESSAGES/django.po
index 90bd76b48b..6ed5623c92 100644
--- a/conf/locale/th/LC_MESSAGES/django.po
+++ b/conf/locale/th/LC_MESSAGES/django.po
@@ -115,7 +115,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Thai (https://www.transifex.com/open-edx/teams/6205/th/)\n"
@@ -2005,6 +2005,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3337,6 +3338,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -5933,17 +5940,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -5958,6 +5954,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6096,9 +6103,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6106,6 +6115,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -7974,10 +7988,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -7992,10 +8006,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10085,6 +10100,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10511,10 +10531,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -13122,6 +13138,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "กำลังโหลดเครื่องเล่นวิดิโอ"
@@ -14630,8 +14650,8 @@ msgid "Share with friends and family!"
 msgstr "แบ่งปันให้เพื่อนและครอบครัว"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "ฉันเพิ่งลงทะเบียนสำหรับ {number} {title}  ผ่าน {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/th/LC_MESSAGES/djangojs.po b/conf/locale/th/LC_MESSAGES/djangojs.po
index 8b6cacddf1..4a03811bac 100644
--- a/conf/locale/th/LC_MESSAGES/djangojs.po
+++ b/conf/locale/th/LC_MESSAGES/djangojs.po
@@ -73,7 +73,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: edx demo <edx.one2clouds@gmail.com>, 2019\n"
 "Language-Team: Thai (http://www.transifex.com/open-edx/edx-platform/language/th/)\n"
diff --git a/conf/locale/tr_TR/LC_MESSAGES/django.mo b/conf/locale/tr_TR/LC_MESSAGES/django.mo
index 2bea9bdcc5..ad6040edf8 100644
Binary files a/conf/locale/tr_TR/LC_MESSAGES/django.mo and b/conf/locale/tr_TR/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/tr_TR/LC_MESSAGES/django.po b/conf/locale/tr_TR/LC_MESSAGES/django.po
index 61a2deb856..e86cc49f51 100644
--- a/conf/locale/tr_TR/LC_MESSAGES/django.po
+++ b/conf/locale/tr_TR/LC_MESSAGES/django.po
@@ -132,7 +132,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Ali Işıngör <ali@artistanbul.io>, 2021\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/open-edx/teams/6205/tr_TR/)\n"
@@ -2223,6 +2223,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Kaydet düğmesinin sayfada görünmesini zorlayıp zorlamadığı "
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Sıfırla Düğmesini Göster"
 
@@ -3789,6 +3790,12 @@ msgstr ""
 "Kütüphaneden getirmek için problem türünü seçin. Eğer \"Herhangi Bir Tür\" "
 "seçiliyse filtreleme uygulanmaz."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Bu bileşen güncel değil. Kütüphane yeni içeriğe sahip."
@@ -6337,10 +6344,9 @@ msgid ""
 "have questions."
 msgstr ""
 
-#: lms/djangoapps/course_home_api/outline/views.py
 #: lms/templates/courseware/course_about.html
 msgid "Course is full"
-msgstr "Ders dolu"
+msgstr "Ders Dolu"
 
 #: lms/djangoapps/course_home_api/outline/views.py
 msgid "'course_id' is required."
@@ -6783,18 +6789,6 @@ msgstr "Tebrikler, siz bir sertifika için niteliklisiniz!"
 msgid "You've earned a certificate for this course."
 msgstr "Bu ders için sertifikaya hak kazandınız."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Sertifika mevcut değil"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Sertifika alamazsınız çünkü {platform_name} kimliğiniz doğrulanmış değil."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr "Sertifikanız yakında hazır olacak!"
@@ -6811,6 +6805,18 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Sertifikanız hazır"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Sertifika mevcut değil"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Sertifika alamazsınız çünkü {platform_name} kimliğiniz doğrulanmış değil."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6963,9 +6969,11 @@ msgid "Good"
 msgstr "İyi"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6973,6 +6981,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -9038,13 +9051,11 @@ msgid "You have signed out."
 msgstr "Çıkış yaptınız."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
-"Single Signed On (SSO) oturumunuzu silmek için "
-"{start_anchor}buraya{end_anchor} tıklayınız."
 
 #: lms/templates/logout.html
 msgid "We are signing you in."
@@ -9061,13 +9072,12 @@ msgstr ""
 "                "
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
-"5 saniye içinde yönlendirilmeniz yapılmadıysa, {start_anchor}anasayfaya "
-"dönmek için lütfen buraya tıklayınız{end_anchor}."
 
 #: lms/templates/main_django.html cms/templates/base.html
 #: lms/templates/main.html
@@ -11402,6 +11412,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}' alanı düzenlenemez."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr "Geçerli bir ad giriniz"
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11905,10 +11920,6 @@ msgstr "Sağlanan erişim belirteci geçerli değildir."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Tam isim şu karakterleri içeremez: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr "Geçerli bir ad giriniz"
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Geçerli biçimde e-posta adresi gerekiyor"
@@ -14666,6 +14677,10 @@ msgstr "Son gün {date}"
 msgid "Past due"
 msgstr "Zaman aşımına uğramış"
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Video oynatıcısı yükleniyor"
@@ -16344,8 +16359,8 @@ msgid "Share with friends and family!"
 msgstr "Bunu ailen ve arkadaşlarınla paylaş!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Ben sadece {account}:{url} yardımıyla {number}{title} a kaydoldum."
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo b/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo
index b4790b4692..46faf26ded 100644
Binary files a/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo and b/conf/locale/tr_TR/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/tr_TR/LC_MESSAGES/djangojs.po b/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
index ee3e678452..f327c99555 100644
--- a/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
@@ -108,7 +108,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Ali Işıngör <ali@artistanbul.io>, 2018,2020-2021\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/open-edx/edx-platform/language/tr_TR/)\n"
@@ -368,11 +368,11 @@ msgstr "Son kütüphane içeriğiyle güncelleniyor"
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Loading..."
-msgstr "Yüklüyor..."
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx
 msgid "Selected blocks"
-msgstr "Seçili blocklar"
+msgstr ""
 
 #: common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js
 msgid "Unable to update settings"
@@ -2087,7 +2087,7 @@ msgstr "Yukarı git"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "Göz atılıyor"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2643,19 +2643,19 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Ayrıntılar"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
-msgstr "o kadar hızlı ve yardımcı bir şekilde yanıt verebiliriz!"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Create Support Ticket"
-msgstr "Destek Talebi Oluştur"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Sana nasıl yardımcı olabiliriz, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -2665,7 +2665,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Need help logging in?"
-msgstr "Oturum açmak için yardıma mı ihtiyacınız var?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/single_support_form.jsx
 msgid ""
@@ -3559,53 +3559,47 @@ msgstr "edX'i herkes için daha iyi bir hale getirmemize yardım edin!"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Why does edX collect this information?"
-msgstr "edX neden bu bilgiyi topluyor?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "An error occurred while attempting to retrieve or save the information "
 "below. Please try again later."
 msgstr ""
-"Aşağıdaki bilgiyi çekmeye ya da kaydetmeye çalışırken bir hata gerçekleşti. "
-"Bir süre sonra lütfen tekrar deneyin."
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What was the total combined income, during the last 12 months, of all "
 "members of your family? "
-msgstr "Tüm aile üyelerinizin son 12 aylık toplam geliri, ne kadardı?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or "
 "National Guard?"
 msgstr ""
-"Bugüne dek ABD Ordusu, Yedek Kuvvetler ya da Ulusal Muhafızlarda hizmet "
-"ettiniz mi?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What is the highest level of education that you have achieved so far?"
-msgstr "Şimdiye kadar ulaştığınız en yüksek eğitim seviyesi nedir?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid ""
 "What is the highest level of education that any of your parents or guardians"
 " have achieved?"
 msgstr ""
-"Ebeveyn ya da velilerinizin şimdiye kadar ulaştığı en yüksek eğitim seviyesi"
-" nedir?"
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "Select employment status"
-msgstr "Meslek durumunu seçin"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you currently work in?"
-msgstr "Şu anda hangi sektörde çalışıyorsunuz?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/DemographicsCollectionModal.jsx
 msgid "What industry do you want to work in?"
-msgstr "Gelecekte hangi sektörde çalışmak istiyorsunuz?"
+msgstr ""
 
 #: lms/static/js/demographics_collection/MultiselectDropdown.jsx
 msgid "Clear all"
@@ -3621,19 +3615,19 @@ msgstr "anketi kapat"
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "finish later"
-msgstr "sonra tamamla"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Return to my dashboard"
-msgstr "Panelime geri dön"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "Finish later"
-msgstr "Sonra tamamla"
+msgstr ""
 
 #: lms/static/js/demographics_collection/Wizard.jsx
 msgid "next page"
-msgstr "sonraki sayfa"
+msgstr ""
 
 #: lms/static/js/discovery/views/search_form.js
 #, javascript-format
@@ -5921,25 +5915,24 @@ msgstr "Yüklemede bir sorun oluştu"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Kurum:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Ders Numarası:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Ders Yayını:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Salt-okunur)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Dersi Yeniden Çalıştır"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Canlı Görüntüle"
diff --git a/conf/locale/uk/LC_MESSAGES/django.po b/conf/locale/uk/LC_MESSAGES/django.po
index 2027a51cdd..ca93357edf 100644
--- a/conf/locale/uk/LC_MESSAGES/django.po
+++ b/conf/locale/uk/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@
 # Denis <prohibiti@gmail.com>, 2015
 # Dmytro Pupkin <dkan327@gmail.com>, 2014
 # Dmytro Dzubenko <dzubchikd@gmail.com>, 2014
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Irene Korotkova <irca.gav@gmail.com>, 2017
 # IvanPrimachenko <jastudent1@gmail.com>, 2014
 # Martin Horst <horst.mr@gmail.com>, 2018
@@ -43,7 +43,7 @@
 # Natalia Vynogradenko <tannaha@gmail.com>, 2017
 # Oleksandr Prodanyuk, 2015
 # olexiim <olexiim@gmail.com>, 2014,2016
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Waheed Ahmed <waheed@edx.org>, 2019
 # Валентина Пицик <lushalusha007@gmail.com>, 2019
 # #-#-#-#-#  mako.po (edx-platform)  #-#-#-#-#
@@ -75,7 +75,7 @@
 # Radmila Segol <geroneja@yahoo.com>, 2016
 # b05b3114c658f75176891a498d64259e_fde2d81 <2bbdcf581dfc2149465c711c88b61acb_243008>, 2015
 # Zoriana Zaiats, 2015
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Евгений Мовсесов <yevgeniy.movsesov@gmail.com>, 2020
 # Андрей Поляков <polyakov.andrey@gmail.com>, 2016
 # #-#-#-#-#  mako-studio.po (edx-platform)  #-#-#-#-#
@@ -94,7 +94,7 @@
 # Olga Filipova <chudaol@gmail.com>, 2015
 # Olga Filipova <olga.filipova@feedzai.com>, 2016
 # Zoriana Zaiats, 2015
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Андрей Поляков <polyakov.andrey@gmail.com>, 2016
 # Ксенія Воронова <ksenya.voronova@gmail.com>, 2016
 # #-#-#-#-#  wiki.po (edx-platform)  #-#-#-#-#
@@ -124,7 +124,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Danylo Shcherbak <danylo.shcherbak@raccoongang.com>, 2020\n"
 "Language-Team: Ukrainian (https://www.transifex.com/open-edx/teams/6205/uk/)\n"
@@ -2245,6 +2245,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "Умови відображення кнопки \"Зберегти\" на сторінці"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "Показати кнопку скидання"
 
@@ -3811,6 +3812,12 @@ msgstr ""
 "Виберіть вид завдання, який має повертати бібліотека. Якщо вибрано «Будь-"
 "який», фільтри не застосовуються."
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "Цей компонент застарів. Оновлено вміст бібліотеки."
@@ -6707,19 +6714,6 @@ msgstr "Вітаємо, ви атестовані для отримання се
 msgid "You've earned a certificate for this course."
 msgstr "Ви отримали сертіфікат з даного курсу."
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "Сертифікат не доступний"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-"Ви не отримали сертифікат, оскільки у вас немає перевіреної ідентифікації на"
-" {platform_name}."
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6734,6 +6728,19 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "Ваш сертифікат доступний"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "Сертифікат не доступний"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+"Ви не отримали сертифікат, оскільки у вас немає перевіреної ідентифікації на"
+" {platform_name}."
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6880,9 +6887,11 @@ msgid "Good"
 msgstr "Добре"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6890,6 +6899,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8931,10 +8945,10 @@ msgid "You have signed out."
 msgstr "Ви вийшли."
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8949,10 +8963,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -11183,6 +11198,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "Поле '{field_name}' не може бути відредаговано."
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11663,10 +11683,6 @@ msgstr "Наданий access_token неприпустимий."
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "Повне им'я не може містити наступних символів: < >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "Потрібен e-mail встановленої форми"
@@ -14337,6 +14353,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr ""
@@ -15832,7 +15852,7 @@ msgid "Share with friends and family!"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
 msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
diff --git a/conf/locale/uk/LC_MESSAGES/djangojs.mo b/conf/locale/uk/LC_MESSAGES/djangojs.mo
index 8d59277094..eca6916501 100644
Binary files a/conf/locale/uk/LC_MESSAGES/djangojs.mo and b/conf/locale/uk/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/uk/LC_MESSAGES/djangojs.po b/conf/locale/uk/LC_MESSAGES/djangojs.po
index dad769af15..8f5d53a286 100644
--- a/conf/locale/uk/LC_MESSAGES/djangojs.po
+++ b/conf/locale/uk/LC_MESSAGES/djangojs.po
@@ -31,7 +31,7 @@
 # Sofiia <s.prokopchuk13@gmail.com>, 2015
 # Zoriana Zaiats, 2015
 # Tetiana Korshun, 2014
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Volodymyr Matskiv <xxwolfsilver@gmail.com>, 2014
 # Юра Антонов <yuraantonov11@gmail.com>, 2015
 # Zapadenska <oruda@ymail.com>, 2014
@@ -55,7 +55,7 @@
 # Natalia Vynogradenko <tannaha@gmail.com>, 2017-2018
 # Zapadenska <oruda@ymail.com>, 2014
 # Zoriana Zaiats, 2015
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Waheed Ahmed <waheed@edx.org>, 2019
 # Zoriana Zaiats, 2015
 # Ксенія Воронова <ksenya.voronova@gmail.com>, 2016
@@ -84,7 +84,7 @@
 # olexiim <olexiim@gmail.com>, 2014-2015
 # Olga Filipova <chudaol@gmail.com>, 2014,2016-2017
 # Olga Filipova <olga.filipova@feedzai.com>, 2016,2018
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Андрей Поляков <polyakov.andrey@gmail.com>, 2016
 # #-#-#-#-#  underscore-studio.po (edx-platform)  #-#-#-#-#
 # edX community translations have been downloaded from Ukrainian (http://www.transifex.com/open-edx/edx-platform/language/uk/)
@@ -96,13 +96,13 @@
 # Denis <prohibiti@gmail.com>, 2015
 # Irene Korotkova <irca.gav@gmail.com>, 2017
 # Natalia Vynogradenko <tannaha@gmail.com>, 2017-2018
-# Tetiana Korshun, 2014
+# Tanya Korshun, 2014
 # Ксенія Воронова <ksenya.voronova@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Andrey Kryachko, 2018\n"
 "Language-Team: Ukrainian (http://www.transifex.com/open-edx/edx-platform/language/uk/)\n"
@@ -2605,7 +2605,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Деталі"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -5844,7 +5844,7 @@ msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Номер Курсу:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
@@ -5852,7 +5852,7 @@ msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Лише для читання)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
diff --git a/conf/locale/vi/LC_MESSAGES/django.mo b/conf/locale/vi/LC_MESSAGES/django.mo
index 335eeec7fb..83cb940ba0 100644
Binary files a/conf/locale/vi/LC_MESSAGES/django.mo and b/conf/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/vi/LC_MESSAGES/django.po b/conf/locale/vi/LC_MESSAGES/django.po
index 7c697b65da..1743737fc8 100644
--- a/conf/locale/vi/LC_MESSAGES/django.po
+++ b/conf/locale/vi/LC_MESSAGES/django.po
@@ -198,7 +198,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Le Minh Tri <trilm@hihexa.com>, 2020\n"
 "Language-Team: Vietnamese (https://www.transifex.com/open-edx/teams/6205/vi/)\n"
@@ -2073,6 +2073,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr ""
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr ""
 
@@ -3405,6 +3406,12 @@ msgid ""
 " no filtering is applied."
 msgstr ""
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr ""
@@ -5998,17 +6005,6 @@ msgstr ""
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr ""
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr ""
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6023,6 +6019,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr ""
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr ""
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr ""
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6161,9 +6168,11 @@ msgid "Good"
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6171,6 +6180,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8035,10 +8049,10 @@ msgid "You have signed out."
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8053,10 +8067,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10144,6 +10159,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr ""
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10570,10 +10590,6 @@ msgstr ""
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr ""
@@ -13223,6 +13239,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "Đang tải trình xem video"
@@ -14913,8 +14933,8 @@ msgid "Share with friends and family!"
 msgstr "Chia sẻ với bạn bè và gia đình!"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "Tôi vừa mới ghi danh vào {number}{title} bằng {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/vi/LC_MESSAGES/djangojs.mo b/conf/locale/vi/LC_MESSAGES/djangojs.mo
index d7eeced8b9..d31383bdd9 100644
Binary files a/conf/locale/vi/LC_MESSAGES/djangojs.mo and b/conf/locale/vi/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/vi/LC_MESSAGES/djangojs.po b/conf/locale/vi/LC_MESSAGES/djangojs.po
index 669cb14df2..2870f24cb2 100644
--- a/conf/locale/vi/LC_MESSAGES/djangojs.po
+++ b/conf/locale/vi/LC_MESSAGES/djangojs.po
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Le Minh Tri <trilm@hihexa.com>, 2020\n"
 "Language-Team: Vietnamese (http://www.transifex.com/open-edx/edx-platform/language/vi/)\n"
@@ -2554,7 +2554,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "Chi tiết"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -2566,7 +2566,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "Chúng tôi có thể giúp gì cho bạn, {username}?"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -5723,25 +5723,24 @@ msgstr "Có lỗi trong quá trình tải lên"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "Tổ chức:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "Mã khóa học:"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "Chạy khóa học"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "(Chỉ-đọc)"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "Chạy lại Khóa học"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
 msgstr "Xem bản thực"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo
index b6633bfc99..c27452fcd6 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.po b/conf/locale/zh_CN/LC_MESSAGES/django.po
index d2f0829519..beea4c18d6 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -397,7 +397,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: ifLab <webmaster@iflab.org>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/open-edx/teams/6205/zh_CN/)\n"
@@ -2343,6 +2343,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "是否强制显示保存按钮"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "显示重置按钮"
 
@@ -3716,6 +3717,12 @@ msgid ""
 " no filtering is applied."
 msgstr "选择一个要从知识库中获取的问题类型，如果选择了“任意类型”，则不应用任何筛选。"
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "该组件已过时。知识库有新的内容。"
@@ -6381,17 +6388,6 @@ msgstr "恭喜！您已获得证书！"
 msgid "You've earned a certificate for this course."
 msgstr "您已获得此门课程的证书。"
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "无法查看证书"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr "未进行{platform_name}身份认证无法获得证书。"
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6406,6 +6402,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "您的证书已可用"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "无法查看证书"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr "未进行{platform_name}身份认证无法获得证书。"
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6549,9 +6556,11 @@ msgid "Good"
 msgstr "好"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6559,6 +6568,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8489,10 +8503,10 @@ msgid "You have signed out."
 msgstr "您已注销。"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8507,10 +8521,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10646,6 +10661,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}'字段无法编辑。"
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11101,10 +11121,6 @@ msgstr "提供的access_token无效。"
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "全名中不能包含这些字符：< >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "需要正确的邮件格式"
@@ -13700,6 +13716,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "正在加载视频播放器"
@@ -15243,8 +15263,8 @@ msgid "Share with friends and family!"
 msgstr "与亲朋好友分享！"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "我刚通过 {account}：{url} 选修了 {number} {title}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
index 8b9cb06391..3b17278864 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
index cd73439999..a792a847e6 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -226,7 +226,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: jsgang <jsgang9@gmail.com>, 2015-2017,2020\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
@@ -2127,7 +2127,7 @@ msgstr "向上导航"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "浏览"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2637,7 +2637,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "细节"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -2649,7 +2649,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "亲爱的{username}，有什么可以帮助您？"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -5625,28 +5625,27 @@ msgstr "文件上传错误"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "机构："
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "课程编号："
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "课程长度："
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "（只读）"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "重启课程"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
-msgstr "查看线上版本"
+msgstr "查看在线版"
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.mo b/conf/locale/zh_HANS/LC_MESSAGES/django.mo
index b6633bfc99..c27452fcd6 100644
Binary files a/conf/locale/zh_HANS/LC_MESSAGES/django.mo and b/conf/locale/zh_HANS/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.po b/conf/locale/zh_HANS/LC_MESSAGES/django.po
index d2f0829519..beea4c18d6 100644
--- a/conf/locale/zh_HANS/LC_MESSAGES/django.po
+++ b/conf/locale/zh_HANS/LC_MESSAGES/django.po
@@ -397,7 +397,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: ifLab <webmaster@iflab.org>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/open-edx/teams/6205/zh_CN/)\n"
@@ -2343,6 +2343,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "是否强制显示保存按钮"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "显示重置按钮"
 
@@ -3716,6 +3717,12 @@ msgid ""
 " no filtering is applied."
 msgstr "选择一个要从知识库中获取的问题类型，如果选择了“任意类型”，则不应用任何筛选。"
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "该组件已过时。知识库有新的内容。"
@@ -6381,17 +6388,6 @@ msgstr "恭喜！您已获得证书！"
 msgid "You've earned a certificate for this course."
 msgstr "您已获得此门课程的证书。"
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "无法查看证书"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr "未进行{platform_name}身份认证无法获得证书。"
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6406,6 +6402,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "您的证书已可用"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "无法查看证书"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr "未进行{platform_name}身份认证无法获得证书。"
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6549,9 +6556,11 @@ msgid "Good"
 msgstr "好"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6559,6 +6568,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8489,10 +8503,10 @@ msgid "You have signed out."
 msgstr "您已注销。"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8507,10 +8521,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10646,6 +10661,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr "'{field_name}'字段无法编辑。"
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -11101,10 +11121,6 @@ msgstr "提供的access_token无效。"
 msgid "Full Name cannot contain the following characters: < >"
 msgstr "全名中不能包含这些字符：< >"
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "需要正确的邮件格式"
@@ -13700,6 +13716,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "正在加载视频播放器"
@@ -15243,8 +15263,8 @@ msgid "Share with friends and family!"
 msgstr "与亲朋好友分享！"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "我刚通过 {account}：{url} 选修了 {number} {title}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo
index 8b9cb06391..3b17278864 100644
Binary files a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
index cd73439999..a792a847e6 100644
--- a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
@@ -226,7 +226,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: jsgang <jsgang9@gmail.com>, 2015-2017,2020\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
@@ -2127,7 +2127,7 @@ msgstr "向上导航"
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Browsing"
-msgstr "浏览"
+msgstr ""
 
 #: common/static/common/js/components/BlockBrowser/components/BlockBrowser/BlockBrowser.jsx
 msgid "Select"
@@ -2637,7 +2637,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "Details"
-msgstr "细节"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "the more quickly and helpfully we can respond!"
@@ -2649,7 +2649,7 @@ msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
 msgid "What can we help you with, {username}?"
-msgstr "亲爱的{username}，有什么可以帮助您？"
+msgstr ""
 
 #: lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
 msgid "Sign in to {platform} so we can help you better."
@@ -5625,28 +5625,27 @@ msgstr "文件上传错误"
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Organization:"
-msgstr "机构："
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Number:"
-msgstr "课程编号："
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Course Run:"
-msgstr "课程长度："
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "(Read-only)"
-msgstr "（只读）"
+msgstr ""
 
 #: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 msgid "Re-run Course"
-msgstr "重启课程"
+msgstr ""
 
-#: cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx
 #: cms/templates/js/show-textbook.underscore
 msgid "View Live"
-msgstr "查看线上版本"
+msgstr "查看在线版"
 
 #: cms/static/js/maintenance/force_publish_course.js
 msgid "Internal Server Error."
diff --git a/conf/locale/zh_TW/LC_MESSAGES/django.mo b/conf/locale/zh_TW/LC_MESSAGES/django.mo
index edd15eeccf..16f36c08f3 100644
Binary files a/conf/locale/zh_TW/LC_MESSAGES/django.mo and b/conf/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_TW/LC_MESSAGES/django.po b/conf/locale/zh_TW/LC_MESSAGES/django.po
index 443cba801e..c83427d85a 100644
--- a/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -177,7 +177,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:44+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/open-edx/teams/6205/zh_TW/)\n"
@@ -2104,6 +2104,7 @@ msgid "Whether to force the save button to appear on the page"
 msgstr "是否強制 儲存按鈕 顯示在這個頁面上"
 
 #: common/lib/xmodule/xmodule/capa_module.py
+#: common/lib/xmodule/xmodule/library_content_module.py
 msgid "Show Reset Button"
 msgstr "顯示重新設定按鈕"
 
@@ -3464,6 +3465,12 @@ msgid ""
 " no filtering is applied."
 msgstr "從課程組件庫中選擇一個問題類型，如果選擇“任何類型”則不進行過濾。"
 
+#: common/lib/xmodule/xmodule/library_content_module.py
+msgid ""
+"Determines whether a 'Reset Problems' button is shown, so users may reset "
+"their answers and reshuffle selected items."
+msgstr ""
+
 #: common/lib/xmodule/xmodule/library_content_module.py
 msgid "This component is out of date. The library has new content."
 msgstr "此組件已過期，課程組件庫中有新的內容。"
@@ -6110,17 +6117,6 @@ msgstr "恭喜，您已符合認證資格。"
 msgid "You've earned a certificate for this course."
 msgstr ""
 
-#: lms/djangoapps/courseware/views/views.py
-msgid "Certificate unavailable"
-msgstr "不提供修課證書"
-
-#: lms/djangoapps/courseware/views/views.py
-#, python-brace-format
-msgid ""
-"You have not received a certificate because you do not have a current "
-"{platform_name} verified identity."
-msgstr "您尚未收到證書，因為您沒有當前{platform_name}的驗證身分。 "
-
 #: lms/djangoapps/courseware/views/views.py
 msgid "Your certificate will be available soon!"
 msgstr ""
@@ -6135,6 +6131,17 @@ msgstr ""
 msgid "Your certificate is available"
 msgstr "您的證書已可取得"
 
+#: lms/djangoapps/courseware/views/views.py
+msgid "Certificate unavailable"
+msgstr "不提供修課證書"
+
+#: lms/djangoapps/courseware/views/views.py
+#, python-brace-format
+msgid ""
+"You have not received a certificate because you do not have a current "
+"{platform_name} verified identity."
+msgstr "您尚未收到證書，因為您沒有當前{platform_name}的驗證身分。 "
+
 #: lms/djangoapps/courseware/views/views.py
 #, python-brace-format
 msgid "To see course content, {sign_in_link} or {register_link}."
@@ -6276,9 +6283,11 @@ msgid "Good"
 msgstr "好"
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
-#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
 #, python-format
-msgid "%(course_name)s %(course_id)s Reported content awaits review"
+msgid ""
+"\n"
+"                        %(course_name)s: Reported content awaits review\n"
+"                    "
 msgstr ""
 
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -6286,6 +6295,11 @@ msgstr ""
 msgid "Go to Discussion"
 msgstr ""
 
+#: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+#, python-format
+msgid "%(course_name)s: Reported content awaits review"
+msgstr ""
+
 #: lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/subject.txt
 #, python-format
 msgid " %(course_name)s %(course_id)s moderator content for review "
@@ -8209,10 +8223,10 @@ msgid "You have signed out."
 msgstr "您已登出。"
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"{start_anchor}Click here{end_anchor} to delete your single signed on (SSO) "
-"session."
+"{start_anchor}%(tpa_logout_url)s{middle_anchor}Click here{end_anchor} to "
+"delete your single signed on (SSO) session."
 msgstr ""
 
 #: lms/templates/logout.html
@@ -8227,10 +8241,11 @@ msgid ""
 msgstr ""
 
 #: lms/templates/logout.html
-#, python-brace-format
+#, python-format, python-brace-format
 msgid ""
-"If you are not redirected within 5 seconds, {start_anchor}click here to go "
-"to the home page{end_anchor}."
+"If you are not redirected within 5 seconds, "
+"{start_anchor}%(target)s{middle_anchor}click here to go to the home "
+"page{end_anchor}."
 msgstr ""
 
 #: lms/templates/main_django.html cms/templates/base.html
@@ -10306,6 +10321,11 @@ msgstr ""
 msgid "The '{field_name}' field cannot be edited."
 msgstr " '{field_name}' 欄位不可被編輯。"
 
+#: openedx/core/djangoapps/user_api/accounts/api.py
+#: openedx/core/djangoapps/user_authn/views/registration_form.py
+msgid "Enter a valid name"
+msgstr ""
+
 #. Translators: This label appears above a field which allows the
 #. user to input the First Name
 #. Translators: This label appears above a field on the registration form
@@ -10757,10 +10777,6 @@ msgstr "所提供的access_token無效。"
 msgid "Full Name cannot contain the following characters: < >"
 msgstr ""
 
-#: openedx/core/djangoapps/user_authn/views/registration_form.py
-msgid "Enter a valid name"
-msgstr ""
-
 #: openedx/core/djangoapps/user_authn/views/registration_form.py
 msgid "A properly formatted e-mail is required"
 msgstr "一個正確格式的電子郵件是必需的"
@@ -13335,6 +13351,10 @@ msgstr ""
 msgid "Past due"
 msgstr ""
 
+#: lms/templates/vert_module.html
+msgid "Reset Problems"
+msgstr ""
+
 #: lms/templates/video.html
 msgid "Loading video player"
 msgstr "正在載入影片撥放器"
@@ -14816,8 +14836,8 @@ msgid "Share with friends and family!"
 msgstr "與朋友和家人分享！"
 
 #: lms/templates/courseware/course_about_sidebar_header.html
-msgid "I just enrolled in {number} {title} through {account}: {url}"
-msgstr "我剛註冊 {number} {title} 透過 {account}: {url}"
+msgid "I just enrolled in {number} {title} through {account} {url}"
+msgstr ""
 
 #: lms/templates/courseware/course_about_sidebar_header.html
 msgid "I just enrolled in {number} {title} through {platform} {url}"
diff --git a/conf/locale/zh_TW/LC_MESSAGES/djangojs.po b/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
index 5aa06768f8..6cf10f387a 100644
--- a/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
@@ -132,7 +132,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2022-05-22 20:43+0000\n"
+"POT-Creation-Date: 2022-06-12 20:43+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Andrew Lau <alau52@yahoo.com>, 2017\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/open-edx/edx-platform/language/zh_TW/)\n"
diff --git a/docs/decisions/0014-no-new-apps.rst b/docs/decisions/0014-no-new-apps.rst
new file mode 100644
index 0000000000..6c07a8e2c0
--- /dev/null
+++ b/docs/decisions/0014-no-new-apps.rst
@@ -0,0 +1,34 @@
+Justifying new Django applications in edx-platform
+==================================================
+
+Status
+------
+Accepted
+
+Context
+-------
+The Open edX platform is moving toward a more modular architecture. The goal is to transition from a monolithic application in edx-platform to one in which this repository represents a small, stable core with volatility pushed into extensions and plugins. To that end, much of the original edx-platform repository has been split out into micro-frontends, other microservices, plugins, and libraries. However, there are still a number of optional and non-core Django applications within edx-platform and new ones continue to be added.
+For more information on plugins in particular, see the `Django Apps Plugin README`_.
+
+.. _Django Apps Plugin README: https://github.com/openedx/edx-django-utils/blob/master/edx_django_utils/plugins/README.rst
+
+
+Decision
+--------
+From the adoption of this ADR, no new Django applications should be added into the edx-platform repository without an accompanying ADR explaining why the application cannot or should not be created in a new repository or included in an existing external plugin or library.
+
+Further Guidance
+----------------
+
+While the preference should always be to develop outside the edx-platform repository, either by extending an existing external Django application repository or creating a new one, there are still acceptable reasons why a new application would be better developed within edx-platform:
+
+* The application relates directly to core functionality: course authoring, course administration, or learner-courseware interactions
+* The application requires multiple imports from edx-platform
+
+  * Note: There are strategies for plugging apps into core LMS and CMS behaviors without directly importing edx-platform code, notably the `Hooks Extension Framework`_.
+  * If it is truly necessary to import from edx-platform code directly, in addition to noting this in the ADR, the authors of the new application should add the libraries or applications it imports to the `Libraries we KNOW we want to move out of the monolith`_ Confluence page.
+
+
+.. _Hooks Extension Framework: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0050-hooks-extension-framework.html
+
+.. _Libraries we KNOW we want to move out of the monolith: https://openedx.atlassian.net/wiki/spaces/AC/pages/525172740/Libraries+we+KNOW+we+want+to+move+out+of+the+monolith
diff --git a/lms/djangoapps/certificates/tests/test_signals.py b/lms/djangoapps/certificates/tests/test_signals.py
index abc10411ec..6b6ef54c02 100644
--- a/lms/djangoapps/certificates/tests/test_signals.py
+++ b/lms/djangoapps/certificates/tests/test_signals.py
@@ -56,7 +56,6 @@ class AllowlistGeneratedCertificatesTest(ModuleStoreTestCase):
     """
     Tests for allowlisted student auto-certificate generation
     """
-
     def setUp(self):
         super().setUp()
         self.user = UserFactory.create()
@@ -104,7 +103,6 @@ class PassingGradeCertsTest(ModuleStoreTestCase):
     """
     Tests for certificate generation task firing on passing grade receipt
     """
-
     def setUp(self):
         super().setUp()
         self.course = CourseFactory.create(
@@ -221,7 +219,6 @@ class FailingGradeCertsTest(ModuleStoreTestCase):
     and that the signal has no effect on the cert status if the cert has a non-passing
     status
     """
-
     def setUp(self):
         super().setUp()
         self.course = CourseFactory.create(
@@ -303,7 +300,6 @@ class LearnerIdVerificationTest(ModuleStoreTestCase):
     """
     Tests for certificate generation task firing on learner id verification
     """
-
     def setUp(self):
         super().setUp()
         self.course_one = CourseFactory.create(self_paced=True)
diff --git a/lms/djangoapps/courseware/access_utils.py b/lms/djangoapps/courseware/access_utils.py
index 059a11e5b3..9fa9c76203 100644
--- a/lms/djangoapps/courseware/access_utils.py
+++ b/lms/djangoapps/courseware/access_utils.py
@@ -87,7 +87,9 @@ def check_start_date(user, days_early_for_beta, start, course_key, display_error
         if now is None:
             now = datetime.now(UTC)
         effective_start = adjust_start_date(user, days_early_for_beta, start, course_key)
-        if now > effective_start:
+
+        should_grant_access = now > effective_start
+        if should_grant_access:
             return ACCESS_GRANTED
 
         return StartDateError(start, display_error_to_user=display_error_to_user)
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index cd755a8d47..bf14f7e2fc 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -557,6 +557,7 @@ def get_course_assignments(course_key, user, include_access=False):  # lint-amne
     """
     if not user.id:
         return []
+
     store = modulestore()
     course_usage_key = store.make_course_usage_key(course_key)
     block_data = get_course_blocks(user, course_usage_key, allow_start_dates_in_future=True, include_completion=True)
@@ -658,7 +659,6 @@ def get_course_assignments(course_key, user, include_access=False):  # lint-amne
                             _("Open Response Assessment due dates are set by your instructor and can't be shifted."),
                             first_component_block_id,
                         ))
-
     return assignments
 
 
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 62157ec648..44b77f3eab 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -45,6 +45,7 @@ from xmodule.exceptions import NotFoundError, ProcessingError
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.util.sandboxing import SandboxService
+from xmodule.services import RebindUserService
 from common.djangoapps.static_replace.services import ReplaceURLService
 from common.djangoapps.static_replace.wrapper import replace_urls_wrapper
 from common.djangoapps.xblock_django.constants import ATTR_KEY_USER_ID
@@ -63,7 +64,6 @@ from lms.djangoapps.courseware.services import UserStateService
 from lms.djangoapps.grades.api import GradesUtilService
 from lms.djangoapps.grades.api import signals as grades_signals
 from lms.djangoapps.lms_xblock.field_data import LmsFieldData
-from lms.djangoapps.lms_xblock.models import XBlockAsidesConfig
 from lms.djangoapps.lms_xblock.runtime import LmsModuleSystem
 from lms.djangoapps.verify_student.services import XBlockVerificationService
 from openedx.core.djangoapps.bookmarks.services import BookmarksService
@@ -483,12 +483,12 @@ def get_module_system_for_user(
             student_data=student_data,
             course_id=course_id,
             track_function=track_function,
+            request_token=request_token,
             position=position,
             wrap_xmodule_display=wrap_xmodule_display,
             grade_bucket_type=grade_bucket_type,
             static_asset_path=static_asset_path,
             user_location=user_location,
-            request_token=request_token,
             course=course,
             will_recheck_access=will_recheck_access,
         )
@@ -608,65 +608,20 @@ def get_module_system_for_user(
                     completion=1.0,
                 )
 
-    def rebind_noauth_module_to_user(module, real_user):
-        """
-        A function that allows a module to get re-bound to a real user if it was previously bound to an AnonymousUser.
-
-        Will only work within a module bound to an AnonymousUser, e.g. one that's instantiated by the noauth_handler.
-
-        Arguments:
-            module (any xblock type):  the module to rebind
-            real_user (django.contrib.auth.models.User):  the user to bind to
-
-        Returns:
-            nothing (but the side effect is that module is re-bound to real_user)
-        """
-        if user.is_authenticated:
-            err_msg = ("rebind_noauth_module_to_user can only be called from a module bound to "
-                       "an anonymous user")
-            log.error(err_msg)
-            raise LmsModuleRenderError(err_msg)
-
-        field_data_cache_real_user = FieldDataCache.cache_for_descriptor_descendents(
-            course_id,
-            real_user,
-            module,
-            asides=XBlockAsidesConfig.possible_asides(),
-        )
-        student_data_real_user = KvsFieldData(DjangoKeyValueStore(field_data_cache_real_user))
-
-        (inner_system, inner_student_data) = get_module_system_for_user(
-            user=real_user,
-            student_data=student_data_real_user,  # These have implicit user bindings, rest of args considered not to
-            descriptor=module,
-            course_id=course_id,
-            track_function=track_function,
-            position=position,
-            wrap_xmodule_display=wrap_xmodule_display,
-            grade_bucket_type=grade_bucket_type,
-            static_asset_path=static_asset_path,
-            user_location=user_location,
-            request_token=request_token,
-            course=course,
-            will_recheck_access=will_recheck_access,
-        )
-
-        module.bind_for_student(
-            inner_system,
-            real_user.id,
-            [
-                partial(DateLookupFieldData, course_id=course_id, user=user),
-                partial(OverrideFieldData.wrap, real_user, course),
-                partial(LmsFieldData, student_data=inner_student_data),
-            ],
-        )
-
-        module.scope_ids = (
-            module.scope_ids._replace(user_id=real_user.id)
-        )
-        # now bind the module to the new ModuleSystem instance and vice-versa
-        module.runtime = inner_system
-        inner_system.xmodule_instance = module
+    # Rebind module service to deal with noauth modules getting attached to users
+    rebind_user_service = RebindUserService(
+        user,
+        course_id,
+        get_module_system_for_user,
+        track_function=track_function,
+        position=position,
+        wrap_xmodule_display=wrap_xmodule_display,
+        grade_bucket_type=grade_bucket_type,
+        static_asset_path=static_asset_path,
+        user_location=user_location,
+        request_token=request_token,
+        will_recheck_access=will_recheck_access,
+    )
 
     # Build a list of wrapping functions that will be applied in order
     # to the Fragment content coming out of the xblocks that are about to be rendered.
@@ -729,9 +684,6 @@ def get_module_system_for_user(
         static_url=settings.STATIC_URL,
         get_module=inner_get_module,
         user=user,
-        debug=settings.DEBUG,
-        hostname=settings.SITE_NAME,
-        node_path=settings.NODE_PATH,
         publish=publish,
         course_id=course_id,
         # TODO: When we merge the descriptor and module systems, we can stop reaching into the mixologist (cpennington)
@@ -754,10 +706,10 @@ def get_module_system_for_user(
             'cache': CacheService(cache),
             'sandbox': SandboxService(contentstore=contentstore, course_id=course_id),
             'xqueue': xqueue_service,
-            'replace_urls': replace_url_service
+            'replace_urls': replace_url_service,
+            'rebind_user': rebind_user_service,
         },
         descriptor_runtime=descriptor._runtime,  # pylint: disable=protected-access
-        rebind_noauth_module_to_user=rebind_noauth_module_to_user,
         request_token=request_token,
     )
 
diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 7f774faf62..2a67b6454e 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -13,7 +13,7 @@ from lms.djangoapps.courseware.access import has_access
 from lms.djangoapps.courseware.entrance_exams import user_can_skip_entrance_exam
 from lms.djangoapps.course_home_api.toggles import course_home_mfe_progress_tab_is_active
 from openedx.core.lib.course_tabs import CourseTabPluginManager
-from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG, default_course_url
+from openedx.features.course_experience import default_course_url
 from openedx.features.course_experience.url_helpers import get_learning_mfe_home_url
 from common.djangoapps.student.models import CourseEnrollment
 
@@ -50,28 +50,8 @@ class CoursewareTab(EnrolledTab):
     @classmethod
     def is_enabled(cls, course, user=None):
         """
-        Returns true if this tab is enabled.
+        Courseware tabs are viewable to everyone, even anonymous users.
         """
-        if DISABLE_UNIFIED_COURSE_TAB_FLAG.is_enabled(course.id):
-            return super().is_enabled(course, user)
-        # If this is the unified course tab then it is always enabled
-        return True
-
-
-class CourseInfoTab(CourseTab):
-    """
-    The course info view.
-    """
-    type = 'course_info'
-    title = gettext_noop('Home')
-    priority = 10
-    view_name = 'info'
-    tab_id = 'info'
-    is_movable = False
-    is_default = False
-
-    @classmethod
-    def is_enabled(cls, course, user=None):
         return True
 
 
@@ -355,9 +335,6 @@ def get_course_tab_list(user, course):
                 continue
             tab.name = _("Entrance Exam")
             tab.title = _("Entrance Exam")
-        # TODO: LEARNER-611 - once the course_info tab is removed, remove this code
-        if not DISABLE_UNIFIED_COURSE_TAB_FLAG.is_enabled(course.id) and tab.type == 'course_info':
-            continue
         if tab.type == 'static_tab' and tab.course_staff_only and \
                 not bool(user and has_access(user, 'staff', course, course.id)):
             continue
diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py
deleted file mode 100644
index fc68e5f93b..0000000000
--- a/lms/djangoapps/courseware/tests/test_course_info.py
+++ /dev/null
@@ -1,417 +0,0 @@
-"""
-Test the course_info xblock
-"""
-
-
-from datetime import datetime
-
-from unittest import mock
-import ddt
-from ccx_keys.locator import CCXLocator
-from django.conf import settings
-from django.http import QueryDict
-from django.test.utils import override_settings
-from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag
-from pyquery import PyQuery as pq
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls
-from xmodule.modulestore.tests.utils import TEST_DATA_DIR
-from xmodule.modulestore.xml_importer import import_course_from_xml
-
-from lms.djangoapps.ccx.tests.factories import CcxFactory
-from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
-from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration_context
-from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES
-from openedx.features.content_type_gating.models import ContentTypeGatingConfig
-from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG
-from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseTestConsentRequired
-from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.student.tests.factories import AdminFactory
-from common.djangoapps.util.date_utils import strftime_localized
-
-from .helpers import LoginEnrollmentTestCase
-
-QUERY_COUNT_TABLE_IGNORELIST = WAFFLE_TABLES
-
-
-@override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-class CourseInfoTestCase(EnterpriseTestConsentRequired, LoginEnrollmentTestCase, SharedModuleStoreTestCase):
-    """
-    Tests for the Course Info page
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.course = CourseFactory.create()
-        cls.page = ItemFactory.create(
-            category="course_info", parent_location=cls.course.location,
-            data="OOGIE BLOOGIE", display_name="updates"
-        )
-
-    def test_logged_in_unenrolled(self):
-        self.setup_user()
-        url = reverse('info', args=[str(self.course.id)])
-        resp = self.client.get(url)
-        self.assertContains(resp, "OOGIE BLOOGIE")
-        self.assertContains(resp, "You are not currently enrolled in this course")
-
-    def test_logged_in_enrolled(self):
-        self.enroll(self.course)
-        url = reverse('info', args=[str(self.course.id)])
-        resp = self.client.get(url)
-        assert b'You are not currently enrolled in this course' not in resp.content
-
-    # TODO: LEARNER-611: If this is only tested under Course Info, does this need to move?
-    @mock.patch('openedx.features.enterprise_support.api.enterprise_customer_for_request')
-    def test_redirection_missing_enterprise_consent(self, mock_enterprise_customer_for_request):
-        """
-        Verify that users viewing the course info who are enrolled, but have not provided
-        data sharing consent, are first redirected to a consent page, and then, once they've
-        provided consent, are able to view the course info.
-        """
-        # ENT-924: Temporary solution to replace sensitive SSO usernames.
-        mock_enterprise_customer_for_request.return_value = None
-
-        self.setup_user()
-        self.enroll(self.course)
-
-        url = reverse('info', args=[str(self.course.id)])
-
-        self.verify_consent_required(self.client, url)  # lint-amnesty, pylint: disable=no-value-for-parameter
-
-    def test_anonymous_user(self):
-        url = reverse('info', args=[str(self.course.id)])
-        resp = self.client.get(url)
-        assert resp.status_code == 200
-        assert b'OOGIE BLOOGIE' not in resp.content
-
-    def test_logged_in_not_enrolled(self):
-        self.setup_user()
-        url = reverse('info', args=[str(self.course.id)])
-        self.client.get(url)
-
-        # Check whether the user has been enrolled in the course.
-        # There was a bug in which users would be automatically enrolled
-        # with is_active=False (same as if they enrolled and immediately unenrolled).
-        # This verifies that the user doesn't have *any* enrollment record.
-        enrollment_exists = CourseEnrollment.objects.filter(
-            user=self.user, course_id=self.course.id
-        ).exists()
-        assert not enrollment_exists
-
-    @mock.patch.dict(settings.FEATURES, {'DISABLE_START_DATES': False})
-    def test_non_live_course(self):
-        """Ensure that a user accessing a non-live course sees a redirect to
-        the student dashboard, not a 404.
-        """
-        self.setup_user()
-        self.enroll(self.course)
-        url = reverse('info', args=[str(self.course.id)])
-        response = self.client.get(url)
-        start_date = strftime_localized(self.course.start, 'SHORT_DATE')
-        expected_params = QueryDict(mutable=True)
-        expected_params['notlive'] = start_date
-        expected_url = '{url}?{params}'.format(
-            url=reverse('dashboard'),
-            params=expected_params.urlencode()
-        )
-        self.assertRedirects(response, expected_url)
-
-    @mock.patch.dict(settings.FEATURES, {'DISABLE_START_DATES': False})
-    @mock.patch("common.djangoapps.util.date_utils.strftime_localized")
-    def test_non_live_course_other_language(self, mock_strftime_localized):
-        """Ensure that a user accessing a non-live course sees a redirect to
-        the student dashboard, not a 404, even if the localized date is unicode
-        """
-        self.setup_user()
-        self.enroll(self.course)
-        fake_unicode_start_time = "üñîçø∂é_ßtå®t_tîµé"
-        mock_strftime_localized.return_value = fake_unicode_start_time
-
-        url = reverse('info', args=[str(self.course.id)])
-        response = self.client.get(url)
-        expected_params = QueryDict(mutable=True)
-        expected_params['notlive'] = fake_unicode_start_time
-        expected_url = '{url}?{params}'.format(
-            url=reverse('dashboard'),
-            params=expected_params.urlencode()
-        )
-        self.assertRedirects(response, expected_url)
-
-    def test_nonexistent_course(self):
-        self.setup_user()
-        url = reverse('info', args=['not/a/course'])
-        response = self.client.get(url)
-        assert response.status_code == 404
-
-
-@override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-class CourseInfoLastAccessedTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
-    """
-    Tests of the CourseInfo last accessed link.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.course = CourseFactory.create()
-        self.page = ItemFactory.create(
-            category="course_info", parent_location=self.course.location,
-            data="OOGIE BLOOGIE", display_name="updates"
-        )
-
-    def test_last_accessed_courseware_not_shown(self):
-        """
-        Test that the last accessed courseware link is not shown if there
-        is no course content.
-        """
-        SelfPacedConfiguration(enable_course_home_improvements=True).save()
-        url = reverse('info', args=(str(self.course.id),))
-        response = self.client.get(url)
-        content = pq(response.content)
-        assert content('.page-header-secondary a').length == 0
-
-    def get_resume_course_url(self, course_info_url):
-        """
-        Retrieves course info page and returns the resume course url
-        or None if the button doesn't exist.
-        """
-        info_page_response = self.client.get(course_info_url)
-        content = pq(info_page_response.content)
-        return content('.page-header-secondary .last-accessed-link').attr('href')
-
-    def test_resume_course_visibility(self):
-        SelfPacedConfiguration(enable_course_home_improvements=True).save()
-        chapter = ItemFactory.create(
-            category="chapter", parent_location=self.course.location
-        )
-        section = ItemFactory.create(
-            category='sequential', parent_location=chapter.location
-        )
-        section_url = reverse(
-            'courseware_section',
-            kwargs={
-                'section': section.url_name,
-                'chapter': chapter.url_name,
-                'course_id': self.course.id
-            }
-        )
-        self.client.get(section_url)
-        info_url = reverse('info', args=(str(self.course.id),))
-
-        # Assuring a non-authenticated user cannot see the resume course button.
-        resume_course_url = self.get_resume_course_url(info_url)
-        assert resume_course_url is None
-
-        # Assuring an unenrolled user cannot see the resume course button.
-        self.setup_user()
-        resume_course_url = self.get_resume_course_url(info_url)
-        assert resume_course_url is None
-
-        # Assuring an enrolled user can see the resume course button.
-        self.enroll(self.course)
-        resume_course_url = self.get_resume_course_url(info_url)
-        assert resume_course_url == section_url
-
-
-@override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-@ddt.ddt
-class CourseInfoTitleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
-    """
-    Tests of the CourseInfo page title site configuration options.
-    """
-    def setUp(self):
-        super().setUp()
-        self.course = CourseFactory.create(
-            org="HogwartZ",
-            number="Potions_3",
-            display_organization="HogwartsX",
-            display_coursenumber="Potions101",
-            display_name="Introduction to Potions"
-        )
-
-    @ddt.data(
-        # Default site configuration shows course number, org, and display name as subtitle.
-        ({},
-         "Welcome to HogwartsX's Potions101!", "Introduction to Potions"),
-
-        # Show org in title
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=False,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=True,
-              COURSE_HOMEPAGE_SHOW_ORG=True),
-         "Welcome to HogwartsX's Potions101!", "Introduction to Potions"),
-
-        # Don't show org in title
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=False,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=True,
-              COURSE_HOMEPAGE_SHOW_ORG=False),
-         "Welcome to Potions101!", "Introduction to Potions"),
-
-        # Hide subtitle and org
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=False,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=False,
-              COURSE_HOMEPAGE_SHOW_ORG=False),
-         "Welcome to Potions101!", None),
-
-        # Show display name as title, hide subtitle and org.
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=True,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=False,
-              COURSE_HOMEPAGE_SHOW_ORG=False),
-         "Welcome to Introduction to Potions!", None),
-
-        # Show display name as title with org, hide subtitle.
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=True,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=False,
-              COURSE_HOMEPAGE_SHOW_ORG=True),
-         "Welcome to HogwartsX's Introduction to Potions!", None),
-
-        # Show display name as title, hide org, and show course number as subtitle.
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=True,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=True,
-              COURSE_HOMEPAGE_SHOW_ORG=False),
-         "Welcome to Introduction to Potions!", 'Potions101'),
-
-        # Show display name as title with org, and show course number as subtitle.
-        (dict(COURSE_HOMEPAGE_INVERT_TITLE=True,
-              COURSE_HOMEPAGE_SHOW_SUBTITLE=True,
-              COURSE_HOMEPAGE_SHOW_ORG=True),
-         "Welcome to HogwartsX's Introduction to Potions!", 'Potions101'),
-    )
-    @ddt.unpack
-    def test_info_title(self, site_config, expected_title, expected_subtitle):
-        """
-        Test the info page on a course with all the multiple display options
-        depeding on the current site configuration
-        """
-        url = reverse('info', args=(str(self.course.id),))
-        with with_site_configuration_context(configuration=site_config):
-            response = self.client.get(url)
-
-        content = pq(response.content)
-
-        assert expected_title == content('.page-title').contents()[0].strip()
-
-        if expected_subtitle is None:
-            assert not content('.page-subtitle')
-        else:
-            assert expected_subtitle == content('.page-subtitle').contents()[0].strip()
-
-
-@override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-class CourseInfoTestCaseCCX(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
-    """
-    Test for unenrolled student tries to access ccx.
-    Note: Only CCX coach can enroll a student in CCX. In sum self-registration not allowed.
-    """
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.course = CourseFactory.create()
-
-    def setUp(self):
-        super().setUp()
-
-        # Create ccx coach account
-        self.coach = coach = AdminFactory.create(password="test")
-        self.client.login(username=coach.username, password="test")
-
-    def test_redirect_to_dashboard_unenrolled_ccx(self):
-        """
-        Assert that when unenroll student tries to access ccx do not allow them self-register.
-        Redirect them to their student dashboard
-        """
-        # create ccx
-        ccx = CcxFactory(course_id=self.course.id, coach=self.coach)
-        ccx_locator = CCXLocator.from_course_locator(self.course.id, str(ccx.id))
-
-        self.setup_user()
-        url = reverse('info', args=[ccx_locator])
-        response = self.client.get(url)
-        expected = reverse('dashboard')
-        self.assertRedirects(response, expected, status_code=302, target_status_code=200)
-
-
-@override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-class CourseInfoTestCaseXML(LoginEnrollmentTestCase, ModuleStoreTestCase):
-    """
-    Tests for the Course Info page for an XML course
-    """
-    def setUp(self):
-        """
-        Set up the tests
-        """
-        super().setUp()
-
-        # The following test course (which lives at common/test/data/2014)
-        # is closed; we're testing that a course info page still appears when
-        # the course is already closed
-        self.xml_course_key = self.store.make_course_key('edX', 'detached_pages', '2014')
-        import_course_from_xml(
-            self.store,
-            self.user.id,
-            TEST_DATA_DIR,
-            source_dirs=['2014'],
-            static_content_store=None,
-            target_id=self.xml_course_key,
-            raise_on_failure=True,
-            create_if_not_present=True,
-        )
-
-        # this text appears in that course's course info page
-        # common/test/data/2014/info/updates.html
-        self.xml_data = "course info 463139"
-
-    @mock.patch.dict('django.conf.settings.FEATURES', {'DISABLE_START_DATES': False})
-    def test_logged_in_xml(self):
-        self.setup_user()
-        url = reverse('info', args=[str(self.xml_course_key)])
-        resp = self.client.get(url)
-        self.assertContains(resp, self.xml_data)
-
-    @mock.patch.dict('django.conf.settings.FEATURES', {'DISABLE_START_DATES': False})
-    def test_anonymous_user_xml(self):
-        url = reverse('info', args=[str(self.xml_course_key)])
-        resp = self.client.get(url)
-        self.assertNotContains(resp, self.xml_data)
-
-
-@override_settings(FEATURES=dict(settings.FEATURES, EMBARGO=False))
-@override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-class SelfPacedCourseInfoTestCase(LoginEnrollmentTestCase, SharedModuleStoreTestCase):
-    """
-    Tests for the info page of self-paced courses.
-    """
-    ENABLED_CACHES = ['default', 'mongo_metadata_inheritance', 'loc_cache']
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.instructor_paced_course = CourseFactory.create(self_paced=False)
-        cls.self_paced_course = CourseFactory.create(self_paced=True)
-
-    def setUp(self):
-        super().setUp()
-        ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1))
-
-        self.setup_user()
-
-    def fetch_course_info_with_queries(self, course, sql_queries, mongo_queries):
-        """
-        Fetch the given course's info page, asserting the number of SQL
-        and Mongo queries.
-        """
-        url = reverse('info', args=[str(course.id)])
-        with self.assertNumQueries(sql_queries, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
-            with check_mongo_calls(mongo_queries):
-                with mock.patch("openedx.core.djangoapps.theming.helpers.get_current_site", return_value=None):
-                    resp = self.client.get(url)
-        assert resp.status_code == 200
-
-    def test_num_queries_instructor_paced(self):
-        # TODO: decrease query count as part of REVO-28
-        self.fetch_course_info_with_queries(self.instructor_paced_course, 41, 2)
-
-    def test_num_queries_self_paced(self):
-        # TODO: decrease query count as part of REVO-28
-        self.fetch_course_info_with_queries(self.self_paced_course, 41, 2)
diff --git a/lms/djangoapps/courseware/tests/test_date_summary.py b/lms/djangoapps/courseware/tests/test_date_summary.py
index b428859c17..41cc22d8de 100644
--- a/lms/djangoapps/courseware/tests/test_date_summary.py
+++ b/lms/djangoapps/courseware/tests/test_date_summary.py
@@ -9,7 +9,6 @@ import crum
 import ddt
 from django.conf import settings
 from django.test import RequestFactory
-from django.urls import reverse
 from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch
 from freezegun import freeze_time
 from pytz import utc
@@ -19,7 +18,7 @@ from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.course_modes.tests.factories import CourseModeFactory
-from common.djangoapps.student.tests.factories import TEST_PASSWORD, CourseEnrollmentFactory, UserFactory
+from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.certificates.config import AUTO_CERTIFICATE_GENERATION
 from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.courseware.courses import get_course_date_blocks
@@ -43,7 +42,6 @@ from lms.djangoapps.verify_student.services import IDVerificationService
 from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
-from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
 from openedx.features.course_experience import RELATIVE_DATES_FLAG
 
@@ -51,9 +49,6 @@ from openedx.features.course_experience import RELATIVE_DATES_FLAG
 @ddt.ddt
 class CourseDateSummaryTest(SharedModuleStoreTestCase):
     """Tests for course date summary blocks."""
-    def setUp(self):
-        super().setUp()
-        SelfPacedConfiguration.objects.create(enable_course_home_improvements=True)
 
     def make_request(self, user):
         """ Creates a request """
@@ -63,17 +58,6 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
         crum.set_current_request(request)
         return request
 
-    def test_course_info_feature_flag(self):
-        SelfPacedConfiguration(enable_course_home_improvements=False).save()
-        course = create_course_run()
-        user = create_user()
-        CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
-
-        self.client.login(username=user.username, password=TEST_PASSWORD)
-        url = reverse('info', args=(course.id,))
-        response = self.client.get(url)
-        self.assertNotContains(response, 'date-summary', status_code=302)
-
     # Tests for which blocks are enabled
     def assert_block_types(self, course, user, expected_blocks):
         """Assert that the enabled block types for this course are as expected."""
diff --git a/lms/djangoapps/courseware/tests/test_lti_integration.py b/lms/djangoapps/courseware/tests/test_lti_integration.py
index c4a2d8a7db..da4805774e 100644
--- a/lms/djangoapps/courseware/tests/test_lti_integration.py
+++ b/lms/djangoapps/courseware/tests/test_lti_integration.py
@@ -43,7 +43,7 @@ class TestLTI(BaseTestXmodule):
         context_id = str(self.item_descriptor.course_id)
         user_service = self.item_descriptor.xmodule_runtime.service(self.item_descriptor, 'user')
         user_id = str(user_service.get_current_user().opt_attrs.get(ATTR_KEY_ANONYMOUS_USER_ID))
-        hostname = self.item_descriptor.xmodule_runtime.hostname
+        hostname = settings.LMS_BASE
         resource_link_id = str(urllib.parse.quote(f'{hostname}-{self.item_descriptor.location.html_id()}'))
 
         sourcedId = "{context}:{resource_link}:{user_id}".format(
diff --git a/lms/djangoapps/courseware/tests/test_masquerade.py b/lms/djangoapps/courseware/tests/test_masquerade.py
index 6c10cc38db..dbfdece5d9 100644
--- a/lms/djangoapps/courseware/tests/test_masquerade.py
+++ b/lms/djangoapps/courseware/tests/test_masquerade.py
@@ -13,7 +13,6 @@ from operator import itemgetter  # lint-amnesty, pylint: disable=wrong-import-or
 from django.conf import settings
 from django.test import TestCase, RequestFactory
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag
 from pytz import UTC
 from xblock.runtime import DictKeyValueStore
 
@@ -31,9 +30,7 @@ from lms.djangoapps.courseware.tests.helpers import (
 )
 from lms.djangoapps.courseware.tests.test_submitting_problems import ProblemSubmissionTestMixin
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
-from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 from openedx.core.djangoapps.user_api.preferences.api import get_user_preference, set_user_preference
-from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.tests.factories import StaffFactory
 from common.djangoapps.student.tests.factories import UserFactory
@@ -108,18 +105,6 @@ class MasqueradeTestCase(SharedModuleStoreTestCase, LoginEnrollmentTestCase, Mas
         )
         return self.client.get(url)
 
-    def get_course_info_page(self):
-        """
-        Returns the server response for course info page.
-        """
-        url = reverse(
-            'info',
-            kwargs={
-                'course_id': str(self.course.id),
-            }
-        )
-        return self.client.get(url)
-
     def get_progress_page(self):
         """
         Returns the server response for progress page.
@@ -351,27 +336,6 @@ class TestStaffMasqueradeAsSpecificStudent(StaffMasqueradeTestCase, ProblemSubmi
         assert get_user_preference(user, LANGUAGE_KEY) == expected_language_code
         assert self.client.cookies[settings.LANGUAGE_COOKIE_NAME].value == expected_language_code
 
-    @override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-    @patch.dict('django.conf.settings.FEATURES', {'DISABLE_START_DATES': False})
-    def test_masquerade_as_specific_user_on_self_paced(self):
-        """
-        Test masquerading as a specific user for course info page when self paced configuration
-        "enable_course_home_improvements" flag is set
-
-        Login as a staff user and visit course info page.
-        set masquerade to view same page as a specific student and revisit the course info page.
-        """
-        # Log in as staff, and check we can see the info page.
-        self.login_staff()
-        response = self.get_course_info_page()
-        self.assertContains(response, "OOGIE BLOOGIE")
-
-        # Masquerade as the student,enable the self paced configuration, and check we can see the info page.
-        SelfPacedConfiguration(enable_course_home_improvements=True).save()
-        self.update_masquerade(role='student', username=self.student_user.username)
-        response = self.get_course_info_page()
-        self.assertContains(response, "OOGIE BLOOGIE")
-
     @ddt.data(
         'john',  # Non-unicode username
         'fôô@bar',  # Unicode username with @, which is what the ENABLE_UNICODE_USERNAME feature allows
@@ -442,25 +406,6 @@ class TestStaffMasqueradeAsSpecificStudent(StaffMasqueradeTestCase, ProblemSubmi
         self.get_courseware_page()
         self.assertExpectedLanguageInPreference(self.test_user, english_language_code)
 
-    @override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-    @patch.dict('django.conf.settings.FEATURES', {'DISABLE_START_DATES': False})
-    def test_masquerade_as_specific_student_course_info(self):
-        """
-        Test masquerading as a specific user for course info page.
-
-        We login with login_staff and check course info page content if it's working and then we
-        set masquerade to view same page as a specific student and test if it's working or not.
-        """
-        # Log in as staff, and check we can see the info page.
-        self.login_staff()
-        content = self.get_course_info_page().content.decode('utf-8')
-        assert 'OOGIE BLOOGIE' in content
-
-        # Masquerade as the student, and check we can see the info page.
-        self.update_masquerade(role='student', username=self.student_user.username)
-        content = self.get_course_info_page().content.decode('utf-8')
-        assert 'OOGIE BLOOGIE' in content
-
     def test_masquerade_as_specific_student_progress(self):
         """
         Test masquerading as a specific user for progress page.
diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py
index d9d8aeae0e..d01d2e3f45 100644
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -55,6 +55,7 @@ from xmodule.modulestore.tests.django_utils import (
 )
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, ToyCourseFactory, check_mongo_calls  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.tests.test_asides import AsideTestType  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.services import RebindUserServiceError
 from xmodule.video_module import VideoBlock  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.x_module import STUDENT_VIEW, CombinedSystem  # lint-amnesty, pylint: disable=wrong-import-order
 from common.djangoapps import static_replace
@@ -2175,10 +2176,10 @@ class TestRebindModule(TestSubmittingProblems):
         user2 = UserFactory()
         user2.id = 2
         with self.assertRaisesRegex(
-            render.LmsModuleRenderError,
+            RebindUserServiceError,
             "rebind_noauth_module_to_user can only be called from a module bound to an anonymous user"
         ):
-            assert module.system.rebind_noauth_module_to_user(module, user2)
+            assert module.runtime.service(module, 'rebind_user').rebind_noauth_module_to_user(module, user2)
 
     def test_rebind_noauth_module_to_user_anonymous(self):
         """
@@ -2188,7 +2189,7 @@ class TestRebindModule(TestSubmittingProblems):
         module = self.get_module_for_user(self.anon_user)
         user2 = UserFactory()
         user2.id = 2
-        module.system.rebind_noauth_module_to_user(module, user2)
+        module.runtime.service(module, 'rebind_user').rebind_noauth_module_to_user(module, user2)
         assert module
         assert module.system.anonymous_student_id == anonymous_id_for_user(user2, self.course.id)
         assert module.scope_ids.user_id == user2.id
diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py
index b159c20b84..eefb231141 100644
--- a/lms/djangoapps/courseware/tests/test_tabs.py
+++ b/lms/djangoapps/courseware/tests/test_tabs.py
@@ -10,9 +10,7 @@ from django.http import Http404
 from django.urls import reverse
 from milestones.tests.utils import MilestonesTestCaseMixin
 
-from edx_toggles.toggles.testutils import override_waffle_flag
 from lms.djangoapps.courseware.tabs import (
-    CourseInfoTab,
     CoursewareTab,
     DatesTab,
     ExternalDiscussionCourseTab,
@@ -24,7 +22,6 @@ from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase
 from lms.djangoapps.courseware.views.views import StaticCourseTabView, get_static_tab_fragment
 from openedx.core.djangolib.testing.utils import get_mock_request
 from openedx.core.lib.courses import get_course_by_id
-from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.tests.factories import InstructorFactory
 from common.djangoapps.student.tests.factories import StaffFactory
@@ -496,20 +493,16 @@ class TabListTestCase(TabTestCase):
 
         # invalid tabs
         self.invalid_tabs = [
-            # less than 2 tabs
-            [{'type': CoursewareTab.type}],
-            # missing course_info
-            [{'type': CoursewareTab.type}, {'type': 'discussion', 'name': 'fake_name'}],
+            # missing courseware
             [{'type': 'unknown_type'}],
             # incorrect order
             [{'type': 'discussion', 'name': 'fake_name'},
-             {'type': CourseInfoTab.type, 'name': 'fake_name'}, {'type': CoursewareTab.type}],
+             {'type': CoursewareTab.type}],
         ]
 
         # tab types that should appear only once
         unique_tab_types = [
             CoursewareTab.type,
-            CourseInfoTab.type,
             'textbooks',
             'pdf_textbooks',
             'html_textbooks',
@@ -518,7 +511,6 @@ class TabListTestCase(TabTestCase):
         for unique_tab_type in unique_tab_types:
             self.invalid_tabs.append([
                 {'type': CoursewareTab.type},
-                {'type': CourseInfoTab.type, 'name': 'fake_name'},
                 # add the unique tab multiple times
                 {'type': unique_tab_type},
                 {'type': unique_tab_type},
@@ -532,7 +524,6 @@ class TabListTestCase(TabTestCase):
             # all valid tabs
             [
                 {'type': CoursewareTab.type},
-                {'type': CourseInfoTab.type, 'name': 'fake_name'},
                 {'type': DatesTab.type},  # Add this even though we filter it out, for testing purposes
                 {'type': 'discussion', 'name': 'fake_name'},
                 {'type': ExternalLinkCourseTab.type, 'name': 'fake_name', 'link': 'fake_link'},
@@ -547,7 +538,6 @@ class TabListTestCase(TabTestCase):
             # with external discussion
             [
                 {'type': CoursewareTab.type},
-                {'type': CourseInfoTab.type, 'name': 'fake_name'},
                 {'type': ExternalDiscussionCourseTab.type, 'name': 'fake_name', 'link': 'fake_link'}
             ],
         ]
@@ -575,8 +565,7 @@ class ValidateTabsTestCase(TabListTestCase):
         """
         tab_list = xmodule_tabs.CourseTabList()
         assert len(tab_list.from_json([{'type': CoursewareTab.type},
-                                       {'type': CourseInfoTab.type, 'name': 'fake_name'},
-                                       {'type': 'no_such_type'}])) == 2
+                                       {'type': 'no_such_type'}])) == 1
 
 
 class CourseTabListTestCase(TabListTestCase):
@@ -746,33 +735,6 @@ class StaticTabTestCase(TabTestCase):
         self.check_get_and_set_method_for_key(tab, 'url_slug')
 
 
-class CourseInfoTabTestCase(TabTestCase):
-    """Test cases for the course info tab."""
-    def setUp(self):  # lint-amnesty, pylint: disable=super-method-not-called
-        self.user = self.create_mock_user()
-        self.addCleanup(set_current_request, None)
-
-    @override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-    def test_default_tab(self):
-        # Verify that the course info tab is the first tab
-        tabs = get_course_tab_list(self.user, self.course)
-        assert tabs[0].type == 'course_info'
-
-    @override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=False)
-    def test_default_tab_for_new_course_experience(self):
-        # Verify that the unified course experience hides the course info tab
-        tabs = get_course_tab_list(self.user, self.course)
-        assert tabs[0].type == 'courseware'
-
-    # TODO: LEARNER-611 - remove once course_info is removed.
-    @override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=False)
-    def test_default_tab_for_displayable(self):
-        tabs = xmodule_tabs.CourseTabList.iterate_displayable(self.course, self.user)
-        for i, tab in enumerate(tabs):
-            if i == 0:
-                assert tab.type == 'course_info'
-
-
 class DiscussionLinkTestCase(TabTestCase):
     """Test cases for discussion link tab."""
 
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 0db2441ef0..8eea7537e9 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -91,7 +91,6 @@ from openedx.features.content_type_gating.models import ContentTypeGatingConfig
 from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
 from openedx.features.course_experience import (
     DISABLE_COURSE_OUTLINE_PAGE_FLAG,
-    DISABLE_UNIFIED_COURSE_TAB_FLAG,
 )
 from openedx.features.course_experience.tests.views.helpers import add_course_mode
 from openedx.features.course_experience.url_helpers import (
@@ -1022,19 +1021,6 @@ class ViewsTestCase(BaseViewsTestCase):
             response = self.client.get(url)
             self.assertRedirects(response, reverse('signin_user') + '?next=' + url)
 
-    @override_waffle_flag(DISABLE_UNIFIED_COURSE_TAB_FLAG, active=True)
-    def test_bypass_course_info(self):
-        course_id = str(self.course_key)
-
-        response = self.client.get(reverse('info', args=[course_id]))
-        assert response.status_code == 200
-
-        response = self.client.get(reverse('info', args=[course_id]), HTTP_REFERER=reverse('dashboard'))
-        assert response.status_code == 200
-
-        response = self.client.get(reverse('info', args=[course_id]), HTTP_REFERER='foo')
-        assert response.status_code == 200
-
 
 # Patching 'lms.djangoapps.courseware.views.views.get_programs' would be ideal,
 # but for some unknown reason that patch doesn't seem to be applied.
@@ -1441,7 +1427,6 @@ class ProgressPageTests(ProgressPageBaseTests):
             user=self.user,
             course_id=self.course.id,
             status=CertificateStatuses.downloadable,
-            download_url="http://www.example.com/certificate.pdf",
             mode='honor'
         )
 
@@ -1492,34 +1477,6 @@ class ProgressPageTests(ProgressPageBaseTests):
             self.assertContains(resp, "Your certificate is available")
             self.assertContains(resp, "earned a certificate for this course.")
 
-    @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False})
-    def test_view_certificate_link_hidden(self):
-        """
-        If certificate web view is disabled then certificate web view button should not appear for user who certificate
-        is available/generated
-        """
-        GeneratedCertificateFactory.create(
-            user=self.user,
-            course_id=self.course.id,
-            status=CertificateStatuses.downloadable,
-            download_url="http://www.example.com/certificate.pdf",
-            mode='honor'
-        )
-
-        # Enable the feature, but do not enable it for this course
-        CertificateGenerationConfiguration(enabled=True).save()
-
-        # Enable certificate generation for this course
-        certs_api.set_cert_generation_enabled(self.course.id, True)
-
-        with patch('lms.djangoapps.grades.course_grade_factory.CourseGradeFactory.read') as mock_create:
-            course_grade = mock_create.return_value
-            course_grade.passed = True
-            course_grade.summary = {'grade': 'Pass', 'percent': 0.75, 'section_breakdown': [], 'grade_breakdown': {}}
-
-            resp = self._get_progress_page()
-            self.assertContains(resp, "Download Your Certificate")
-
     @ddt.data(
         (True, 52),
         (False, 52),
@@ -1599,9 +1556,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         Verify that for html certs if certificate is marked as invalidated than
         re-generate button should not appear on progress page.
         """
-        generated_certificate = self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        generated_certificate = self.generate_certificate("honor")
 
         # Course certificate configurations
         certificates = [
@@ -1636,9 +1591,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         """
         Verify that view certificate appears for an allowlisted user
         """
-        generated_certificate = self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        generated_certificate = self.generate_certificate("honor")
 
         # Course certificate configurations
         certificates = [
@@ -1672,24 +1625,6 @@ class ProgressPageTests(ProgressPageBaseTests):
             self.assertContains(resp, "View Certificate")
             self.assert_invalidate_certificate(generated_certificate)
 
-    def test_page_with_invalidated_certificate_with_pdf(self):
-        """
-        Verify that for pdf certs if certificate is marked as invalidated than
-        re-generate button should not appear on progress page.
-        """
-        generated_certificate = self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
-
-        with patch('lms.djangoapps.grades.course_grade_factory.CourseGradeFactory.read') as mock_create:
-            course_grade = mock_create.return_value
-            course_grade.passed = True
-            course_grade.summary = {'grade': 'Pass', 'percent': 0.75, 'section_breakdown': [], 'grade_breakdown': {}}
-
-            resp = self._get_progress_page()
-            self.assertContains(resp, 'Download Your Certificate')
-            self.assert_invalidate_certificate(generated_certificate)
-
     @ddt.data(
         *itertools.product(
             (
@@ -1780,9 +1715,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         """
         Verify that invalidated cert data is returned if cert is invalidated.
         """
-        generated_certificate = self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        generated_certificate = self.generate_certificate("honor")
 
         CertificateInvalidationFactory.create(
             generated_certificate=generated_certificate,
@@ -1800,9 +1733,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         Verify that downloadable cert data is returned if cert is downloadable even
         when DISABLE_HONOR_CERTIFICATES feature flag is turned ON.
         """
-        self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        self.generate_certificate("honor")
         response = views.get_cert_data(
             self.user, self.course, CourseMode.HONOR, MagicMock(passed=True)
         )
@@ -1814,9 +1745,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         """
         Verify that generating cert data is returned if cert is generating.
         """
-        self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        self.generate_certificate("honor")
         with patch('lms.djangoapps.certificates.api.certificate_downloadable_status',
                    return_value=self.mock_certificate_downloadable_status(is_generating=True)):
             response = views.get_cert_data(self.user, self.course, CourseMode.HONOR, MagicMock(passed=True))
@@ -1828,9 +1757,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         """
         Verify that unverified cert data is returned if cert is unverified.
         """
-        self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        self.generate_certificate("honor")
         with patch('lms.djangoapps.certificates.api.certificate_downloadable_status',
                    return_value=self.mock_certificate_downloadable_status(is_unverified=True)):
             response = views.get_cert_data(self.user, self.course, CourseMode.HONOR, MagicMock(passed=True))
@@ -1842,9 +1769,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         """
         Verify that requested cert data is returned if cert is to be requested.
         """
-        self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "honor"
-        )
+        self.generate_certificate("honor")
         with patch('lms.djangoapps.certificates.api.certificate_downloadable_status',
                    return_value=self.mock_certificate_downloadable_status()):
             response = views.get_cert_data(self.user, self.course, CourseMode.HONOR, MagicMock(passed=True))
@@ -1856,9 +1781,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         """
         Verify that earned but not available cert data is returned if cert has been earned, but isn't available.
         """
-        self.generate_certificate(
-            "http://www.example.com/certificate.pdf", "verified"
-        )
+        self.generate_certificate("verified")
         with patch('lms.djangoapps.certificates.api.certificate_downloadable_status',
                    return_value=self.mock_certificate_downloadable_status(earned_but_not_available=True)):
             response = views.get_cert_data(self.user, self.course, CourseMode.VERIFIED, MagicMock(passed=True))
@@ -1904,16 +1827,14 @@ class ProgressPageTests(ProgressPageBaseTests):
         self.assertContains(resp, 'Your certificate has been invalidated')
         self.assertContains(resp, 'Please contact your course team if you have any questions.')
         self.assertNotContains(resp, 'View my Certificate')
-        self.assertNotContains(resp, 'Download my Certificate')
 
-    def generate_certificate(self, url, mode):
+    def generate_certificate(self, mode):
         """ Dry method to generate certificate. """
 
         generated_certificate = GeneratedCertificateFactory.create(
             user=self.user,
             course_id=self.course.id,
             status=CertificateStatuses.downloadable,
-            download_url=url,
             mode=mode
         )
         CertificateGenerationConfiguration(enabled=True).save()
@@ -1921,7 +1842,7 @@ class ProgressPageTests(ProgressPageBaseTests):
         return generated_certificate
 
     def mock_certificate_downloadable_status(
-            self, is_downloadable=False, is_generating=False, is_unverified=False, uuid=None, download_url=None,
+            self, is_downloadable=False, is_generating=False, is_unverified=False, uuid=None,
             earned_but_not_available=None,
     ):
         """Dry method to mock certificate downloadable status response."""
@@ -1929,8 +1850,7 @@ class ProgressPageTests(ProgressPageBaseTests):
             'is_downloadable': is_downloadable,
             'is_generating': is_generating,
             'is_unverified': is_unverified,
-            'download_url': uuid,
-            'uuid': download_url,
+            'uuid': uuid,
             'earned_but_not_available': earned_but_not_available,
         }
 
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index a2c30fd5d5..58387c56cf 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -67,7 +67,7 @@ from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.course_goals.models import UserActivity
 from lms.djangoapps.course_home_api.toggles import course_home_mfe_progress_tab_is_active
 from lms.djangoapps.courseware.access import has_access, has_ccx_coach_role
-from lms.djangoapps.courseware.access_utils import check_course_open_for_learner, check_public_access
+from lms.djangoapps.courseware.access_utils import check_public_access
 from lms.djangoapps.courseware.courses import (
     can_self_enroll_in_course,
     course_open_for_self_enrollment,
@@ -75,7 +75,6 @@ from lms.djangoapps.courseware.courses import (
     get_course_overview_with_access,
     get_course_with_access,
     get_courses,
-    get_current_child,
     get_permission_for_course_about,
     get_studio_url,
     sort_by_announcement,
@@ -113,7 +112,6 @@ from openedx.core.djangoapps.enrollments.permissions import ENROLL_IN_COURSE
 from openedx.core.djangoapps.models.course_details import CourseDetails
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from openedx.core.djangoapps.programs.utils import ProgramMarketingDataExtender
-from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.util.user_messages import PageLevelMessages
 from openedx.core.djangoapps.zendesk_proxy.utils import create_zendesk_ticket
@@ -121,19 +119,16 @@ from openedx.core.djangolib.markup import HTML, Text
 from openedx.core.lib.courses import get_course_by_id
 from openedx.core.lib.mobile_utils import is_request_from_mobile_app
 from openedx.features.course_duration_limits.access import generate_course_expired_fragment
-from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG, course_home_url
-from openedx.features.course_experience.course_tools import CourseToolsPluginManager
+from openedx.features.course_experience import course_home_url
 from openedx.features.course_experience.url_helpers import (
     get_courseware_url,
     get_learning_mfe_home_url,
     is_request_from_learning_mfe
 )
 from openedx.features.course_experience.utils import dates_banner_should_display
-from openedx.features.course_experience.views.course_dates import CourseDatesFragmentView
 from openedx.features.course_experience.waffle import ENABLE_COURSE_ABOUT_SIDEBAR_HTML
 from openedx.features.enterprise_support.api import data_sharing_consent_required
 
-from ..entrance_exams import user_can_skip_entrance_exam
 from ..module_render import get_module, get_module_by_usage_id, get_module_for_descriptor
 from ..tabs import _get_dynamic_tabs
 from ..toggles import COURSEWARE_OPTIMIZED_RENDER_XBLOCK
@@ -203,18 +198,6 @@ REQUESTING_CERT_DATA = CertData(
     certificate_available_date=None
 )
 
-UNVERIFIED_CERT_DATA = CertData(
-    CertificateStatuses.unverified,
-    _('Certificate unavailable'),
-    _(
-        'You have not received a certificate because you do not have a current {platform_name} '
-        'verified identity.'
-    ).format(platform_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)),
-    download_url=None,
-    cert_web_view_url=None,
-    certificate_available_date=None
-)
-
 
 def _earned_but_not_available_cert_data(cert_downloadable_status):
     return CertData(
@@ -238,6 +221,23 @@ def _downloadable_cert_data(download_url=None, cert_web_view_url=None):
     )
 
 
+def _unverified_cert_data():
+    """
+        platform_name is dynamically updated in multi-tenant installations
+    """
+    return CertData(
+        CertificateStatuses.unverified,
+        _('Certificate unavailable'),
+        _(
+            'You have not received a certificate because you do not have a current {platform_name} '
+            'verified identity.'
+        ).format(platform_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)),
+        download_url=None,
+        cert_web_view_url=None,
+        certificate_available_date=None
+    )
+
+
 def user_groups(user):
     """
     TODO (vshnayder): This is not used. When we have a new plan for groups, adjust appropriately.
@@ -431,149 +431,6 @@ def jump_to(request, course_id, location):
     return redirect(redirect_url)
 
 
-@ensure_csrf_cookie
-@ensure_valid_course_key
-@data_sharing_consent_required
-def course_info(request, course_id):
-    """
-    Display the course's info.html, or 404 if there is no such course.
-    Assumes the course_id is in a valid format.
-    """
-    # TODO: LEARNER-611: This can be deleted with Course Info removal.  The new
-    #    Course Home is using its own processing of last accessed.
-    def get_last_accessed_courseware(course, request, user):
-        """
-        Returns the courseware module URL that the user last accessed, or None if it cannot be found.
-        """
-        field_data_cache = FieldDataCache.cache_for_descriptor_descendents(
-            course.id, request.user, course, depth=2
-        )
-        course_module = get_module_for_descriptor(
-            user,
-            request,
-            course,
-            field_data_cache,
-            course.id,
-            course=course,
-            will_recheck_access=True,
-        )
-        chapter_module = get_current_child(course_module)
-        if chapter_module is not None:
-            section_module = get_current_child(chapter_module)
-            if section_module is not None:
-                url = reverse('courseware_section', kwargs={
-                    'course_id': str(course.id),
-                    'chapter': chapter_module.url_name,
-                    'section': section_module.url_name
-                })
-                return url
-        return None
-
-    course_key = CourseKey.from_string(course_id)
-
-    # If the unified course experience is enabled, redirect to the "Course" tab
-    if not DISABLE_UNIFIED_COURSE_TAB_FLAG.is_enabled(course_key):
-        return redirect(course_home_url(course_key))
-
-    with modulestore().bulk_operations(course_key):
-        course = get_course_with_access(request.user, 'load', course_key)
-
-        can_masquerade = request.user.has_perm(MASQUERADE_AS_STUDENT, course)
-        masquerade, user = setup_masquerade(request, course_key, can_masquerade, reset_masquerade_data=True)
-
-        # LEARNER-612: CCX redirect handled by new Course Home (DONE)
-        # LEARNER-1697: Transition banner messages to new Course Home (DONE)
-        # if user is not enrolled in a course then app will show enroll/get register link inside course info page.
-        user_is_enrolled = CourseEnrollment.is_enrolled(user, course.id)
-        show_enroll_banner = request.user.is_authenticated and not user_is_enrolled
-
-        # If the user is not enrolled but this is a course that does not support
-        # direct enrollment then redirect them to the dashboard.
-        if not user_is_enrolled and not can_self_enroll_in_course(course_key):
-            return redirect(reverse('dashboard'))
-
-        # LEARNER-170: Entrance exam is handled by new Course Outline. (DONE)
-        # If the user needs to take an entrance exam to access this course, then we'll need
-        # to send them to that specific course module before allowing them into other areas
-        if not user_can_skip_entrance_exam(user, course):
-            return redirect(reverse('courseware', args=[str(course.id)]))
-
-        # Construct the dates fragment
-        dates_fragment = None
-
-        if request.user.is_authenticated:
-            # TODO: LEARNER-611: Remove enable_course_home_improvements
-            if SelfPacedConfiguration.current().enable_course_home_improvements:
-                # Shared code with the new Course Home (DONE)
-                dates_fragment = CourseDatesFragmentView().render_to_fragment(request, course_id=course_id)
-
-        # Shared code with the new Course Home (DONE)
-        # Get the course tools enabled for this user and course
-        course_tools = CourseToolsPluginManager.get_enabled_course_tools(request, course_key)
-
-        course_homepage_invert_title =\
-            configuration_helpers.get_value(
-                'COURSE_HOMEPAGE_INVERT_TITLE',
-                False
-            )
-
-        course_homepage_show_subtitle =\
-            configuration_helpers.get_value(
-                'COURSE_HOMEPAGE_SHOW_SUBTITLE',
-                True
-            )
-
-        course_homepage_show_org =\
-            configuration_helpers.get_value('COURSE_HOMEPAGE_SHOW_ORG', True)
-
-        course_title = course.display_number_with_default
-        course_subtitle = course.display_name_with_default
-        if course_homepage_invert_title:
-            course_title = course.display_name_with_default
-            course_subtitle = course.display_number_with_default
-
-        context = {
-            'request': request,
-            'masquerade_user': user,
-            'course_id': str(course_key),
-            'url_to_enroll': CourseTabView.url_to_enroll(course_key),
-            'cache': None,
-            'course': course,
-            'course_title': course_title,
-            'course_subtitle': course_subtitle,
-            'show_subtitle': course_homepage_show_subtitle,
-            'show_org': course_homepage_show_org,
-            'can_masquerade': can_masquerade,
-            'masquerade': masquerade,
-            'supports_preview_menu': True,
-            'studio_url': get_studio_url(course, 'course_info'),
-            'show_enroll_banner': show_enroll_banner,
-            'user_is_enrolled': user_is_enrolled,
-            'dates_fragment': dates_fragment,
-            'course_tools': course_tools,
-        }
-        context.update(
-            get_experiment_user_metadata_context(
-                course,
-                user,
-            )
-        )
-
-        # Get the URL of the user's last position in order to display the 'where you were last' message
-        context['resume_course_url'] = None
-        # TODO: LEARNER-611: Remove enable_course_home_improvements
-        if SelfPacedConfiguration.current().enable_course_home_improvements:
-            context['resume_course_url'] = get_last_accessed_courseware(course, request, user)
-
-        if not check_course_open_for_learner(user, course):
-            # Disable student view button if user is staff and
-            # course is not yet visible to students.
-            context['disable_student_access'] = True
-            context['supports_preview_menu'] = False
-
-        return render_to_response('courseware/info.html', context)
-
-
 class StaticCourseTabView(EdxFragmentView):
     """
     View that displays a static course tab with a given name.
@@ -1196,15 +1053,12 @@ def _certificate_message(student, course, enrollment_mode):  # lint-amnesty, pyl
     if cert_downloadable_status['is_generating']:
         return GENERATING_CERT_DATA
 
-    if cert_downloadable_status['is_unverified']:
-        return UNVERIFIED_CERT_DATA
+    if cert_downloadable_status['is_unverified'] or _missing_required_verification(student, enrollment_mode):
+        return _unverified_cert_data()
 
     if cert_downloadable_status['is_downloadable']:
         return _downloadable_certificate_message(course, cert_downloadable_status)
 
-    if _missing_required_verification(student, enrollment_mode):
-        return UNVERIFIED_CERT_DATA
-
     return REQUESTING_CERT_DATA
 
 
diff --git a/lms/djangoapps/discussion/rest_api/urls.py b/lms/djangoapps/discussion/rest_api/urls.py
index 121ffff1ee..be956edab8 100644
--- a/lms/djangoapps/discussion/rest_api/urls.py
+++ b/lms/djangoapps/discussion/rest_api/urls.py
@@ -15,6 +15,7 @@ from lms.djangoapps.discussion.rest_api.views import (
     CourseTopicsView,
     CourseTopicsViewV2,
     CourseView,
+    LearnerThreadView,
     ReplaceUsernamesView,
     RetireUserView,
     ThreadViewSet,
@@ -33,6 +34,13 @@ urlpatterns = [
         CourseDiscussionSettingsAPIView.as_view(),
         name="discussion_course_settings",
     ),
+    re_path(
+        r"^v1/courses/{}/learner/$".format(
+            settings.COURSE_ID_PATTERN
+        ),
+        LearnerThreadView.as_view(),
+        name="discussion_learner_threads",
+    ),
     re_path(
         fr"^v1/courses/{settings.COURSE_KEY_PATTERN}/activity_stats",
         CourseActivityStatsView.as_view(),
diff --git a/lms/djangoapps/discussion/rest_api/views.py b/lms/djangoapps/discussion/rest_api/views.py
index ff2599f852..1c7e24ec9a 100644
--- a/lms/djangoapps/discussion/rest_api/views.py
+++ b/lms/djangoapps/discussion/rest_api/views.py
@@ -24,7 +24,13 @@ from xmodule.modulestore.django import modulestore
 
 from common.djangoapps.util.file import store_uploaded_file
 from lms.djangoapps.course_goals.models import UserActivity
+from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from lms.djangoapps.discussion.django_comment_client import settings as cc_settings
+from lms.djangoapps.discussion.django_comment_client.utils import (
+    get_group_id_for_comments_service,
+    is_user_community_ta,
+    prepare_content,
+)
 from lms.djangoapps.instructor.access import update_forum_role
 from openedx.core.djangoapps.discussions.serializers import DiscussionSettingsSerializer
 from openedx.core.djangoapps.django_comment_common import comment_client
@@ -550,6 +556,58 @@ class ThreadViewSet(DeveloperErrorViewMixin, ViewSet):
         return Response(status=204)
 
 
+class LearnerThreadView(APIView):
+    """
+    **Use Cases**
+
+        Fetch user's active threads
+
+    **Example Requests**:
+
+        GET /api/discussion/v1/courses/course-v1:ExampleX+Subject101+2015/learner/?page=1&page_size=10
+
+    **GET Thread List Parameters**:
+
+        * page: The (1-indexed) page to retrieve (default is 1)
+
+        * page_size: The number of items per page (default is 10)
+    """
+
+    def get(self, request, course_id=None):
+        """
+        Implements the GET method as described in the class docstring.
+        """
+        course_key = CourseKey.from_string(course_id)
+        page_num = request.GET.get('page', 1)
+        threads_per_page = request.GET.get('page_size', 10)
+        discussion_id = None
+        user_id = request.user.id
+        group_id = None
+        try:
+            group_id = get_group_id_for_comments_service(request, course_key, discussion_id)
+        except ValueError:
+            pass
+
+        query_params = {
+            "page": page_num,
+            "per_page": threads_per_page,
+            "course_id": str(course_key),
+            "user_id": user_id,
+        }
+
+        if group_id is not None:
+            query_params['group_id'] = group_id
+            profiled_user = comment_client.User(id=user_id, course_id=course_key, group_id=group_id)
+        else:
+            profiled_user = comment_client.User(id=user_id, course_id=course_key)
+        threads, page, num_pages = profiled_user.active_threads(query_params)
+
+        is_staff = has_permission(request.user, 'openclose_thread', course_key)
+        is_community_ta = is_user_community_ta(request.user, course_key)
+        threads = [prepare_content(thread, course_key, is_staff, is_community_ta) for thread in threads]
+        return Response(threads)
+
+
 @view_auth_classes()
 class CommentViewSet(DeveloperErrorViewMixin, ViewSet):
     """
diff --git a/lms/djangoapps/discussion/signals/handlers.py b/lms/djangoapps/discussion/signals/handlers.py
index d9d669b113..eb084c8665 100644
--- a/lms/djangoapps/discussion/signals/handlers.py
+++ b/lms/djangoapps/discussion/signals/handlers.py
@@ -7,6 +7,7 @@ import logging
 
 from django.conf import settings
 from django.dispatch import receiver
+from django.utils.html import strip_tags
 from opaque_keys.edx.locator import LibraryLocator
 from xmodule.modulestore.django import SignalHandler
 
@@ -103,16 +104,23 @@ def create_message_context_for_reported_content(user, post, site, sender):
     """
     Create message context for reported content.
     """
+    def get_comment_type(comment):
+        """
+        Returns type of comment.
+        """
+        return 'response' if comment.get('parent_id', None) is None else 'comment'
+
     context = {
         'user_id': user.id,
         'course_id': str(post.course_id),
         'thread_id': post.thread.id if sender == 'flag_abuse_for_comment' else post.id,
         'title': post.thread.title if sender == 'flag_abuse_for_comment' else post.title,
-        'content_type': post.type,
-        'content_body': post.body,
+        'content_type': 'post' if sender == 'flag_abuse_for_thread' else get_comment_type(post),
+        'content_body': strip_tags(post.body),
         'thread_created_at': post.created_at,
         'thread_commentable_id': post.commentable_id,
         'site_id': site.id,
+        'comment_id': post.id if sender == 'flag_abuse_for_comment' else None,
     }
     return context
 
diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py
index 1f00f8111f..e60b5229db 100644
--- a/lms/djangoapps/discussion/tasks.py
+++ b/lms/djangoapps/discussion/tasks.py
@@ -18,10 +18,10 @@ from edx_django_utils.monitoring import set_code_owner_attribute
 from eventtracking import tracker
 from opaque_keys.edx.keys import CourseKey
 from six.moves.urllib.parse import urljoin
+from xmodule.modulestore.django import modulestore
 
 import openedx.core.djangoapps.django_comment_common.comment_client as cc
 from common.djangoapps.track import segment
-from common.lib.xmodule.xmodule.modulestore.django import modulestore
 from lms.djangoapps.discussion.django_comment_client.utils import (
     permalink,
     get_users_with_moderator_roles,
@@ -155,9 +155,9 @@ def _should_send_message(context):
 
 
 def _is_content_still_reported(context):
-    if context.get('thread_id'):
-        return len(cc.Thread.find(context['thread_id']).abuse_flaggers) > 0
-    return len(cc.Comment.find(context['comment_id']).abuse_flaggers) > 0
+    if context.get('comment_id') is not None:
+        return len(cc.Comment.find(context['comment_id']).abuse_flaggers) > 0
+    return len(cc.Thread.find(context['thread_id']).abuse_flaggers) > 0
 
 
 def _is_not_subcomment(comment_id):
diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_mfe_embed.html b/lms/djangoapps/discussion/templates/discussion/discussion_mfe_embed.html
index 69dcc60774..ffd4725796 100644
--- a/lms/djangoapps/discussion/templates/discussion/discussion_mfe_embed.html
+++ b/lms/djangoapps/discussion/templates/discussion/discussion_mfe_embed.html
@@ -15,7 +15,8 @@ from openedx.core.djangolib.js_utils import js_escaped_string
     window.addEventListener("load", function () {
         const mfeUrl = (new URL("${discussions_mfe_url  | n, js_escaped_string}"));
         const iframe = document.querySelector('#discussions-mfe-tab-embed');
-        iframe.src = mfeUrl.href + window.location.hash.slice(1);
+        let timestamp = "?no-cache=" + Date.now();
+        iframe.src = mfeUrl.href + window.location.hash.slice(1) + timestamp;
         window.addEventListener("message", (event) => {
             const payload = event.data.payload;
             if (event.origin !== mfeUrl.origin) {
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
index 535f667dc9..a66cebb6a9 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html
@@ -7,17 +7,16 @@
 <table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
     <tr>
         <td>
-            <h2>
+            <h2 style="font-weight: normal">
                 {% filter force_escape %}
-                    {% blocktrans trimmed asvar replied_to_text %}
+                    {% blocktrans %}
                         {{ course_name }}: Reported content awaits review
                     {% endblocktrans %}
                 {% endfilter %}
-                {% interpolate_html replied_to_text start_tag='<b>'|safe end_tag='</b>'|safe %}
             </h2>
 
-            <h3> <b> You are receiving this email because the following {{ content_type }} was reported for review </b> </h3>
-            <h3> <b> {{ title }} </b> </h3>
+            <h4> <b> You are receiving this email because the following {{ content_type }} was reported for review </b> </h4>
+            <h3> <b> Post Title: {{ title }} </b> </h3>
 
             {{ content_body }}
 
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
index ae4bbbdb41..3463facd9c 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt
@@ -11,7 +11,7 @@
                     margin: 20px 20px 30px 30px;
                     color: rgba(0,0,0,.75);">
     <h3> <b> You are receiving this email because the following {{ content_type }} was reported for review </b> </h3>
-    <h3> <b> {{ title }} </b> </h3>
+    <h3> <b> Post Title: {{ title }} </b> </h3>
     {{ content_body }}
 </div>
 
diff --git a/lms/djangoapps/discussion/toggles.py b/lms/djangoapps/discussion/toggles.py
index 0ab0638abe..1bafee3cf7 100644
--- a/lms/djangoapps/discussion/toggles.py
+++ b/lms/djangoapps/discussion/toggles.py
@@ -69,3 +69,12 @@ ENABLE_DISCUSSION_MODERATION_REASON_CODES = CourseWaffleFlag(
 ENABLE_REPORTED_CONTENT_EMAIL_NOTIFICATIONS = CourseWaffleFlag(
     f'{WAFFLE_FLAG_NAMESPACE}.enable_reported_content_email_notifications', __name__
 )
+
+# .. toggle_name: discussions.enable_mfe_banner_for_learners
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to enable new MFE banner for learners
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2022-06-08
+# .. toggle_target_removal_date: 2022-09-05
+ENABLE_DISCUSSIONS_MFE_BANNER = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.enable_mfe_banner_for_learners', __name__)
diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
index b056c24f4b..f0935d4469 100644
--- a/lms/djangoapps/discussion/views.py
+++ b/lms/djangoapps/discussion/views.py
@@ -48,7 +48,11 @@ from lms.djangoapps.discussion.django_comment_client.utils import (
     strip_none
 )
 from lms.djangoapps.discussion.exceptions import TeamDiscussionHiddenFromUserException
-from lms.djangoapps.discussion.toggles import ENABLE_DISCUSSIONS_MFE, ENABLE_DISCUSSIONS_MFE_FOR_EVERYONE
+from lms.djangoapps.discussion.toggles import (
+    ENABLE_DISCUSSIONS_MFE,
+    ENABLE_DISCUSSIONS_MFE_FOR_EVERYONE,
+    ENABLE_DISCUSSIONS_MFE_BANNER
+)
 from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
 from lms.djangoapps.teams import api as team_api
 from openedx.core.djangoapps.discussions.url_helpers import get_discussions_mfe_url
@@ -748,7 +752,7 @@ def _discussions_mfe_context(query_params: Dict,
         "mfe_url": f"{forum_url}?discussions_experience=new",
         "share_feedback_url": settings.DISCUSSIONS_MFE_FEEDBACK_URL,
         "course_key": course_key,
-        "show_banner": enable_mfe and is_privileged,
+        "show_banner": enable_mfe and (is_privileged or ENABLE_DISCUSSIONS_MFE_BANNER),
         "discussions_mfe_url": mfe_url,
     }
 
diff --git a/lms/djangoapps/grades/course_grade_factory.py b/lms/djangoapps/grades/course_grade_factory.py
index 65f3a9c4cc..4b310e4de0 100644
--- a/lms/djangoapps/grades/course_grade_factory.py
+++ b/lms/djangoapps/grades/course_grade_factory.py
@@ -9,7 +9,6 @@ from openedx.core.djangoapps.signals.signals import (
     COURSE_GRADE_NOW_FAILED,
     COURSE_GRADE_NOW_PASSED
 )
-
 from .config import assume_zero_if_absent, should_persist_grades
 from .course_data import CourseData
 from .course_grade import CourseGrade, ZeroCourseGrade
diff --git a/lms/djangoapps/grades/management/commands/send_segment_events_for_failed_learners.py b/lms/djangoapps/grades/management/commands/send_segment_events_for_failed_learners.py
new file mode 100644
index 0000000000..c586360072
--- /dev/null
+++ b/lms/djangoapps/grades/management/commands/send_segment_events_for_failed_learners.py
@@ -0,0 +1,139 @@
+"""
+Send segment events for failed learners.
+"""
+
+import logging
+from datetime import timedelta
+
+from django.core.management.base import BaseCommand
+from django.core.paginator import Paginator
+from django.utils import timezone
+
+from common.djangoapps.course_modes.models import CourseMode
+from common.djangoapps.student.models import CourseEnrollment
+from common.djangoapps.track import segment
+from lms.djangoapps.grades.models import PersistentCourseGrade
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+
+log = logging.getLogger(__name__)
+
+PAID_ENROLLMENT_MODES = [
+    CourseMode.MASTERS,
+    CourseMode.VERIFIED,
+    CourseMode.CREDIT_MODE,
+    CourseMode.PROFESSIONAL,
+    CourseMode.NO_ID_PROFESSIONAL_MODE,
+]
+EVENT_NAME = 'edx.course.learner.failed'
+
+
+class Command(BaseCommand):
+    """
+    Example usage:
+        $ ./manage.py lms send_segment_events_for_failed_learners
+    """
+
+    help = 'Send segment events for failed learners.'
+
+    def add_arguments(self, parser):
+        """
+        Entry point to add arguments.
+        """
+        parser.add_argument(
+            '--dry-run',
+            action='store_true',
+            dest='dry_run',
+            default=False,
+            help='Dry Run, print log messages without firing the segment event.',
+        )
+
+    def get_courses(self):
+        """
+        Find all courses where end date has passed 31 days ago course grade override date is course.end + 30 days
+        but we are adding grace period of 1 day to mitigate any edge cases due to last minute grade override.
+        """
+        thirty_one_days_ago = timezone.now().date() - timedelta(days=31)
+        courses = CourseOverview.objects.exclude(end__isnull=True).filter(end__date=thirty_one_days_ago)
+        thirty_one_days_ago_ended_course_keys = [str(course) for course in courses.values_list('id', flat=True)]
+        log.info(f"Found {thirty_one_days_ago_ended_course_keys} courses that were ended on [{thirty_one_days_ago}]")
+        return courses
+
+    def get_course_failed_user_ids(self, course):
+        """
+        Get list of all the enrolled users that failed the given course. This method will only consider paid enrolments.
+
+        Arguments:
+            course (CourseOverview): Course overview instance whose failed enrolments should be returned.
+
+        Returns:
+            (generator): An iterator with paginated user ids, each iteration will return 500 item list of user ids.
+        """
+        failed_grade_user_ids = PersistentCourseGrade.objects.filter(
+            passed_timestamp__isnull=True,
+            course_id=course.id,
+        ).values_list('user_id', flat=True)
+
+        paginator = Paginator(failed_grade_user_ids, 500)
+        for page_number in paginator.page_range:
+            page = paginator.page(page_number)
+
+            failed_grade_user_ids = list(page.object_list)
+            # exclude all non-paid enrollments
+            failed_user_ids = CourseEnrollment.objects.filter(
+                course_id=course.id,
+                user_id__in=failed_grade_user_ids,
+                mode__in=PAID_ENROLLMENT_MODES,
+                is_active=True
+            ).values_list('user_id', flat=True)
+            failed_user_ids = list(failed_user_ids)
+
+            yield failed_user_ids
+
+    def handle(self, *args, **options):
+        """
+        Command's entery point.
+        """
+        should_fire_event = not options['dry_run']
+
+        log_prefix = '[SEND_SEGMENT_EVENTS_FOR_FAILED_LEARNERS]'
+        if not should_fire_event:
+            log_prefix = '[DRY RUN]'
+
+        stats = {
+            'failed_course_user_ids': {},
+        }
+
+        log.info(f'{log_prefix} Command started.')
+
+        for course in self.get_courses():
+            # course metadata for event
+            course_org = course.org
+            course_id = str(course.id)
+            course_display_name = course.display_name
+
+            stats['failed_course_user_ids'][course_id] = []
+
+            for course_failed_user_ids in self.get_course_failed_user_ids(course):
+                # for each failed enrollment, send a segment event
+                for course_failed_user_id in course_failed_user_ids:
+                    event_properties = {
+                        'LMS_USER_ID': course_failed_user_id,
+                        'COURSERUN_KEY': course_id,
+                        'COURSE_TITLE': course_display_name,
+                        'COURSE_ORG_NAME': course_org,
+                        'PASSED': 0,
+                    }
+                    if should_fire_event:
+                        segment.track(course_failed_user_id, EVENT_NAME, event_properties)
+
+                    stats['failed_course_user_ids'][course_id].append(course_failed_user_id)
+
+                    log.info(
+                        "{} Segment event fired for failed learner. Event: [{}], Data: [{}]".format(
+                            log_prefix,
+                            EVENT_NAME,
+                            event_properties
+                        )
+                    )
+
+        log.info(f"{log_prefix} Command completed. Stats: [{stats['failed_course_user_ids']}]")
diff --git a/lms/djangoapps/grades/management/commands/tests/test_send_segment_events_for_failed_learners.py b/lms/djangoapps/grades/management/commands/tests/test_send_segment_events_for_failed_learners.py
new file mode 100644
index 0000000000..e188a0deb9
--- /dev/null
+++ b/lms/djangoapps/grades/management/commands/tests/test_send_segment_events_for_failed_learners.py
@@ -0,0 +1,155 @@
+"""
+Tests for `send_segment_events_for_failed_learners` management command.
+"""
+
+import random
+from datetime import timedelta
+from unittest import mock
+from unittest.mock import patch
+
+import ddt
+from django.core.management import call_command
+from django.utils import timezone
+from xmodule.modulestore.tests.django_utils import \
+    SharedModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
+
+from common.djangoapps.student.models import CourseEnrollment
+from common.djangoapps.student.tests.factories import UserFactory
+from lms.djangoapps.grades.management.commands import send_segment_events_for_failed_learners
+from lms.djangoapps.grades.management.commands.send_segment_events_for_failed_learners import (
+    EVENT_NAME,
+    PAID_ENROLLMENT_MODES
+)
+from lms.djangoapps.grades.models import PersistentCourseGrade
+from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
+
+
+@ddt.ddt
+class TestSendSegmentEventsForFailedLearnersCommand(SharedModuleStoreTestCase):
+    """
+    Tests `send_segment_events_for_failed_learners` management command.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.command = send_segment_events_for_failed_learners.Command()
+        # we will create enrollments for paid modes plus `audit` mode
+        enrollment_modes = PAID_ENROLLMENT_MODES + ['audit']
+
+        # import pdb ; pdb.set_trace()
+        cls.course_end = timezone.now() - timedelta(days=31)
+        cls.course_overviews = CourseOverviewFactory.create_batch(4, end=cls.course_end)
+
+        # set end date for a course 100 days ago from the current date
+        course = cls.course_overviews[2]
+        course.end = timezone.now() - timedelta(days=100)
+        course.save()
+
+        # set end date to None
+        course = cls.course_overviews[3]
+        course.end = None
+        course.save()
+
+        cls.course_keys = [str(course_overview.id) for course_overview in cls.course_overviews]
+        cls.users = [UserFactory.create(username=f'user{idx}') for idx in range(5)]
+
+        for user in cls.users:
+            for course_overview in cls.course_overviews:
+                CourseEnrollment.enroll(user, course_overview.id, mode=random.choice(enrollment_modes))
+                params = [
+                    {
+                        "user_id": user.id,
+                        "course_id": course_overview.id,
+                        "course_version": "Alice",
+                        "percent_grade": 0.0,
+                        "letter_grade": "",
+                        "passed_timestamp": None,
+                    },
+                    {
+                        "user_id": user.id,
+                        "course_id": course_overview.id,
+                        "course_version": "Bob",
+                        "percent_grade": 77.7,
+                        "letter_grade": "Great job",
+                        "passed_timestamp": timezone.now() - timedelta(days=1),
+                    },
+                ]
+                # randomly create passed and failed grades
+                PersistentCourseGrade.objects.create(**random.choice(params))
+
+    def construct_event_call_data(self):
+        """
+        Construct segment event call data for verification.
+        """
+        event_call_data = []
+        for course in self.command.get_courses():
+            for course_failed_user_ids in self.command.get_course_failed_user_ids(course):
+                for course_failed_user_id in course_failed_user_ids:
+                    event_call_data.append([
+                        course_failed_user_id,
+                        EVENT_NAME,
+                        {
+                            'LMS_USER_ID': course_failed_user_id,
+                            'COURSERUN_KEY': str(course.id),
+                            'COURSE_TITLE': course.display_name,
+                            'COURSE_ORG_NAME': course.org,
+                            'PASSED': 0,
+                        }
+                    ])
+        return event_call_data
+
+    def test_get_courses(self):
+        """
+        Verify that `get_courses` method returns correct courses.
+        """
+        courses = self.command.get_courses()
+        assert len(courses) == 2
+        for index in range(2):
+            assert courses[index].id == self.course_overviews[index].id
+            assert self.course_end.date() == courses[index].end.date() == self.course_overviews[index].end.date()
+
+    def test_get_course_failed_user_ids(self):
+        """
+        Verify that `get_course_failed_user_ids` method returns correct user ids.
+
+        * user id must have a paid enrollment
+        * user id must have a failed grade
+        """
+        for course in self.course_overviews:
+            for user_ids in self.command.get_course_failed_user_ids(course):
+                for user_id in user_ids:
+                    # user id must have a paid enrollment
+                    assert CourseEnrollment.objects.filter(
+                        course_id=course.id,
+                        user_id=user_id,
+                        mode__in=PAID_ENROLLMENT_MODES,
+                        is_active=True
+                    ).exists()
+
+                    # user id must have a failed grade
+                    assert PersistentCourseGrade.objects.filter(
+                        passed_timestamp__isnull=True,
+                        course_id=course.id,
+                        user_id=user_id,
+                    ).exists()
+
+    @patch('lms.djangoapps.grades.management.commands.send_segment_events_for_failed_learners.segment.track')
+    def test_command_dry_run(self, segment_track_mock):
+        """
+        Verify that management command does not fire any segment event in dry run mode.
+        """
+        call_command(self.command, '--dry-run')
+        segment_track_mock.assert_has_calls([])
+
+    @patch('lms.djangoapps.grades.management.commands.send_segment_events_for_failed_learners.segment.track')
+    def test_command(self, segment_track_mock):
+        """
+        Verify that management command fires segment events with correct data.
+
+        * Event should be fired for failed learners only.
+        * Event should be fired for paid enrollments only.
+        """
+        call_command(self.command)
+        expected_segment_event_calls = [mock.call(*event_data) for event_data in self.construct_event_call_data()]
+        segment_track_mock.assert_has_calls(expected_segment_event_calls)
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index 08a27a0619..d24e65b5c6 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -95,7 +95,7 @@ from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_COMM
 from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
-from openedx.core.djangoapps.user_api.preferences.api import set_user_preference, delete_user_preference
+from openedx.core.djangoapps.user_api.preferences.api import delete_user_preference
 from openedx.core.lib.teams_config import TeamsConfig
 from openedx.core.lib.xblock_utils import grade_histogram
 from openedx.features.course_experience import RELATIVE_DATES_FLAG
@@ -3399,11 +3399,6 @@ class TestInstructorSendEmail(SiteMixin, SharedModuleStoreTestCase, LoginEnrollm
         super().tearDown()
         delete_user_preference(self.instructor, 'time_zone', username=self.instructor.username)
 
-    def _get_expected_schedule(self, schedule, timezone):
-        local_tz = dateutil.tz.gettz(timezone)
-        local_dt = dateutil.parser.parse(schedule).replace(tzinfo=local_tz)
-        return local_dt.astimezone(pytz.utc)
-
     def test_send_email_as_logged_in_instructor(self):
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, self.full_test_message)
@@ -3491,15 +3486,13 @@ class TestInstructorSendEmail(SiteMixin, SharedModuleStoreTestCase, LoginEnrollm
                                                template_name=org_template, from_addr=org_email).count()
 
     @patch("lms.djangoapps.instructor.views.api.task_api.submit_bulk_course_email")
-    def test_send_email_with_schedule_and_timezone(self, mock_task_api):
+    def test_send_email_with_schedule(self, mock_task_api):
         """
         Test for the new scheduling logic added to the `send_email` function.
         """
-        schedule = "2030-05-02T14:00:00.000Z"
-        timezone = "America/New_York"
+        schedule = "2099-05-02T14:00:00.000Z"
         self.full_test_message['schedule'] = schedule
-        self.full_test_message['browser_timezone'] = timezone
-        expected_schedule = self._get_expected_schedule(schedule, timezone)
+        expected_schedule = dateutil.parser.parse(schedule).replace(tzinfo=pytz.utc)
 
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, self.full_test_message)
@@ -3509,95 +3502,36 @@ class TestInstructorSendEmail(SiteMixin, SharedModuleStoreTestCase, LoginEnrollm
         assert arg_schedule == expected_schedule
 
     @patch("lms.djangoapps.instructor.views.api.task_api.submit_bulk_course_email")
-    def test_send_email_with_schedule_and_no_browser_timezone(self, mock_task_api):
-        """
-        Test that verifies we will retrieve and use the preferred time zone if possible.
-        """
-        schedule = "2030-05-02T14:00:00.000Z"
-        timezone = "America/New_York"
-        self.full_test_message['schedule'] = schedule
-        self.full_test_message['browser_timezone'] = ""
-        expected_schedule = self._get_expected_schedule(schedule, timezone)
-        set_user_preference(self.instructor, 'time_zone', timezone)
-
-        url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
-        response = self.client.post(url, self.full_test_message)
-
-        assert response.status_code == 200
-        _, _, _, arg_schedule = mock_task_api.call_args.args
-        assert arg_schedule == expected_schedule
-
-    @patch("lms.djangoapps.instructor.views.api.task_api.submit_bulk_course_email")
-    def test_send_email_with_schedule_and_preferred_timezone(self, mock_task_api):
-        """
-        Test that verifies we will use the preferred timezone over the browser timezone if possible.
-        """
-        schedule = "2030-05-02T14:00:00.000Z"
-        preferred_timezone = "America/Anchorage"
-        self.full_test_message['schedule'] = schedule
-        self.full_test_message['browser_timezone'] = "America/New_York"
-        expected_schedule = self._get_expected_schedule(schedule, preferred_timezone)
-        set_user_preference(self.instructor, 'time_zone', preferred_timezone)
-
-        url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
-        response = self.client.post(url, self.full_test_message)
-
-        assert response.status_code == 200
-        _, _, _, arg_schedule = mock_task_api.call_args.args
-        assert arg_schedule == expected_schedule
-
-    def test_send_email_with_malformed_schedule_expect_error(self):
+    def test_send_email_with_malformed_schedule_expect_error(self, mock_task_api):
+        schedule = "Blub Glub"
         self.full_test_message['schedule'] = "Blub Glub"
-        self.full_test_message['browser_timezone'] = "America/New_York"
-        expected_messages = [
-            "Error occurred while attempting to create a scheduled bulk email task: unknown string format",
-        ]
+        expected_message = (
+            f"Error occurred creating a scheduled bulk email task. Schedule provided: '{schedule}'. Error: Unknown "
+            "string format: Blub Glub"
+        )
 
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         with LogCapture() as log:
             response = self.client.post(url, self.full_test_message)
 
         assert response.status_code == 400
-        log.check_present(
-            (LOG_PATH, "ERROR", expected_messages[0]),
-        )
-
-    def test_send_email_with_malformed_timezone_expect_error(self):
-        self.full_test_message['schedule'] = "2030-05-02T14:00:00.000Z"
-        self.full_test_message['browser_timezone'] = "Flim/Flam"
-        expected_messages = [
-            "Error occurred while attempting to create a scheduled bulk email task: Unable to determine the time zone "
-            "to use to convert the schedule to UTC",
-        ]
-
-        url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
-        with LogCapture() as log:
-            response = self.client.post(url, self.full_test_message)
-
-        assert response.status_code == 400
-        log.check_present(
-            (LOG_PATH, "ERROR", expected_messages[0]),
-        )
+        log.check_present((LOG_PATH, "ERROR", expected_message),)
+        mock_task_api.assert_not_called()
 
     def test_send_email_with_lapsed_date_expect_error(self):
         schedule = "2020-01-01T00:00:00.000Z"
-        timezone = "America/New_York"
         self.full_test_message['schedule'] = schedule
-        self.full_test_message['browser_timezone'] = timezone
-        expected_schedule = self._get_expected_schedule(schedule, timezone)
-        expected_messages = [
-            "Error occurred while attempting to create a scheduled bulk email task: The requested schedule "
-            f"'{expected_schedule}' is in the past"
-        ]
+        expected_message = (
+            f"Error occurred creating a scheduled bulk email task. Schedule provided: '{schedule}'. Error: the "
+            "requested schedule is in the past"
+        )
 
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         with LogCapture() as log:
             response = self.client.post(url, self.full_test_message)
 
         assert response.status_code == 400
-        log.check_present(
-            (LOG_PATH, "ERROR", expected_messages[0]),
-        )
+        log.check_present((LOG_PATH, "ERROR", expected_message),)
 
 
 class MockCompletionInfo:
diff --git a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
index 1f2485f1b3..5b62e67641 100644
--- a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
+++ b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
@@ -58,7 +58,6 @@ class TestGradebook(SharedModuleStoreTestCase):
         instructor = AdminFactory.create()
         self.client.login(username=instructor.username, password='test')
         self.users = [UserFactory.create() for _ in range(USER_COUNT)]
-
         for user in self.users:
             CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
 
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 6ad7f2057c..8388fffb4f 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -14,6 +14,7 @@ import string
 import random
 import re
 
+import dateutil
 import pytz
 import edx_api_doc_tools as apidocs
 from django.conf import settings
@@ -89,7 +90,6 @@ from lms.djangoapps.discussion.django_comment_client.utils import (
 )
 from lms.djangoapps.instructor import enrollment
 from lms.djangoapps.instructor.access import ROLES, allow_access, list_with_level, revoke_access, update_forum_role
-from lms.djangoapps.instructor_task.api import convert_schedule_to_utc_from_local
 from lms.djangoapps.instructor.constants import INVOICE_KEY
 from lms.djangoapps.instructor.enrollment import (
     enroll_email,
@@ -2698,7 +2698,7 @@ def send_email(request, course_id):
     course_overview = CourseOverview.get_from_id(course_id)
 
     if not is_bulk_email_feature_enabled(course_id):
-        log.warning('Email is not enabled for course %s', course_id)
+        log.warning(f"Email is not enabled for course {course_id}")
         return HttpResponseForbidden("Email is not enabled for this course.")
 
     targets = json.loads(request.POST.get("send_to"))
@@ -2706,20 +2706,22 @@ def send_email(request, course_id):
     message = request.POST.get("message")
     # optional, this is a date and time in the form of an ISO8601 string
     schedule = request.POST.get("schedule", "")
-    # optional, this is the timezone captured from the author's browser when requesting a scheduled email
-    browser_timezone = request.POST.get("browser_timezone", "")
 
-    # If this is a scheduled bulk email request then we try to convert the requested schedule date to UTC. We do this
-    # before we attempt to create the email object instance in case there is an issue as we don't want to have an
-    # orphaned email object that will never be sent.
+    schedule_dt = None
     if schedule:
         try:
-            schedule = convert_schedule_to_utc_from_local(schedule, browser_timezone, request.user)
-            _determine_valid_schedule(schedule)
-        except ValueError as error:
-            error_message = f"Error occurred while attempting to create a scheduled bulk email task: {error}"
-            log.error(f"{error_message}")
-            return HttpResponseBadRequest(repr(error_message))
+            # convert the schedule from a string to a datetime, then check if its a valid future date and time, dateutil
+            # will throw a ValueError if the schedule is no good.
+            schedule_dt = dateutil.parser.parse(schedule).replace(tzinfo=pytz.utc)
+            if schedule_dt < datetime.datetime.now(pytz.utc):
+                raise ValueError("the requested schedule is in the past")
+        except ValueError as value_error:
+            error_message = (
+                f"Error occurred creating a scheduled bulk email task. Schedule provided: '{schedule}'. Error: "
+                f"{value_error}"
+            )
+            log.error(error_message)
+            return HttpResponseBadRequest(error_message)
 
     # Retrieve the customized email "from address" and email template from site configuration for the course/partner. If
     # there is no site configuration enabled for the current site then we use system defaults for both.
@@ -2742,7 +2744,7 @@ def send_email(request, course_id):
         return HttpResponseBadRequest(repr(err))
 
     # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
-    task_api.submit_bulk_course_email(request, course_id, email.id, schedule)
+    task_api.submit_bulk_course_email(request, course_id, email.id, schedule_dt)
 
     response_payload = {
         'course_id': str(course_id),
@@ -3600,16 +3602,3 @@ def _get_branded_email_template(course_overview):
         template_name = template_name.get(course_overview.display_org_with_default)
 
     return template_name
-
-
-def _determine_valid_schedule(schedule):
-    """
-    Utility function that determines if the requested schedule is in the future. Raises ValueError if the schedule time
-    has already lapsed.
-
-    Args:
-        schedule (DateTime): UTC DateTime representing the desired date and time to process a scheduled instructor task.
-    """
-    now = datetime.datetime.now(pytz.utc)
-    if schedule < now:
-        raise ValueError(f"The requested schedule '{schedule}' is in the past")
diff --git a/lms/djangoapps/instructor_task/api.py b/lms/djangoapps/instructor_task/api.py
index 03c4d29b0a..bbf5bf7b28 100644
--- a/lms/djangoapps/instructor_task/api.py
+++ b/lms/djangoapps/instructor_task/api.py
@@ -11,7 +11,6 @@ import hashlib
 import logging
 from collections import Counter
 
-import dateutil
 import pytz
 from celery.states import READY_STATES
 
@@ -51,7 +50,6 @@ from lms.djangoapps.instructor_task.tasks import (
     send_bulk_course_email,
     generate_anonymous_ids_for_course
 )
-from openedx.core.djangoapps.user_api.preferences.api import get_user_preference
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 log = logging.getLogger(__name__)
@@ -589,37 +587,3 @@ def process_scheduled_instructor_tasks():
             submit_scheduled_task(schedule)
         except QueueConnectionError as exc:
             log.error(f"Error processing scheduled task with task id '{schedule.task.id}': {exc}")
-
-
-def convert_schedule_to_utc_from_local(schedule, browser_timezone, user):
-    """
-    Utility function to help convert the schedule of an instructor task from the requesters local time and timezone
-    (taken from the request) to a UTC datetime.
-
-    Args:
-        schedule (String): The desired time to execute a scheduled task, in local time, in the form of an ISO8601
-            string.
-        timezone (String): The time zone, as captured by the user's web browser, in the form of a string.
-        user (User): The user requesting the action, captured from the originating web request. Used to lookup the
-            the time zone preference as set in the user's account settings.
-
-    Returns:
-        DateTime: A datetime instance describing when to execute this schedule task converted to the UTC timezone.
-    """
-    # look up the requesting user's timezone from their account settings
-    preferred_timezone = get_user_preference(user, 'time_zone', username=user.username)
-    # use the user's preferred timezone (if available), otherwise use the browser timezone.
-    timezone = preferred_timezone if preferred_timezone else browser_timezone
-
-    # convert the schedule to UTC
-    log.info(f"Converting requested schedule from local time '{schedule}' with the timezone '{timezone}' to UTC")
-
-    local_tz = dateutil.tz.gettz(timezone)
-    if local_tz is None:
-        raise ValueError(
-            "Unable to determine the time zone to use to convert the schedule to UTC"
-        )
-    local_dt = dateutil.parser.parse(schedule).replace(tzinfo=local_tz)
-    schedule_utc = local_dt.astimezone(pytz.utc)
-
-    return schedule_utc
diff --git a/lms/djangoapps/instructor_task/rest_api/v1/views.py b/lms/djangoapps/instructor_task/rest_api/v1/views.py
index 5b1664dcd1..10ebfb21b3 100644
--- a/lms/djangoapps/instructor_task/rest_api/v1/views.py
+++ b/lms/djangoapps/instructor_task/rest_api/v1/views.py
@@ -6,6 +6,7 @@ import json
 import logging
 import pytz
 
+import dateutil
 from celery.states import REVOKED
 from django.db import transaction
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
@@ -14,7 +15,6 @@ from rest_framework.response import Response
 from rest_framework import generics, status
 
 from lms.djangoapps.bulk_email.api import update_course_email
-from lms.djangoapps.instructor_task.api import convert_schedule_to_utc_from_local
 from lms.djangoapps.instructor_task.data import InstructorTaskTypes
 from lms.djangoapps.instructor_task.models import InstructorTaskSchedule, SCHEDULED
 from lms.djangoapps.instructor_task.rest_api.v1.exceptions import TaskUpdateException
@@ -126,10 +126,9 @@ class ModifyScheduledBulkEmailInstructorTask(generics.DestroyAPIView, generics.U
 
             with transaction.atomic():
                 if schedule:
-                    browser_timezone = request.data.get("browser_timezone", None)
-                    schedule_utc = convert_schedule_to_utc_from_local(schedule, browser_timezone, request.user)
-                    self._verify_valid_schedule(schedule_id, schedule_utc)
-                    task_schedule.task_due = schedule_utc
+                    schedule_dt = dateutil.parser.parse(schedule).replace(tzinfo=pytz.utc)
+                    self._verify_valid_schedule(schedule_id, schedule_dt)
+                    task_schedule.task_due = schedule_dt
                     task_schedule.save()
                 if email_data:
                     email_id = email_data.get("id")
diff --git a/lms/djangoapps/instructor_task/tests/test_api.py b/lms/djangoapps/instructor_task/tests/test_api.py
index 79d2184582..4b84fbff7f 100644
--- a/lms/djangoapps/instructor_task/tests/test_api.py
+++ b/lms/djangoapps/instructor_task/tests/test_api.py
@@ -7,7 +7,6 @@ import json
 from unittest.mock import MagicMock, Mock, patch
 from uuid import uuid4
 
-import dateutil
 import pytest
 import pytz
 import ddt
@@ -22,7 +21,6 @@ from lms.djangoapps.bulk_email.data import BulkEmailTargetChoices
 from lms.djangoapps.certificates.data import CertificateStatuses
 from lms.djangoapps.certificates.models import CertificateGenerationHistory
 from lms.djangoapps.instructor_task.api import (
-    convert_schedule_to_utc_from_local,
     SpecificStudentIdMissingError,
     generate_anonymous_ids,
     generate_certificates_for_students,
@@ -63,7 +61,6 @@ from lms.djangoapps.instructor_task.tests.test_base import (
     InstructorTaskTestCase,
     TestReportMixin
 )
-from openedx.core.djangoapps.user_api.preferences.api import set_user_preference, delete_user_preference
 
 LOG_PATH = 'lms.djangoapps.instructor_task.api'
 
@@ -531,77 +528,3 @@ class InstructorTaskCourseSubmitTest(TestReportMixin, InstructorTaskCourseTestCa
             process_scheduled_instructor_tasks()
 
         log.check_present((LOG_PATH, "ERROR", expected_messages[0]),)
-
-
-@patch('lms.djangoapps.bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True))  # lint-amnesty, pylint: disable=line-too-long
-class ScheduledInstructorTaskTests(TestReportMixin, InstructorTaskCourseTestCase):
-    """
-    Tests API methods that support scheduled instructor tasks
-    """
-    def setUp(self):
-        super().setUp()
-        self.instructor = UserFactory.create(username="instructor", email="instructor@edx.org")
-
-    def tearDown(self):
-        super().tearDown()
-        delete_user_preference(self.instructor, 'time_zone', self.instructor.username)
-
-    def _get_expected_schedule(self, schedule, timezone):
-        local_tz = dateutil.tz.gettz(timezone)
-        local_dt = dateutil.parser.parse(schedule).replace(tzinfo=local_tz)
-        return local_dt.astimezone(pytz.utc)
-
-    def test_convert_schedule_to_utc_from_local_no_user_preference(self):
-        """
-        A test that verifies the behavior of the `convert_schedule_to_utc_from_local` function. Verifies that we use
-        the browser provided timezone data if there is no preferred timezone set by the user in their account settings.
-        """
-        schedule = "2099-05-02T14:00:00.000Z"
-        browser_timezone = "America/New_York"
-        expected_schedule = self._get_expected_schedule(schedule, browser_timezone)
-
-        schedule_utc = convert_schedule_to_utc_from_local(schedule, browser_timezone, self.instructor)
-
-        assert schedule_utc == expected_schedule
-
-    def test_convert_schedule_to_utc_from_local_with_preferred_timezone(self):
-        """
-        A test that verifies the behavior of the `convert_schedule_to_utc_from_local` function. Verifies that we use the
-        preferred timezone if a user has set one in their account settings.
-        """
-        schedule = "2099-05-02T14:00:00.000Z"
-        preferred_timezone = "America/Anchorage"
-        set_user_preference(self.instructor, 'time_zone', preferred_timezone)
-        expected_schedule = self._get_expected_schedule(schedule, preferred_timezone)
-
-        schedule_utc = convert_schedule_to_utc_from_local(schedule, "", self.instructor)
-
-        assert schedule_utc == expected_schedule
-
-    def test_convert_schedule_to_utc_from_local_with_preferred_and_browser_timezone(self):
-        """
-        A test that verifies the behavior of the `convert_schedule_to_utc_from_local` function. Verifies that we use
-        the preferred timezone over the browser timezone when provided both values.
-        """
-        schedule = "2099-05-02T14:00:00.000Z"
-        browser_timezone = "America/New_York"
-        preferred_timezone = "America/Anchorage"
-        set_user_preference(self.instructor, 'time_zone', preferred_timezone)
-        expected_schedule = self._get_expected_schedule(schedule, preferred_timezone)
-
-        schedule_utc = convert_schedule_to_utc_from_local(schedule, browser_timezone, self.instructor)
-
-        assert schedule_utc == expected_schedule
-
-    def test_convert_schedule_to_utc_from_local_with_invalid_timezone(self):
-        """
-        A test that verifies the behavior of the `convert_schedule_to_utc_from_local` function. Verifies an error
-        condition if the application cannot determine a timezone to use for conversion.
-        """
-        schedule = "2099-05-02T14:00:00.000Z"
-        expected_error_message = "Unable to determine the time zone to use to convert the schedule to UTC"
-
-        with self.assertRaises(ValueError) as value_err:
-            convert_schedule_to_utc_from_local(schedule, "Flim/Flam", self.instructor)
-
-        assert str(value_err.exception) == expected_error_message
diff --git a/lms/djangoapps/learner_dashboard/PROGRAMS.rst b/lms/djangoapps/learner_dashboard/PROGRAMS.rst
new file mode 100644
index 0000000000..737afc1c7c
--- /dev/null
+++ b/lms/djangoapps/learner_dashboard/PROGRAMS.rst
@@ -0,0 +1,56 @@
+.. _programs:
+
+==================
+Programs Dashboard
+==================
+
+Status: Maintenance
+
+Responsibilities
+================
+
+This Django app hosts dashboard pages used by edX learners. The intent is for
+this Django app to include the following dashboard tabs:
+
+ - Courses
+ - Programs
+
+Direction: Deprecate
+====================
+This is being replaced by new UI that is in active development.  New functionality should not be added here.
+
+Glossary
+========
+
+Courses
+-------
+
+The learner-facing dashboard listing active and archived enrollments. The
+current implementation of the dashboard resides in
+``common/djangoapps/student/``.
+
+Programs
+--------
+
+A page listing programs in which the learner is engaged. The page also shows
+learners' progress towards completing the programs. Programs are structured
+collections of course runs which culminate into a certificate.
+
+
+More Documentation
+==================
+
+Implementation
+^^^^^^^^^^^^^^
+
+The ``views`` module contains the Django views used to serve the Program listing
+page. The corresponding Backbone app is in the
+``edx-platform/static/js/learner_dashboard``.
+
+Configuration
+^^^^^^^^^^^^^
+
+In order to turn on the Programs tab, you need to update the ``Programs API
+Config`` object in the lms Django admin. Make sure you set the values
+``Enabled``, ``Do we want to show program listing page`` and ``Do we want to
+show xseries program advertising`` to be true
diff --git a/lms/djangoapps/learner_dashboard/README.rst b/lms/djangoapps/learner_dashboard/README.rst
index c77f096075..0daa4e0b45 100644
--- a/lms/djangoapps/learner_dashboard/README.rst
+++ b/lms/djangoapps/learner_dashboard/README.rst
@@ -1,50 +1,21 @@
-Status: Maintenance
+=================
+Learner dashboard
+=================
 
-Responsibilities
-================
+This djangoapp houses 2 related dashboards owned and developed, currently by 2 separate teams:
 
-This Django app hosts dashboard pages used by edX learners. The intent is for
-this Django app to include the following dashboard tabs:
+1. Courses Dashboard
+2. Programs Dashboard
 
- - Courses
- - Programs
+Courses Dashboard
+=================
 
-Direction: Deprecate
-====================
-This is being replaced by new UI that is in active development.  New functionality should not be added here.
+The Courses section of the Learner Dashboard is a backend supporting a new MFE experience of the learner dashboard.
 
-Glossary
-========
+This aims to replace the existing dashboard at::
+    /common/djangoapps/student/views/dashboard.py
 
-Courses
--------
-
-The learner-facing dashboard listing active and archived enrollments. The
-current implementation of the dashboard resides in
-``common/djangoapps/student/``.
-
-Programs
---------
-
-A page listing programs in which the learner is engaged. The page also shows
-learners' progress towards completing the programs. Programs are structured
-collections of course runs which culminate into a certificate.
-
-
-More Documentation
+Programs Dashboard
 ==================
 
-Implementation
-^^^^^^^^^^^^^^
-
-The ``views`` module contains the Django views used to serve the Program listing
-page. The corresponding Backbone app is in the
-``edx-platform/static/js/learner_dashboard``.
-
-Configuration
-^^^^^^^^^^^^^
-
-In order to turn on the Programs tab, you need to update the ``Programs API
-Config`` object in the lms Django admin. Make sure you set the values
-``Enabled``, ``Do we want to show program listing page`` and ``Do we want to
-show xseries program advertising`` to be true
+See :ref:`programs`.rst doc.
diff --git a/lms/djangoapps/learner_dashboard/courses_views.py b/lms/djangoapps/learner_dashboard/courses_views.py
new file mode 100644
index 0000000000..6d5837e11e
--- /dev/null
+++ b/lms/djangoapps/learner_dashboard/courses_views.py
@@ -0,0 +1,15 @@
+"""
+Views for the learner dashboard.
+"""
+from django.contrib.auth.decorators import login_required
+from django.views.decorators.http import require_GET
+
+from common.djangoapps.util.json_request import JsonResponse
+
+
+@login_required
+@require_GET
+def course_listing(request):  # pylint: disable=unused-argument
+    """ List of courses a user is enrolled in or entitled to """
+    course_cards = []
+    return JsonResponse(course_cards)
diff --git a/lms/djangoapps/learner_dashboard/views.py b/lms/djangoapps/learner_dashboard/program_views.py
similarity index 100%
rename from lms/djangoapps/learner_dashboard/views.py
rename to lms/djangoapps/learner_dashboard/program_views.py
diff --git a/lms/djangoapps/learner_dashboard/urls.py b/lms/djangoapps/learner_dashboard/urls.py
index cba464b631..963f0050c1 100644
--- a/lms/djangoapps/learner_dashboard/urls.py
+++ b/lms/djangoapps/learner_dashboard/urls.py
@@ -2,14 +2,20 @@
 
 from django.urls import path, re_path
 
-from lms.djangoapps.learner_dashboard import programs, views
+from lms.djangoapps.learner_dashboard import courses_views, programs, program_views
 
+# Learner Dashboard Routing
 urlpatterns = [
-    path('programs/', views.program_listing, name='program_listing_view'),
-    re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/$', views.program_details, name='program_details_view'),
-    re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/discussion/$', views.ProgramDiscussionIframeView.as_view(),
+    path('learner/', courses_views.course_listing, name='course_listing_view')
+]
+
+# Program Dashboard Routing
+urlpatterns += [
+    path('programs/', program_views.program_listing, name='program_listing_view'),
+    re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/$', program_views.program_details, name='program_details_view'),
+    re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/discussion/$', program_views.ProgramDiscussionIframeView.as_view(),
             name='program_discussion'),
-    re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/live/$', views.ProgramLiveIframeView.as_view(),
+    re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/live/$', program_views.ProgramLiveIframeView.as_view(),
             name='program_live'),
     path('programs_fragment/', programs.ProgramsFragmentView.as_view(), name='program_listing_fragment_view'),
     re_path(r'^programs/(?P<program_uuid>[0-9a-f-]+)/details_fragment/$', programs.ProgramDetailsFragmentView.as_view(),
diff --git a/lms/djangoapps/save_for_later/api/v1/tests/test_views.py b/lms/djangoapps/save_for_later/api/v1/tests/test_views.py
index bf93c23dc5..038016cd09 100644
--- a/lms/djangoapps/save_for_later/api/v1/tests/test_views.py
+++ b/lms/djangoapps/save_for_later/api/v1/tests/test_views.py
@@ -39,7 +39,11 @@ class CourseSaveForLaterApiViewTest(ThirdPartyAuthTestMixin, APITestCase):
         self.course_key = CourseKey.from_string(self.course_id)
         CourseOverviewFactory.create(id=self.course_key)
 
-    @patch('lms.djangoapps.save_for_later.helper.BrazeClient', MagicMock())
+    @override_settings(
+        EDX_BRAZE_API_KEY='test-key',
+        EDX_BRAZE_API_SERVER='http://test.url'
+    )
+    @patch('lms.djangoapps.utils.BrazeClient', MagicMock())
     def test_save_course_using_email(self):
         """
         Test successfully email sent
@@ -116,7 +120,11 @@ class ProgramSaveForLaterApiViewTest(ThirdPartyAuthTestMixin, APITestCase):
         self.uuid = '587f6abe-bfa4-4125-9fbe-4789bf3f97f1'
         self.program = ProgramFactory(uuid=self.uuid)
 
-    @patch('lms.djangoapps.save_for_later.helper.BrazeClient', MagicMock())
+    @override_settings(
+        EDX_BRAZE_API_KEY='test-key',
+        EDX_BRAZE_API_SERVER='http://test.url'
+    )
+    @patch('lms.djangoapps.utils.BrazeClient', MagicMock())
     @patch('lms.djangoapps.save_for_later.api.v1.views.get_programs')
     def test_save_program_using_email(self, mock_get_programs):
         """
diff --git a/lms/djangoapps/save_for_later/helper.py b/lms/djangoapps/save_for_later/helper.py
index cb69bb1933..e023f203ee 100644
--- a/lms/djangoapps/save_for_later/helper.py
+++ b/lms/djangoapps/save_for_later/helper.py
@@ -5,12 +5,11 @@ helper functions
 import logging
 from datetime import datetime
 from django.conf import settings
-from braze.client import BrazeClient
 from eventtracking import tracker
 
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
-
 from common.djangoapps.course_modes.models import CourseMode
+from lms.djangoapps.utils import get_braze_client
 
 log = logging.getLogger(__name__)
 
@@ -100,11 +99,10 @@ def send_email(email, data):
     Send email through Braze
     """
     event_properties = _get_event_properties(data)
-    braze_client = BrazeClient(
-        api_key=settings.EDX_BRAZE_API_KEY,
-        api_url=settings.EDX_BRAZE_API_SERVER,
-        app_id='',
-    )
+    braze_client = get_braze_client()
+
+    if not braze_client:
+        return False
 
     try:
         attributes = None
diff --git a/lms/djangoapps/save_for_later/management/commands/tests/test_send_course_reminder_emails.py b/lms/djangoapps/save_for_later/management/commands/tests/test_send_course_reminder_emails.py
index 6bdc8a6637..2c93492ae3 100644
--- a/lms/djangoapps/save_for_later/management/commands/tests/test_send_course_reminder_emails.py
+++ b/lms/djangoapps/save_for_later/management/commands/tests/test_send_course_reminder_emails.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 
 import ddt
 from django.core.management import call_command
+from django.test.utils import override_settings
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 
 from openedx.core.djangolib.testing.utils import skip_unless_lms
@@ -29,8 +30,12 @@ class SavedCourseReminderEmailsTest(SharedModuleStoreTestCase):
         CourseOverviewFactory.create(id=self.saved_course.course_id)
         CourseOverviewFactory.create(id=self.saved_course_1.course_id)
 
+    @override_settings(
+        EDX_BRAZE_API_KEY='test-key',
+        EDX_BRAZE_API_SERVER='http://test.url'
+    )
     def test_send_reminder_emails(self):
-        with patch('lms.djangoapps.save_for_later.helper.BrazeClient') as mock_task:
+        with patch('lms.djangoapps.utils.BrazeClient') as mock_task:
             call_command('send_course_reminder_emails', '--batch-size=1')
             mock_task.assert_called()
 
diff --git a/lms/djangoapps/save_for_later/management/commands/tests/test_send_program_reminder_emails.py b/lms/djangoapps/save_for_later/management/commands/tests/test_send_program_reminder_emails.py
index 2501ccdb9f..b3665a0456 100644
--- a/lms/djangoapps/save_for_later/management/commands/tests/test_send_program_reminder_emails.py
+++ b/lms/djangoapps/save_for_later/management/commands/tests/test_send_program_reminder_emails.py
@@ -5,6 +5,7 @@ from unittest.mock import patch
 
 import ddt
 from django.core.management import call_command
+from django.test.utils import override_settings
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 
 from openedx.core.djangolib.testing.utils import skip_unless_lms
@@ -26,10 +27,14 @@ class SavedProgramReminderEmailsTest(SharedModuleStoreTestCase):
         self.program = ProgramFactory(uuid=self.uuid)
         self.saved_program = SavedPogramFactory.create(program_uuid=self.uuid)
 
+    @override_settings(
+        EDX_BRAZE_API_KEY='test-key',
+        EDX_BRAZE_API_SERVER='http://test.url'
+    )
     @patch('lms.djangoapps.save_for_later.management.commands.send_program_reminder_emails.get_programs')
     def test_send_reminder_emails(self, mock_get_programs):
         mock_get_programs.return_value = self.program
-        with patch('lms.djangoapps.save_for_later.helper.BrazeClient') as mock_task:
+        with patch('lms.djangoapps.utils.BrazeClient') as mock_task:
             call_command('send_program_reminder_emails', '--batch-size=1')
             mock_task.assert_called()
 
diff --git a/lms/djangoapps/support/docs/decisions/0001-sso-history-in-support.rst b/lms/djangoapps/support/docs/decisions/0001-sso-history-in-support.rst
new file mode 100644
index 0000000000..332f68af07
--- /dev/null
+++ b/lms/djangoapps/support/docs/decisions/0001-sso-history-in-support.rst
@@ -0,0 +1,48 @@
+1. Registering SSO History Model in Support
+================================================
+
+Status
+------
+
+Accepted
+
+Context
+-------
+
+SSO History was one of the feature requested by support that provides the 
+historical data of any particular SSO record (based on UserSocialAuth)
+in tools UI via support API. This SSO History can be utilized to track id changes,
+Additional data or any other relevant data changes inside SSO model.
+
+Although the UserSocialAuth is applied within common apps but is not configured for
+cms. This has caused major breakage and a temporary outage in the authentication flow
+in cms stage. 
+
+Decision
+--------
+
+The simple_django_history registration for UserSocialAuth model 
+is introduced in the Support app for LMS instead of the 
+third_party_auth in Common. 
+
+Consequences
+------------
+
+The most optimum method to introduce the feature was to register the model
+in support app and get the data via support API.
+
+Alternative/Rejected Approaches
+------------
+
+Addition for third_party_auth was attempted for the studio,
+but failed in the stage. The primary reason was the failing migration 
+tests in CMS with the current configurations in the studio. 
+We tried to add the third_party_auth as an installed app on Studio 
+but later found out that Studio is not configured for third_party_auth
+and configuring third_party_auth on studio would have caused auth issues. 
+Consequently, there was over 6 hours of pipeline outage on stage 
+and we had to revert the changes made in the system.
+
+Third party auth is primarily LMS-only app but since it has been in common, 
+we opted to go ahead with adding history in common, 
+only to later realize the impact of enabling third party auth in studio.
diff --git a/lms/djangoapps/support/migrations/0001_initial.py b/lms/djangoapps/support/migrations/0001_initial.py
new file mode 100644
index 0000000000..302155a6a3
--- /dev/null
+++ b/lms/djangoapps/support/migrations/0001_initial.py
@@ -0,0 +1,42 @@
+# Generated by Django 3.2.13 on 2022-05-17 08:26
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import simple_history.models
+import social_django.fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HistoricalUserSocialAuth',
+            fields=[
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('provider', models.CharField(max_length=32)),
+                ('uid', models.CharField(db_index=True, max_length=255)),
+                ('extra_data', social_django.fields.JSONField(default=dict)),
+                ('created', models.DateTimeField(blank=True, editable=False)),
+                ('modified', models.DateTimeField(blank=True, editable=False)),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField()),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical user social auth',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': 'history_date',
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]
diff --git a/common/lib/sandbox-packages/verifiers/__init__.py b/lms/djangoapps/support/migrations/__init__.py
similarity index 100%
rename from common/lib/sandbox-packages/verifiers/__init__.py
rename to lms/djangoapps/support/migrations/__init__.py
diff --git a/lms/djangoapps/support/models.py b/lms/djangoapps/support/models.py
new file mode 100644
index 0000000000..3f2693f918
--- /dev/null
+++ b/lms/djangoapps/support/models.py
@@ -0,0 +1,9 @@
+"""
+Models used to implement support related models in such as SSO History model
+"""
+
+from simple_history import register
+from social_django.models import UserSocialAuth
+
+# Registers UserSocialAuth with simple-django-history.
+register(UserSocialAuth, app=__package__)
diff --git a/lms/djangoapps/support/serializers.py b/lms/djangoapps/support/serializers.py
index 0d4daa83e9..f1a28640ca 100644
--- a/lms/djangoapps/support/serializers.py
+++ b/lms/djangoapps/support/serializers.py
@@ -84,17 +84,35 @@ def serialize_user_info(user, user_social_auths=None):
     return user_info
 
 
-def serialize_sso_records(user_social_auths):
+def serialize_sso_records(user_social_auth, user_social_auths_history):
     """
     Serialize user social auth model object
     """
-    sso_records = []
-    for user_social_auth in user_social_auths:
-        sso_records.append({
-            'provider': user_social_auth.provider,
-            'uid': user_social_auth.uid,
-            'created': user_social_auth.created,
-            'modified': user_social_auth.modified,
-            'extraData': json.dumps(user_social_auth.extra_data),
-        })
+    sso_records = {
+        'provider': user_social_auth.provider,
+        'uid': user_social_auth.uid,
+        'created': user_social_auth.created,
+        'modified': user_social_auth.modified,
+        'history': serialize_sso_history(
+            user_social_auths_history
+        ),
+        'extraData': json.dumps(user_social_auth.extra_data),
+    }
     return sso_records
+
+
+def serialize_sso_history(user_social_auths_history):
+    """
+    Serialize history for user social auth model object
+    """
+    history = []
+    for sso_history in user_social_auths_history:
+        history.append({
+            'uid': sso_history.uid,
+            'provider': sso_history.provider,
+            'created': sso_history.created,
+            'modified': sso_history.modified,
+            'extraData': json.dumps(sso_history.extra_data),
+            'history_date': sso_history.history_date
+        })
+    return history
diff --git a/lms/djangoapps/support/static/support/js/models/certificate.js b/lms/djangoapps/support/static/support/js/models/certificate.js
index da7322ff0a..b9dc6a68e1 100644
--- a/lms/djangoapps/support/static/support/js/models/certificate.js
+++ b/lms/djangoapps/support/static/support/js/models/certificate.js
@@ -7,7 +7,6 @@
                 course_key: null,
                 type: null,
                 status: null,
-                download_url: null,
                 grade: null,
                 created: null,
                 modified: null
diff --git a/lms/djangoapps/support/static/support/js/spec/views/certificates_spec.js b/lms/djangoapps/support/static/support/js/spec/views/certificates_spec.js
index e41a8212a8..a1630f039e 100644
--- a/lms/djangoapps/support/static/support/js/spec/views/certificates_spec.js
+++ b/lms/djangoapps/support/static/support/js/spec/views/certificates_spec.js
@@ -16,7 +16,6 @@ define([
                     grade: '0.0',
                     type: 'honor',
                     course_key: 'course-v1:edX+DemoX+Demo_Course',
-                    download_url: null,
                     modified: '2015-08-06T19:47:07+00:00',
                     regenerate: true
                 },
@@ -27,7 +26,6 @@ define([
                     grade: '1.0',
                     type: 'verified',
                     course_key: 'edx/test/2015',
-                    download_url: 'http://www.example.com/certificate.pdf',
                     modified: '2015-08-06T19:47:05+00:00',
                     regenerate: true
                 }
@@ -41,7 +39,6 @@ define([
                     grade: '',
                     type: '',
                     course_key: 'edx/test1/2016',
-                    download_url: null,
                     modified: '',
                     regenerate: false
                 }
@@ -117,17 +114,15 @@ define([
             expect(results[0][0]).toEqual(REGENERATE_SEARCH_RESULTS[0].course_key);
             expect(results[0][1]).toEqual(REGENERATE_SEARCH_RESULTS[0].type);
             expect(results[0][2]).toEqual(REGENERATE_SEARCH_RESULTS[0].status);
-            expect(results[0][3]).toContain('Not available');
-            expect(results[0][4]).toEqual(REGENERATE_SEARCH_RESULTS[0].grade);
-            expect(results[0][5]).toEqual(REGENERATE_SEARCH_RESULTS[0].modified);
+            expect(results[0][3]).toEqual(REGENERATE_SEARCH_RESULTS[0].grade);
+            expect(results[0][4]).toEqual(REGENERATE_SEARCH_RESULTS[0].modified);
 
             // Check the second row of results
             expect(results[1][0]).toEqual(REGENERATE_SEARCH_RESULTS[1].course_key);
             expect(results[1][1]).toEqual(REGENERATE_SEARCH_RESULTS[1].type);
             expect(results[1][2]).toEqual(REGENERATE_SEARCH_RESULTS[1].status);
-            expect(results[1][3]).toContain(REGENERATE_SEARCH_RESULTS[1].download_url);
-            expect(results[1][4]).toEqual(REGENERATE_SEARCH_RESULTS[1].grade);
-            expect(results[1][5]).toEqual(REGENERATE_SEARCH_RESULTS[1].modified);
+            expect(results[1][3]).toEqual(REGENERATE_SEARCH_RESULTS[1].grade);
+            expect(results[1][4]).toEqual(REGENERATE_SEARCH_RESULTS[1].modified);
 
 
             searchFor('student@example.com', 'edx/test1/2016', requests, GENERATE_SEARCH_RESULTS);
@@ -138,9 +133,8 @@ define([
             expect(results[0][0]).toEqual(GENERATE_SEARCH_RESULTS[0].course_key);
             expect(results[0][1]).toEqual(GENERATE_SEARCH_RESULTS[0].type);
             expect(results[0][2]).toEqual(GENERATE_SEARCH_RESULTS[0].status);
-            expect(results[0][3]).toContain('Not available');
-            expect(results[0][4]).toEqual(GENERATE_SEARCH_RESULTS[0].grade);
-            expect(results[0][5]).toEqual(GENERATE_SEARCH_RESULTS[0].modified);
+            expect(results[0][3]).toEqual(GENERATE_SEARCH_RESULTS[0].grade);
+            expect(results[0][4]).toEqual(GENERATE_SEARCH_RESULTS[0].modified);
         });
 
         it('searches for certificates and displays a message when there are no results', function() {
diff --git a/lms/djangoapps/support/static/support/templates/certificates_results.underscore b/lms/djangoapps/support/static/support/templates/certificates_results.underscore
index 9ccd937239..7f1b0b9c8b 100644
--- a/lms/djangoapps/support/static/support/templates/certificates_results.underscore
+++ b/lms/djangoapps/support/static/support/templates/certificates_results.underscore
@@ -6,7 +6,6 @@
         <th><%- gettext("Course Key") %></th>
         <th><%- gettext("Type") %></th>
         <th><%- gettext("Status") %></th>
-        <th><%- gettext("Download URL") %></th>
         <th><%- gettext("Grade") %></th>
         <th><%- gettext("Last Updated") %></th>
         <th></th>
@@ -18,14 +17,6 @@
         <td><%- cert.get("course_key") %></td>
         <td><%- cert.get("type") %></td>
         <td><%- cert.get("status") %></td>
-        <td>
-            <% if (cert.get("download_url")) { %>
-                <a href="<%- cert.get("download_url") %>">Download</a>
-                <span class="sr"><%- gettext("Download the user's certificate") %></span>
-            <% } else { %>
-                <%- gettext("Not available") %>
-            <% } %>
-        </td>
         <td><%- cert.get("grade") %></td>
         <td><%- cert.get("modified") %></td>
         <td>
diff --git a/lms/djangoapps/support/tests/test_views.py b/lms/djangoapps/support/tests/test_views.py
index a6b8e43947..3aa56a0a76 100644
--- a/lms/djangoapps/support/tests/test_views.py
+++ b/lms/djangoapps/support/tests/test_views.py
@@ -1542,6 +1542,24 @@ class SsoRecordsTests(SupportViewTestCase):  # lint-amnesty, pylint: disable=mis
         assert len(data) == 1
         self.assertContains(response, '"uid": "test@example.com"')
 
+    def test_history_response(self):
+        '''Tests changes in SSO history for a user'''
+        user_social_auth = UserSocialAuth.objects.create(  # lint-amnesty, pylint: disable=unused-variable
+            user=self.student,
+            uid=self.student.email,
+            provider='tpa-saml'
+        )
+        sso = UserSocialAuth.objects.get(user=self.student)
+        sso.uid = self.student.email + ':' + sso.provider
+        sso.save()
+        response = self.client.get(self.url)
+        data = json.loads(response.content.decode('utf-8'))
+        assert response.status_code == 200
+        assert len(data) == 1
+        assert len(data[0].get('history')) == 2
+        assert data[0].get('history')[0].get('uid') == "test@example.com:tpa-saml"
+        assert data[0].get('history')[1].get('uid') == "test@example.com"
+
 
 class FeatureBasedEnrollmentSupportApiViewTests(SupportViewTestCase):
     """
diff --git a/lms/djangoapps/support/views/sso_records.py b/lms/djangoapps/support/views/sso_records.py
index 372a4f4c53..b7d620a376 100644
--- a/lms/djangoapps/support/views/sso_records.py
+++ b/lms/djangoapps/support/views/sso_records.py
@@ -19,6 +19,7 @@ class SsoView(GenericAPIView):
     """
     Returns a list of SSO records for a given user.
     Sample response:
+    Sample response:
     [
         {
             "provider": "tpa-saml",
@@ -26,6 +27,25 @@ class SsoView(GenericAPIView):
             "created": "2022-03-02T04:41:33.145Z",
             "modified": "2022-03-15T11:28:17.809Z",
             "extraData": "{}",
+            "history":
+            [
+                {
+                    "uid": "new-channel:testuser",
+                    "provider": "tpa-saml",
+                    "created": "2022-03-02T04:41:33.145Z",
+                    "modified": "2022-03-15T11:28:17.809Z",
+                    "extraData": "{}",
+                    "history_date": "2022-03-15T11:28:17.832Z"
+                },
+                {
+                    "uid": "default-channel:testuser",
+                    "provider": "tpa-saml",
+                    "created": "2022-03-02T04:41:33.145Z",
+                    "modified": "2022-03-10T12:28:32.720Z",
+                    "extraData": "{}",
+                    "history_date": "2022-03-15T11:12:02.420Z"
+                }
+            ]
         }
     ]
     """
@@ -36,5 +56,8 @@ class SsoView(GenericAPIView):
         except User.DoesNotExist:
             return JsonResponse([])
         user_social_auths = UserSocialAuth.objects.filter(user=user)
-        sso_records = serialize_sso_records(user_social_auths)
+        sso_records = []
+        for user_social_auth in user_social_auths:
+            user_social_auths_history = UserSocialAuth.history.filter(id=user_social_auth.id)
+            sso_records.append(serialize_sso_records(user_social_auth, user_social_auths_history))
         return JsonResponse(sso_records)
diff --git a/lms/djangoapps/utils.py b/lms/djangoapps/utils.py
index e034b6ed51..182c382ca2 100644
--- a/lms/djangoapps/utils.py
+++ b/lms/djangoapps/utils.py
@@ -2,6 +2,9 @@
 Helper Methods
 """
 
+from braze.client import BrazeClient
+from django.conf import settings
+
 
 def _get_key(key_or_id, key_cls):
     """
@@ -13,3 +16,18 @@ def _get_key(key_or_id, key_cls):
         if isinstance(key_or_id, str)
         else key_or_id
     )
+
+
+def get_braze_client():
+    """ Returns a Braze client. """
+    braze_api_key = settings.EDX_BRAZE_API_KEY
+    braze_api_url = settings.EDX_BRAZE_API_SERVER
+
+    if not braze_api_key or not braze_api_url:
+        return None
+
+    return BrazeClient(
+        api_key=braze_api_key,
+        api_url=braze_api_url,
+        app_id='',
+    )
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 7b4716cfb7..d5771dda21 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -505,8 +505,7 @@ FEATURES = {
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: True
     # .. toggle_description: When enabled, along with the ENABLE_MKTG_SITE feature toggle, users who attempt to access a
-    #   course "about" page will be redirected to the course home url. This url might be the course "info" page or the
-    #   unified course tab (when the DISABLE_UNIFIED_COURSE_TAB_FLAG waffle is not enabled).
+    #   course "about" page will be redirected to the course home url.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2019-01-15
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/19604
@@ -1091,16 +1090,6 @@ NODE_MODULES_ROOT = REPO_ROOT / "node_modules"
 
 DATA_DIR = COURSES_ROOT
 
-# For Node.js
-
-system_node_path = os.environ.get("NODE_PATH", NODE_MODULES_ROOT)
-
-node_paths = [
-    COMMON_ROOT / "static/js/vendor",
-    system_node_path,
-]
-NODE_PATH = ':'.join(node_paths)
-
 # For geolocation ip database
 GEOIP_PATH = REPO_ROOT / "common/static/data/geoip/GeoLite2-Country.mmdb"
 # Where to look for a status message
@@ -3152,9 +3141,6 @@ INSTALLED_APPS = [
     # Catalog integration
     'openedx.core.djangoapps.catalog',
 
-    # Self-paced course configuration
-    'openedx.core.djangoapps.self_paced',
-
     'sorl.thumbnail',
 
     # edx-milestones service
@@ -4925,15 +4911,10 @@ HIBP_LOGIN_BLOCK_PASSWORD_FREQUENCY_THRESHOLD = 5
 ENABLE_DYNAMIC_REGISTRATION_FIELDS = False
 
 ############### Settings for the ace_common plugin #################
-ACE_ENABLED_CHANNELS = ['django_email']
-ACE_ENABLED_POLICIES = ['bulk_email_optout']
-ACE_CHANNEL_SAILTHRU_DEBUG = True
-ACE_CHANNEL_SAILTHRU_TEMPLATE_NAME = None
-ACE_ROUTING_KEY = 'edx.lms.core.default'
-ACE_CHANNEL_DEFAULT_EMAIL = 'django_email'
-ACE_CHANNEL_TRANSACTIONAL_EMAIL = 'django_email'
-ACE_CHANNEL_SAILTHRU_API_KEY = ""
-ACE_CHANNEL_SAILTHRU_API_SECRET = ""
+# Note that all settings are actually defined by the plugin
+# pylint: disable=wrong-import-position
+from openedx.core.djangoapps.ace_common.settings import common as ace_common_settings
+ACE_ROUTING_KEY = ace_common_settings.ACE_ROUTING_KEY
 
 ############### Settings swift #####################################
 SWIFT_USERNAME = None
diff --git a/lms/envs/production.py b/lms/envs/production.py
index d989b1a48a..680c261a04 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -109,8 +109,8 @@ EDX_PLATFORM_REVISION = REVISION_CONFIG.get('EDX_PLATFORM_REVISION', EDX_PLATFOR
 BROKER_POOL_LIMIT = 0
 BROKER_CONNECTION_TIMEOUT = 1
 
-# For the Result Store, use the django cache named 'celery'
-CELERY_RESULT_BACKEND = 'django-cache'
+# Allow env to configure celery result backend with default set to django-cache
+CELERY_RESULT_BACKEND = ENV_TOKENS.get('CELERY_RESULT_BACKEND', 'django-cache')
 
 # When the broker is behind an ELB, use a heartbeat to refresh the
 # connection and to detect if it has been dropped.
diff --git a/lms/static/js/groups/views/cohort_editor.js b/lms/static/js/groups/views/cohort_editor.js
index feb4513281..9da4a0c92a 100644
--- a/lms/static/js/groups/views/cohort_editor.js
+++ b/lms/static/js/groups/views/cohort_editor.js
@@ -260,16 +260,17 @@
 
                     // Show error messages.
                     this.undelegateViewEvents(this.errorNotifications);
-                    numErrors = modifiedUsers.unknown.length + modifiedUsers.invalid.length;
+                    numErrors = modifiedUsers.unknown.length + modifiedUsers.invalid.length + modifiedUsers.not_allowed.length;
                     if (numErrors > 0) {
-                        createErrorDetails = function(unknownUsers, invalidEmails, showAllErrors) {
+                        createErrorDetails = function(unknownUsers, invalidEmails, notAllowed, showAllErrors) {
                             var unknownErrorsShown = showAllErrors ? unknownUsers.length :
                                 Math.min(errorLimit, unknownUsers.length);
                             var invalidErrorsShown = showAllErrors ? invalidEmails.length :
                                 Math.min(errorLimit - unknownUsers.length, invalidEmails.length);
+                            var notAllowedErrorsShown = showAllErrors ? notAllowed.length :
+                                Math.min(errorLimit - notAllowed.length, notAllowed.length);
                             details = [];
 
-
                             for (i = 0; i < unknownErrorsShown; i++) {
                                 details.push(interpolate_text(gettext('Unknown username: {user}'),
                                     {user: unknownUsers[i]}));
@@ -278,6 +279,10 @@
                                 details.push(interpolate_text(gettext('Invalid email address: {email}'),
                                     {email: invalidEmails[i]}));
                             }
+                            for (i = 0; i < notAllowedErrorsShown; i++) {
+                                details.push(interpolate_text(gettext('Cohort assignment not allowed: {email_or_username}'),
+                                    {email_or_username: notAllowed[i]}));
+                            }
                             return details;
                         };
 
@@ -286,12 +291,12 @@
                                 '{numErrors} learners could not be added to this cohort:', numErrors),
                             {numErrors: numErrors}
                         );
-                        details = createErrorDetails(modifiedUsers.unknown, modifiedUsers.invalid, false);
+                        details = createErrorDetails(modifiedUsers.unknown, modifiedUsers.invalid, modifiedUsers.not_allowed, false);
 
                         errorActionCallback = function(view) {
                             view.model.set('actionText', null);
                             view.model.set('details',
-                                createErrorDetails(modifiedUsers.unknown, modifiedUsers.invalid, true));
+                                createErrorDetails(modifiedUsers.unknown, modifiedUsers.invalid, modifiedUsers.not_allowed, true));
                             view.render();
                         };
 
diff --git a/lms/static/js/i18n/ar/djangojs.js b/lms/static/js/i18n/ar/djangojs.js
index 4c5b0cc8a8..89faf805af 100644
--- a/lms/static/js/i18n/ar/djangojs.js
+++ b/lms/static/js/i18n/ar/djangojs.js
@@ -168,7 +168,6 @@
     "(Caption will be displayed when you start playing the video.)": "(\u0633\u062a\u064f\u0639\u0631\u0636 \u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0641\u0631\u0639\u064a\u0651\u0629 \u0645\u0639 \u0628\u062f\u0621 \u0639\u0631\u0636 \u0645\u0642\u0637\u0639 \u0627\u0644\u0641\u064a\u062f\u064a\u0648.)",
     "(Community TA)": "(\u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u0633\u0627\u0639\u062f\u064a \u0627\u0644\u0645\u0639\u0644\u0645\u064a\u0646)",
     "(Optional)": "(\u0627\u062e\u062a\u064a\u0627\u0631\u064a)",
-    "(Read-only)": "(\u0644\u0644\u0642\u0631\u0627\u0621\u0629 \u0641\u0642\u0637)",
     "(Required Field)": "(\u062d\u0642\u0644 \u0645\u0637\u0644\u0648\u0628)",
     "(Self-paced) Ended {end}": "(\u062a\u062f\u0631\u064a\u0628 \u0630\u0627\u062a\u064a) \u0627\u0646\u062a\u0647\u0649 {end}",
     "(Self-paced) Ends {end}": "(\u062a\u062f\u0631\u064a\u0628 \u0630\u0627\u062a\u064a) \u064a\u0646\u062a\u0647\u064a \u0628\u062a\u0627\u0631\u064a\u062e {end}",
@@ -322,7 +321,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "\u062d\u062f\u062b \u062e\u0637\u0623. \u0627\u0646\u062a\u0638\u0631 \u0628\u0636\u0639 \u062f\u0642\u0627\u0626\u0642 \u060c \u062b\u0645 \u062d\u0627\u0648\u0644 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "\u0646\u0623\u0633\u0641 \u0644\u062d\u062f\u0648\u062b \u062e\u0637\u0623 \u0641\u064a \u0627\u0633\u062a\u0631\u062f\u0627\u062f \u0631\u0633\u0627\u0644\u0629 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a. \u064a\u064f\u0631\u062c\u0649 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629 \u0644\u0627\u062d\u0642\u064b\u0627\u060c \u0648\u0627\u0644\u0627\u062a\u0651\u0635\u0627\u0644 \u0628\u0641\u0631\u064a\u0642 \u0627\u0644\u062f\u0639\u0645 \u0627\u0644\u0641\u0646\u0651\u064a \u0641\u064a \u062d\u0627\u0644 \u0627\u0633\u062a\u0645\u0631\u0651\u062a \u0627\u0644\u0645\u0634\u0643\u0644\u0629.",
     "An error occurred when signing you in to %s.": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0645\u062d\u0627\u0648\u0644\u0629 \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0625\u0644\u0649 %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0645\u062d\u0627\u0648\u0644\u0629 \u0627\u0633\u062a\u0631\u062f\u0627\u062f \u0623\u0648 \u062d\u0641\u0638 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0623\u062f\u0646\u0627\u0647\u060c \u064a\u0631\u062c\u0649 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629 \u0645\u0631\u0629 \u0623\u062e\u0631\u0649 \u0644\u0627\u062d\u0642\u064b\u0627.",
     "An error occurred while looking up team membership. Try refreshing the page.": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0627\u0644\u0628\u062d\u062b \u0639\u0646 \u0639\u0636\u0648\u064a\u0629 \u0627\u0644\u0641\u0631\u064a\u0642. \u062d\u0627\u0648\u0644 \u062a\u062d\u062f\u064a\u062b \u0627\u0644\u0635\u0641\u062d\u0629.",
     "An error occurred while removing the member from the team. Try again.": "\u0646\u0623\u0633\u0641 \u0644\u062d\u062f\u0648\u062b \u062e\u0637\u0623 \u0623\u062b\u0646\u0627\u0621 \u0625\u0633\u062a\u0628\u0639\u0627\u062f \u0639\u0636\u0648 \u0645\u0646 \u0627\u0644\u0641\u0631\u064a\u0642. \u064a\u064f\u0631\u062c\u0649 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u062d\u0627\u0648\u0644\u0629.",
     "An error occurred.": "\u0646\u0623\u0633\u0641 \u0644\u062d\u062f\u0648\u062b \u062e\u0637\u0623. ",
@@ -409,7 +407,6 @@
     "Bottom": "\u0627\u0644\u0623\u0633\u0641\u0644",
     "Browse": "\u062a\u0635\u0641\u0651\u062d",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "\u062a\u0635\u0641\u062d \u0627\u0644\u0641\u0635\u0648\u0644 \u062d\u062f\u064a\u062b\u0629 \u0627\u0644\u0625\u0646\u0634\u0627\u0621 \u0648\u0634\u0627\u0647\u062f \u0627\u0644\u062c\u062f\u064a\u062f \u0641\u064a \u0645\u0648\u0627\u0636\u064a\u0639\u0643 \u0627\u0644\u0645\u0641\u0636\u0644\u0629.",
-    "Browsing": "\u0627\u0644\u062a\u0635\u0641\u062d",
     "Bulk Exceptions": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u0646 \u0627\u0644\u0627\u0633\u062a\u062b\u0646\u0627\u0621\u0627\u062a",
     "Bullet list": "\u0642\u0627\u0626\u0645\u0629 \u062a\u0639\u062f\u0627\u062f \u0646\u0642\u0637\u064a",
     "Bulleted List (Ctrl+U)": "\u0642\u0627\u0626\u0645\u0629 \u0645\u0646\u0642\u0651\u0637\u0629 (Ctrl+U)",
@@ -594,9 +591,7 @@
     "Course Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u0627\u0642",
     "Course Number": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0627\u0642 ",
     "Course Number Override": "\u062a\u062c\u0627\u0648\u0632 \u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0627\u0642",
-    "Course Number:": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0627\u0642:",
     "Course Outline": "\u0645\u062e\u0637\u0651\u0637 \u0627\u0644\u0645\u0633\u0627\u0642",
-    "Course Run:": "\u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0645\u0633\u0627\u0642:",
     "Course Start": "\u062a\u0627\u0631\u064a\u062e \u0627\u0628\u062a\u062f\u0627\u0621 \u0627\u0644\u0645\u0633\u0627\u0642",
     "Course Title": "\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0645\u0633\u0627\u0642",
     "Course Title Override": "\u062a\u062c\u0627\u0648\u0632 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0645\u0633\u0627\u0642",
@@ -608,7 +603,6 @@
     "Create": "\u0625\u0646\u0634\u0627\u0621 ",
     "Create Account": "\u0625\u0646\u0634\u0627\u0621 \u062d\u0633\u0627\u0628 ",
     "Create Re-run": "\u062e\u0644\u0642 \u0648\u062d\u062f\u0629 \u0645\u064f\u0639\u0627\u062f \u062a\u0646\u0641\u064a\u0630\u0647\u0627",
-    "Create Support Ticket": "\u0625\u0646\u0634\u0627\u0621 \u062a\u0630\u0643\u0631\u0629 \u062f\u0639\u0645",
     "Create a New Team": "\u0625\u0646\u0634\u0627\u0621 \u0641\u0631\u064a\u0642 \u062c\u062f\u064a\u062f",
     "Create a content group": "\u0625\u0646\u0634\u0627\u0621 \u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u062d\u062a\u0648\u0649",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "\u0623\u0646\u0634\u0626 \u0641\u0631\u064a\u0642\u064b\u0627 \u062c\u062f\u064a\u062f\u064b\u0627 \u0641\u064a \u062d\u0627\u0644 \u0644\u0645 \u062a\u062c\u062f \u0641\u0631\u064a\u0642\u064b\u0627 \u0645\u0648\u062c\u0648\u062f\u064b\u0627 \u0644\u0644\u0627\u0646\u0636\u0645\u0627\u0645 \u0625\u0644\u064a\u0647 \u0623\u0648 \u0643\u0646\u062a \u062a\u0631\u063a\u0628 \u0628\u0627\u0644\u062a\u0639\u0644\u0651\u0645 \u0628\u0631\u0641\u0642\u0629 \u0623\u0635\u062f\u0642\u0627\u0621 \u062a\u0639\u0631\u0641\u0647\u0645.",
@@ -676,7 +670,6 @@
     "Describe ": "\u0635\u0641",
     "Description": "\u0627\u0644\u0648\u0635\u0641",
     "Description of the certificate": "\u0648\u0635\u0641 \u0627\u0644\u0634\u0647\u0627\u062f\u0629",
-    "Details": "\u0627\u0644\u062a\u0641\u0627\u0635\u064a\u0644",
     "Device with Camera": "\u062c\u0647\u0627\u0632 \u0645\u0632\u0648\u062f \u0628\u0643\u0627\u0645\u064a\u0631\u0627",
     "Dimensions": "\u0627\u0644\u0623\u0628\u0639\u0627\u062f",
     "Disc": "\u0627\u0644\u0642\u0631\u0635",
@@ -886,7 +879,6 @@
     "Find next": "\u0625\u064a\u062c\u0627\u062f \u0627\u0644\u062a\u0627\u0644\u064a",
     "Find previous": "\u0625\u064a\u062c\u0627\u062f \u0627\u0644\u0633\u0627\u0628\u0642",
     "Finish": "\u0625\u0646\u0647\u0627\u0621",
-    "Finish later": "\u0627\u0644\u0625\u0646\u0647\u0627\u0621 \u0644\u0627\u062d\u0642\u064b\u0627",
     "First time here?": "\u0644\u0623\u0648\u0644 \u0645\u0631\u0629 \u0647\u0646\u0627\u061f",
     "Follow": "\u0645\u062a\u0627\u0628\u0639\u0629",
     "Follow or unfollow posts": "\u062a\u0627\u0628\u0639 \u0623\u0648 \u0623\u0644\u063a\u064a \u0645\u062a\u0627\u0628\u0639\u0629 \u0645\u0646\u0634\u0648\u0631\u0627\u062a",
@@ -940,7 +932,6 @@
     "H Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
     "HTML preview of post": "\u0627\u0633\u062a\u0639\u0631\u0627\u0636 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 \u0641\u064a HTML",
     "HTML source code": "\u0631\u0645\u0632 \u0645\u0635\u062f\u0631 HTML",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "\u0647\u0644 \u0633\u0628\u0642 \u0623\u0646 \u0642\u0645\u062a \u0628\u0627\u0644\u062e\u062f\u0645\u0629 \u0627\u0644\u0639\u0633\u0643\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0642\u0648\u0627\u062a \u0627\u0644\u0645\u0633\u0644\u062d\u0629 \u0623\u0648 \u0627\u0644\u062c\u064a\u0634 \u0627\u0644\u0648\u0637\u0646\u064a \u0623\u0648 \u0627\u0644\u0642\u0648\u0629 \u0627\u0644\u0627\u062d\u062a\u064a\u0627\u0637\u064a\u0629\u061f",
     "Header": "\u062a\u0631\u0648\u064a\u0633\u0629",
     "Header 1": "\u0627\u0644\u062a\u0631\u0648\u064a\u0633\u0629 1",
     "Header 2": "\u0627\u0644\u062a\u0631\u0648\u064a\u0633\u0629 2",
@@ -1144,7 +1135,6 @@
     "Loading more threads": "\u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u0645\u0648\u0627\u0636\u064a\u0639",
     "Loading posts list": "\u062a\u062d\u0645\u064a\u0644 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0627\u062a",
     "Loading your courses": "\u062c\u0627\u0631\u064a \u062a\u062d\u0645\u064a\u0644 \u0645\u0633\u0627\u0642\u0627\u062a\u0643",
-    "Loading...": "\u062c\u0627\u0631\u064a \u0627\u0644\u062a\u062d\u0645\u064a\u0644...",
     "Location": "\u0627\u0644\u0645\u0648\u0642\u0639",
     "Location in Course": "\u0627\u0644\u0645\u0648\u0642\u0639 \u0641\u064a \u0627\u0644\u0645\u0633\u0627\u0642",
     "Lock this asset": "\u0642\u0641\u0644 \u0647\u0630\u0647 \u0627\u0644\u0645\u0627\u062f\u0629 \u0627\u0644\u0645\u0644\u062d\u0642\u0629",
@@ -1205,7 +1195,6 @@
     "Name of the signatory": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0648\u0642\u0651\u0650\u0639",
     "Name or short description of the configuration": "\u0627\u0633\u0645 \u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0623\u0648 \u0648\u0635\u0641 \u0645\u0648\u062c\u064e\u0632 \u0639\u0646\u0647\u0627",
     "Navigate up": "\u0627\u0646\u062a\u0642\u0644 \u0644\u0623\u0639\u0644\u0649",
-    "Need help logging in?": "\u0647\u0644 \u062a\u062d\u062a\u0627\u062c \u0645\u0633\u0627\u0639\u062f\u0629 \u0641\u064a \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644\u061f",
     "Need help signing in?": "\u0647\u0644 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629 \u0641\u064a \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644\u061f",
     "Need other help signing in?": "\u0647\u0644 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629 \u0623\u062e\u0631\u0649 \u0641\u064a \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644\u061f",
     "Needs verified certificate ": "\u0628\u062d\u0627\u062c\u0629 \u0625\u0644\u0649 \u0634\u0647\u0627\u062f\u0629 \u0645\u0648\u062b\u0642\u0629",
@@ -1316,7 +1305,6 @@
     "Organization ": "\u0627\u0644\u0645\u0624\u0633\u0633\u0629",
     "Organization Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0624\u0633\u0633\u0629",
     "Organization of the signatory": "\u0645\u0624\u0633\u0651\u0633\u0629 \u0627\u0644\u0645\u0648\u0642\u0651\u0650\u0639",
-    "Organization:": "\u0627\u0644\u0645\u0624\u0633\u0651\u0633\u0629:",
     "Other": "\u0622\u062e\u0631",
     "Other sign-in issues": "\u0645\u0634\u0627\u0643\u0644 \u0623\u062e\u0631\u0649 \u0645\u0631\u062a\u0628\u0637\u0629 \u0628\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644",
     "Overall Score": "\u0627\u0644\u0646\u062a\u064a\u062c\u0629 \u0627\u0644\u0643\u0644\u064a\u0629",
@@ -1455,7 +1443,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "\u0627\u0644\u0623\u0633\u0626\u0644\u0629 \u0627\u0644\u062a\u064a \u062a\u062b\u064a\u0631 \u0642\u0636\u0627\u064a\u0627 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0625\u062c\u0627\u0628\u0627\u062a. \u0645\u0646\u0627\u0642\u0634\u0627\u062a \u062a\u0628\u0627\u062f\u0644 \u0627\u0644\u0623\u0641\u0643\u0627\u0631 \u0648\u0628\u062f\u0621 \u0627\u0644\u0645\u062d\u0627\u062f\u062b\u0627\u062a. (\u0645\u0637\u0644\u0648\u0628)",
     "Queued": "\u062a\u062d\u0645\u064a\u0644 \u0642\u064a\u062f \u0627\u0644\u0627\u0646\u062a\u0638\u0627\u0631",
     "REMAINING COURSES": "\u0645\u0633\u0627\u0642\u0627\u062a \u0645\u062a\u0628\u0642\u064a\u0629",
-    "Re-run Course": "\u0645\u0633\u0627\u0642 \u0645\u0634\u063a\u0651\u064e\u0644 \u0645\u0631\u0651\u0629 \u0623\u062e\u0631\u0649",
     "Read More": "\u0644\u0642\u0631\u0627\u0621\u0629 \u0627\u0644\u0645\u0632\u064a\u062f",
     "Read more": "\u0627\u0642\u0631\u0623 \u0627\u0644\u0645\u0632\u064a\u062f",
     "Ready To Start": "\u062c\u0627\u0647\u0632 \u0644\u0644\u0628\u062f\u0621",
@@ -1529,7 +1516,6 @@
     "Return to Export": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0627\u0644\u062a\u0635\u062f\u064a\u0631",
     "Return to Your Dashboard": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a",
     "Return to all posts": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u062c\u0645\u064a\u0639 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0627\u062a",
-    "Return to my dashboard": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0644\u0648\u062d\u0629 \u0645\u0639\u0644\u0648\u0645\u0627\u062a\u064a",
     "Return to team listing": "\u0627\u0644\u0639\u0648\u062f\u0629 \u0625\u0644\u0649 \u0625\u062f\u0631\u0627\u062c \u0627\u0644\u0641\u0631\u064a\u0642",
     "Review Policy Exception": "\u0645\u0631\u0627\u062c\u0639\u0629 \u0627\u0633\u062a\u062b\u0646\u0627\u0621 \u0627\u0644\u0633\u064a\u0627\u0633\u0629",
     "Review Rules": "\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u0645\u0631\u0627\u062c\u0639\u0629",
@@ -1582,14 +1568,12 @@
     "Select a subject for your support request.": "\u0627\u062e\u062a\u0631 \u0645\u0648\u0636\u0648\u0639\u064b\u0627 \u0644\u0637\u0644\u0628 \u0627\u0644\u062f\u0639\u0645.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "\u0627\u062e\u062a\u0631 \u0641\u062a\u0631\u0629 \u0632\u0645\u0646\u064a\u0629 \u0645\u062e\u0635\u0651\u0635\u0629 \u0644\u0625\u062c\u0631\u0627\u0621 \u0627\u0644\u0627\u0645\u062a\u062d\u0627\u0646. \u0625\u0630\u0627 \u0632\u0627\u062f\u062a \u0627\u0644\u0642\u064a\u0645\u0629 \u0639\u0646 24 \u0633\u0627\u0639\u0629\u060c\u0623\u062f\u062e\u0644 \u0645\u0642\u062f\u0627\u0631\u064b\u0627 \u0645\u0646 \u0627\u0644\u0648\u0642\u062a. \u064a\u0645\u0643\u0646\u0643 \u0643\u0645\u062c \u0645\u062a\u0639\u0644\u0651\u0645\u064a\u0646 \u0645\u062d\u062f\u062f\u064a\u0646 \u0632\u0645\u0646\u064b\u0627 \u0625\u0636\u0627\u0641\u064a\u064b\u0627 \u0644\u0625\u062c\u0631\u0627\u0621 \u0627\u0644\u0627\u0645\u062a\u062d\u0627\u0646 \u0645\u0646 \u062e\u0644\u0627\u0644 \u0644\u0648\u062d\u0629 \u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0627\u0644\u0623\u0633\u062a\u0627\u0630.",
     "Select all": "\u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0643\u0644",
-    "Select employment status": "\u0641\u0636\u0644\u064b\u0627 \u062d\u062f\u062f \u062d\u0627\u0644\u062a\u0643 \u0627\u0644\u0648\u0638\u064a\u0641\u064a\u0629",
     "Select fidelity": "\u062d\u062f\u062f \u0627\u0644\u062f\u0642\u0629",
     "Select language": "\u062d\u062f\u062f \u0627\u0644\u0644\u063a\u0629",
     "Select one or more groups:": "\u062d\u062f\u062f \u0645\u062c\u0645\u0648\u0639\u0629 \u0648\u0627\u062d\u062f\u0629 \u0623\u0648 \u0623\u0643\u062b\u0631:",
     "Select the course-wide discussion topics that you want to divide.": "\u062d\u062f\u062f \u0645\u0648\u0627\u0636\u064a\u0639 \u0627\u0644\u0645\u062d\u0627\u062f\u062b\u0629 \u0641\u064a \u0627\u0644\u0645\u0633\u0627\u0642 \u0627\u0644\u062a\u064a \u062a\u0648\u062f \u062a\u0642\u0633\u064a\u0645\u0647\u0627.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "\u062d\u062f\u062f \u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0632\u0645\u0646\u064a\u0629 \u0644\u0639\u0631\u0636 \u0645\u0648\u0627\u0639\u064a\u062f \u0627\u0644\u062f\u0648\u0631\u0629. \u0625\u0630\u0627 \u0644\u0645 \u062a\u0642\u0645 \u0628\u062a\u062d\u062f\u064a\u062f \u0645\u0646\u0637\u0642\u0629 \u0632\u0645\u0646\u064a\u0629\u060c \u0633\u064a\u062a\u0645 \u0639\u0631\u0636 \u0645\u0648\u0627\u0639\u064a\u062f \u0627\u0644\u062f\u0648\u0631\u0629\u060c \u0628\u0645\u0627 \u0641\u064a \u0630\u0644\u0643 \u0645\u0648\u0627\u0639\u064a\u062f \u062a\u0642\u062f\u064a\u0645 \u0627\u0644\u0648\u0627\u062c\u0628\u0627\u062a\u060c \u0648\u0641\u0642\u0627\u064b \u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u062a\u0648\u0642\u064a\u062a \u0627\u0644\u0645\u062d\u0644\u064a \u0641\u064a \u0627\u0644\u0645\u062a\u0635\u0641\u062d.",
     "Select turnaround": "\u0627\u062e\u062a\u0631 \u0645\u062e\u0637\u0637 \u0627\u0644\u0627\u0646\u062c\u0627\u0632",
-    "Selected blocks": "\u0627\u0644\u0643\u062a\u0644 \u0627\u0644\u0645\u062d\u062f\u062f\u0629",
     "Selected tab": "\u0627\u0644\u062a\u0628\u0648\u064a\u0628\u0629 \u0627\u0644\u0645\u0646\u062a\u0642\u0627\u0629",
     "Self": "\u0645\u064f\u0642\u064a\u0651\u064e\u0645 \u0630\u0627\u062a\u064a\u0651\u064b\u0627",
     "Send to:": "\u0623\u0631\u0633\u0644 \u0625\u0644\u0649: ",
@@ -2213,17 +2197,11 @@
     "Weight of Total Grade": "\u0648\u0632\u0646 \u0627\u0644\u062f\u0631\u062c\u0629 \u0627\u0644\u0625\u062c\u0645\u0627\u0644\u064a\u0629",
     "We\u2019re sorry to see you go!": "\u0646\u0623\u0633\u0641 \u0644\u0630\u0647\u0627\u0628\u0643!",
     "What You Need for Verification": "\u0645\u0627 \u0627\u0644\u0630\u064a \u062a\u062d\u062a\u0627\u062c\u0647 \u0625\u0644\u064a\u0647 \u0644\u0625\u062c\u0631\u0627\u0621 \u0627\u0644\u062a\u062d\u0642\u0651\u0642",
-    "What can we help you with, {username}?": "\u0643\u064a\u0641 \u064a\u0645\u0643\u0646\u0646\u0627 \u0645\u0633\u0627\u0639\u062f\u062a\u0643\u060c {username}\u061f",
     "What does %(platformName)s do with this photo?": "\u0645\u0627 \u0627\u0644\u0630\u064a \u062a\u0641\u0639\u0644\u0647 %(platformName)s \u0628\u0647\u0630\u0647 \u0627\u0644\u0635\u0648\u0631\u0629\u061f",
     "What does this mean?": "\u0645\u0627\u0630\u0627 \u064a\u0639\u0646\u064a \u0647\u0630\u0627\u061f",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "\u0645\u0627\u0630\u0627 \u0644\u0648 \u0644\u0645 \u0623\u062a\u0645\u0643\u0646 \u0645\u0646 \u0631\u0624\u064a\u0629 \u0635\u0648\u0631\u0629 \u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0627\u060c \u0623\u0648 \u0625\u0630\u0627 \u0644\u0645 \u0623\u062a\u0645\u0643\u0646 \u0645\u0646 \u0631\u0624\u064a\u0629 \u0635\u0648\u0631\u062a\u064a \u0644\u062a\u062d\u062f\u064a\u062f \u0627\u0644\u062c\u0627\u0646\u0628 \u0627\u0644\u0645\u0631\u0626\u064a\u061f",
     "What if I have difficulty holding my ID in position relative to the camera?": "\u0645\u0627\u0630\u0627 \u0644\u0648 \u0648\u0627\u062c\u0647\u062a \u0635\u0639\u0648\u0628\u0629 \u0641\u064a \u062a\u062b\u0628\u064a\u062a \u0628\u0637\u0627\u0642\u0629 \u0647\u0648\u064a\u062a\u064a \u0641\u064a \u0627\u0644\u0645\u0648\u0636\u0639 \u0627\u0644\u0645\u0646\u0627\u0633\u0628 \u0644\u0644\u0643\u0627\u0645\u064a\u0631\u0627\u061f",
     "What if I have difficulty holding my head in position relative to the camera?": "\u0645\u0627\u0630\u0627 \u0644\u0648 \u0648\u0627\u062c\u0647\u062a \u0635\u0639\u0648\u0628\u0629 \u0641\u064a \u062a\u062b\u0628\u064a\u062a \u0631\u0623\u0633\u064a \u0641\u064a \u0627\u0644\u0645\u0648\u0636\u0639 \u0627\u0644\u0645\u0646\u0627\u0633\u0628 \u0644\u0644\u0643\u0627\u0645\u064a\u0631\u0627\u061f",
-    "What industry do you currently work in?": "\u0645\u0627\u0647\u0648 \u0645\u062c\u0627\u0644 \u0639\u0645\u0644\u0643 \u062d\u0627\u0644\u064a\u064b\u0627\u061f",
-    "What industry do you want to work in?": "\u0645\u0627 \u0627\u0644\u0645\u062c\u0627\u0644 \u0627\u0644\u0630\u064a \u062a\u0631\u063a\u0628 \u0627\u0644\u0639\u0645\u0644 \u0628\u0647\u061f",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "\u0645\u0627 \u0627\u0644\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u062a\u0639\u0644\u064a\u0645\u064a \u0627\u0644\u0623\u0639\u0644\u0649 \u0627\u0644\u0630\u064a \u062d\u0635\u0644 \u0639\u0644\u064a\u0647 \u0623\u062d\u062f \u0648\u0627\u0644\u062f\u064a\u0643 / \u0627\u0644\u0648\u0635\u064a \u0639\u0644\u064a\u0643\u061f",
-    "What is the highest level of education that you have achieved so far?": "\u0645\u0627 \u0627\u0644\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u062a\u0639\u0644\u064a\u0645\u064a \u0627\u0644\u0623\u0639\u0644\u0649 \u0627\u0644\u0630\u064a \u062d\u0635\u0644\u062a \u0639\u0644\u064a\u0647\u061f",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "\u0645\u0627 \u0645\u062c\u0645\u0648\u0639 \u0627\u0644\u062f\u062e\u0644 \u0627\u0644\u0639\u0627\u0645 \u062e\u0644\u0627\u0644 \u0627\u0644\u0627\u062b\u0646\u0627 \u0639\u0634\u0631 \u0634\u0647\u0631\u064b\u0627 \u0627\u0644\u0645\u0627\u0636\u064a\u0629 \u0644\u062c\u0645\u064a\u0639 \u0623\u0641\u0631\u0627\u062f \u0639\u0627\u0626\u0644\u062a\u0643\u061f",
     "What's Your Next Accomplishment?": "\u0645\u0627\u0647\u0648 \u0625\u0646\u062c\u0627\u0632\u0643 \u0627\u0644\u0642\u0627\u062f\u0645\u061f",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "\u0639\u0646\u062f\u0645\u0627 \u06cc\u0642\u062f\u0645 \u0627\u0644\u0645\u062a\u0639\u0644\u0645\u0648\u0646 \u0625\u062c\u0627\u0628\u0629 \u0639\u0644\u06cc \u0646\u0645\u0648\u0630\u062c \u062a\u0642\u06cc\u06cc\u0645\u060c \u0641\u0633\u06cc\u0638\u0647\u0631 \u0645\u0627 \u0625\u0630\u0627 \u06a9\u0627\u0646 \u0627\u0644\u062c\u0648\u0627\u0628 \u0635\u062d\u06cc\u062d\u0627\u064b \u0623\u0645 \u0644\u0627\u060c \u0648\u064a\u0633\u062a\u0644\u0645\u0648\u0646 \u0627\u0644\u0646\u062a\u06cc\u062c\u0629 \u0641\u0648\u0631\u064b\u0627.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "\u0639\u0646\u062f\u0645\u0627 \u064a\u0643\u0648\u0646 \u0648\u062c\u0647\u0643 \u0641\u064a \u0645\u0648\u0636\u0639\u0647 \u060c \u0627\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0632\u0631 \"\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u0629\" {icon} \u0623\u062f\u0646\u0627\u0647 \u0644\u0627\u0644\u062a\u0642\u0627\u0637 \u0635\u0648\u0631\u062a\u0643.",
@@ -2232,7 +2210,6 @@
     "Whole words": "\u0643\u0644\u0645\u0627\u062a \u0643\u0627\u0645\u0644\u0629 ",
     "Why activate?": "\u0644\u0645 \u0646\u0639\u062a\u0628\u0631 \u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u062d\u0633\u0627\u0628 \u0636\u0631\u0648\u0631\u064a\u0627\u064b\u061f",
     "Why does %(platformName)s need my photo?": "\u0644\u0645\u0627\u0630\u0627 \u062a\u062d\u062a\u0627\u062c %(platformName)s \u0625\u0644\u0649 \u0635\u0648\u0631\u062a\u064a\u061f",
-    "Why does edX collect this information?": "\u0644\u0645\u0627\u0630\u0627 \u062a\u062c\u0645\u0639 edX \u0647\u0630\u0647 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a\u061f",
     "Width": "\u0639\u0631\u0636",
     "Will Be Visible To:": "\u0633\u064a\u0635\u0628\u062d \u0645\u0631\u0626\u064a\u0651 \u0645\u0646: ",
     "Words: {0}": "\u0627\u0644\u0643\u0644\u0645\u0627\u062a: {0}",
@@ -2421,7 +2398,6 @@
     "endorsed %(time_ago)s by %(user)s": "\u0645\u0635\u0627\u062f\u0642\u0629 \u0639\u0644\u064a\u0647\u0627 %(time_ago)s \u0645\u0646 \u0642\u0650\u0628\u0644 %(user)s",
     "enter code here": "\u0623\u062f\u062e\u0644 \u0627\u0644\u062a\u0639\u0644\u064a\u0645\u0627\u062a \u0627\u0644\u0628\u0631\u0645\u062c\u064a\u0629 \u0647\u0646\u0627",
     "enter link description here": "\u0623\u062f\u062e\u0644 \u0648\u0635\u0641 \u0627\u0644\u0631\u0627\u0628\u0637 \u0647\u0646\u0627",
-    "finish later": "\u0627\u0644\u0625\u0646\u0647\u0627\u0621 \u0644\u0627\u062d\u0642\u064b\u0627",
     "follow this post": "\u062a\u0627\u0628\u0650\u0639 \u0647\u0630\u0627 \u0627\u0644\u0645\u0646\u0634\u0648\u0631 ",
     "for": "\u0645\u0646 \u0623\u062c\u0644",
     "group configuration": "\u0636\u0628\u0637 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629",
@@ -2436,7 +2412,6 @@
     "minute": "\u062f\u0642\u064a\u0642\u0629",
     "minutes": "\u062f\u0642\u0627\u0626\u0642",
     "name": "\u0627\u0644\u0627\u0633\u0645  ",
-    "next page": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u062a\u0627\u0644\u064a\u0629",
     "off": "\u063a\u064a\u0631 \u0645\u0641\u0639\u0651\u0644",
     "on": "\u0645\u0641\u0639\u0651\u0644",
     "one letter Friday\u0004F": "\u062c\u0645\u0639\u0629",
@@ -2468,7 +2443,6 @@
     "team count": "\u0639\u062f\u062f \u0623\u0639\u0636\u0627\u0621 \u0627\u0644\u0641\u0631\u064a\u0642",
     "text_word_{uniqueId}": "title_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "\u0628\u0623\u0633\u0631\u0639 \u0648\u0642\u062a \u0645\u0645\u0643\u0646 \u0644\u0644\u0631\u062f \u0648\u0627\u0644\u0645\u0633\u0627\u0639\u062f\u0629!",
     "there is currently {numVotes} vote": [
       "\u0647\u0646\u0627\u0643 {numVotes} \u0635\u0648\u062a",
       "\u0647\u0646\u0627\u0643 {numVotes} \u0635\u0648\u062a",
diff --git a/lms/static/js/i18n/de-de/djangojs.js b/lms/static/js/i18n/de-de/djangojs.js
index 9cf07036ec..42ca2214e7 100644
--- a/lms/static/js/i18n/de-de/djangojs.js
+++ b/lms/static/js/i18n/de-de/djangojs.js
@@ -114,7 +114,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Beschriftung wird angezeigt, sobald das Video gestartet wird.)",
     "(Community TA)": "(Gemeinschaftslehrkraft)",
     "(Optional)": "(Optional)",
-    "(Read-only)": "(Nur Lesezugriff)",
     "(Required Field)": "(Erforderliches Feld)",
     "(Self-paced) Ended {end}": "(Eigenes Tempo) Ist beendet {end}",
     "(Self-paced) Ends {end}": "(Eigenes Tempo) Endet {end}",
@@ -261,7 +260,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Ein Fehler ist aufgetreten. Warten Sie und versuchen Sie es sp\u00e4ter noch einmal.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Es gab einen Fehler beim Abholen deiner E-Mail. Bitte versuche es sp\u00e4ter noch einmal, und benachrichtige die technische \u00dcnterst\u00fctzung, wenn das Problem weiterhin besteht.",
     "An error occurred when signing you in to %s.": "Es ist ein Fehler aufgetreten als Sie sich f\u00fcr %s angemeldet haben.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Beim Versuch, die nachstehenden Informationen abzurufen oder zu speichern, ist ein Fehler aufgetreten. Bitte versuchen Sie es sp\u00e4ter noch einmal.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Beim Pr\u00fcfen der Teammitgliedschaft ist ein Fehler aufgetreten. Versuchen Sie, die Seite zu aktualisieren.",
     "An error occurred while removing the member from the team. Try again.": "Beim entfernen des Teammitgliedes ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.",
     "An error occurred.": "Ein Fehler ist aufgetreten.",
@@ -348,7 +346,6 @@
     "Bottom": "Grundlinie",
     "Browse": "Durchsuchen",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Neue Kurse durchsuchen",
-    "Browsing": "Durchsuchen",
     "Bulk Exceptions": "Sammelausnahmen",
     "Bullet list": "Aufz\u00e4hlung",
     "Bulleted List (Ctrl+U)": "Aufz\u00e4hlende Liste (STRG+U)",
@@ -524,9 +521,7 @@
     "Course Name": "Kursbezeichnung",
     "Course Number": "Kursnummer",
     "Course Number Override": "Kursnummer \u00dcberschreibung",
-    "Course Number:": "Kursnummer:",
     "Course Outline": "Kurs\u00fcbersicht",
-    "Course Run:": "Kurslaufzeit:",
     "Course Start": "Kursbeginn",
     "Course Title": "Kurs Titel",
     "Course Title Override": "Kurstitel \u00fcberschreiben",
@@ -538,7 +533,6 @@
     "Create": "Erstellen",
     "Create Account": "Konto erstellen",
     "Create Re-run": "Erstelle Wiederholungslauf",
-    "Create Support Ticket": "Erstellen Sie ein Supportticket",
     "Create a New Team": "Ein neues Team erstellen",
     "Create a content group": "Erstelle eine Inhaltsgruppe",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Erstelle ein neues Team, wenn Du keinem bestehenden Team beitreten kannst, oder wenn Du mit Freunden lernen m\u00f6chtest, die Du kennst.",
@@ -608,7 +602,6 @@
     "Describe ": "Beschreibe",
     "Description": "Beschreibung",
     "Description of the certificate": "Beschreibung des Zertifikats",
-    "Details": "Details",
     "Device with Camera": "Ger\u00e4t mit Kamera",
     "Dimensions": "Dimensionen",
     "Disc": "Scheibe",
@@ -817,7 +810,6 @@
     "Find next": "Finde n\u00e4chstes",
     "Find previous": "Finde vorheriges",
     "Finish": "Beende",
-    "Finish later": "Sp\u00e4ter beenden",
     "First time here?": "Zum ersten Mal hier?",
     "Follow": "Folgen",
     "Follow or unfollow posts": "Beitr\u00e4gen folgen / entfolgen",
@@ -869,7 +861,6 @@
     "H Align": "H Ausrichtung",
     "HTML preview of post": "HTML Vorschau des Beitrags",
     "HTML source code": "HTML-Quellcode",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Haben Sie jemals im aktiven Dienst in den US-Streitkr\u00e4ften, Reserven oder der Nationalgarde gedient?",
     "Header": "Kopfzeile",
     "Header 1": "Kopfzeile 1",
     "Header 2": "Kopfzeile 2",
@@ -1068,7 +1059,6 @@
     "Loading more threads": "Lade weitere Diskussionsstr\u00e4nge",
     "Loading posts list": "Lade Beitrags\u00fcbersicht",
     "Loading your courses": "Lade ihren Kurs",
-    "Loading...": "Lade...",
     "Location": "Ort",
     "Location in Course": "Position im Kurs",
     "Lock this asset": "Objekt sperren",
@@ -1129,7 +1119,6 @@
     "Name of the signatory": "Name des Unterzeichners",
     "Name or short description of the configuration": "Name oder Kurzbeschreibung des Aufbaus",
     "Navigate up": "Aufw\u00e4rts navigieren",
-    "Need help logging in?": "Brauchen Sie Hilfe beim einloggen?",
     "Need help signing in?": "Brauchen Sie Hilfe bei der Anmeldung?",
     "Need other help signing in?": "Brauchen Sie weitere Hilfe bei der Anmeldung?",
     "Needs verified certificate ": "Ben\u00f6tigt ein verifiziertes Zertifikat",
@@ -1233,7 +1222,6 @@
     "Organization ": "Organsation",
     "Organization Name": "Name der Organisation",
     "Organization of the signatory": "Organisation des Unterzeichners",
-    "Organization:": "Organisation:",
     "Other": "Anderer Abschluss",
     "Other sign-in issues": "Andere Probleme beim Anmelden",
     "Overall Score": "Gesamtpunkte",
@@ -1372,7 +1360,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Fragen ben\u00f6tigen Antworten. Diskussionen l\u00f6sen eine Konversation aus. (Erforderlich)",
     "Queued": "Eingereiht",
     "REMAINING COURSES": "VERBLEIBENDE KURSE",
-    "Re-run Course": "Neue Kurslaufzeit",
     "Read More": "Weiterlesen",
     "Read more": "Mehr erfahren",
     "Ready To Start": "Bereit um zu starten",
@@ -1445,7 +1432,6 @@
     "Return to Export": "Zum Export zur\u00fcckkehren",
     "Return to Your Dashboard": "Zur\u00fcck zu \"Meine Kurse\"",
     "Return to all posts": "Zu allen Beitr\u00e4gen",
-    "Return to my dashboard": "Zur\u00fcck zu meinem Dashboard",
     "Return to team listing": "Zur\u00fcck zur Teamliste",
     "Review Policy Exception": "Ausnahme bei der Begutachtungsrichtlinine",
     "Review Rules": "\u00dcberpr\u00fcfungsregeln",
@@ -1496,14 +1482,12 @@
     "Select a subject for your support request.": "W\u00e4hlen Sie ein Betreff f\u00fcr Ihre Supportanfrage.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "W\u00e4hlen Sie eine Zeitzuteilung f\u00fcr die Pr\u00fcfung aus. Wenn es mehr als 24 Stunden sind, geben Sie die Zeitspanne ein. Sie k\u00f6nnen einzelnen Lernenden \u00fcber das Lehrer-Dashboard zus\u00e4tzliche Zeit geben, um die Pr\u00fcfung abzuschlie\u00dfen.",
     "Select all": "Alles ausw\u00e4hlen",
-    "Select employment status": "W\u00e4hlen Sie Ihren Besch\u00e4ftigungsstatus",
     "Select fidelity": "Treue ausw\u00e4hlen",
     "Select language": "W\u00e4hlen Sie eine Sprache",
     "Select one or more groups:": "W\u00e4hlen Sie eine oder mehrere Gruppen aus:",
     "Select the course-wide discussion topics that you want to divide.": "W\u00e4hlen Sie die kursweiten Diskussionsthemen aus, die Sie aufteilen m\u00f6chten.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "W\u00e4hlen Sie die Zeitzone des angebotenen Kurses aus. Wenn Sie keine bestimmte Zeitzone ausw\u00e4hlen, werden Kursdaten, inklusive Abgabetermine f\u00fcr Aufgaben, in der lokalen Zeit ihres Browsers dargestellt.",
     "Select turnaround": "Wendepunkt ausw\u00e4hlen",
-    "Selected blocks": "Ausgew\u00e4hlte Bl\u00f6cke",
     "Selected tab": "Ausgew\u00e4hlter Tab",
     "Self": "Selbst",
     "Send to:": "Senden an:",
@@ -2067,7 +2051,7 @@
     "View Cohort": "Kohort ansehen",
     "View Course": "Anzeigen",
     "View Current Team Memberships": "Aktuelle Team-Mitgliedschaft sehen ",
-    "View Live": "Live betrachten",
+    "View Live": "Seite ansehen",
     "View Program Record": "Programmprotokoll einsehen",
     "View Report": "Sehen Sie den Bericht hier",
     "View Teams in the {topic_name} Topic": "Teams im {topic_name}  ansehen.",
@@ -2112,17 +2096,11 @@
     "Weight of Total Grade": "Gewichtung der Gesamtnote",
     "We\u2019re sorry to see you go!": "Es tut uns leid, dass Sie Ihren Account l\u00f6schen m\u00f6chten!",
     "What You Need for Verification": "Was du zur Verifizierung ben\u00f6tigst",
-    "What can we help you with, {username}?": "Wie k\u00f6nnen wir Ihnen helfen, {username}?",
     "What does %(platformName)s do with this photo?": "Was macht %(platformName)s mit dieses Foto?",
     "What does this mean?": "Was soll dies bedeuten?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Was, wenn ich mein Kamerabild  oder mein Foto nicht sehen kann?",
     "What if I have difficulty holding my ID in position relative to the camera?": "Was, wenn ich Schwierigkeiten habe, meinen Ausweis in der richtigen Position zur Kamera zu halten?",
     "What if I have difficulty holding my head in position relative to the camera?": "Was, wenn ich Schwierigkeiten habe, meinen Kopf in der richtigen Position zur Kamera zu halten?",
-    "What industry do you currently work in?": "In welcher Branche arbeiten Sie derzeit?",
-    "What industry do you want to work in?": "In welcher Branchen wollen Sie arbeiten?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Welches ist der h\u00f6chste Bildungsabschluss, den ein Elternteil oder Erziehungsberechtigter von Ihnen erreicht hat?",
-    "What is the highest level of education that you have achieved so far?": "Was ist der h\u00f6chste Bildungsabschluss, den Sie erreicht haben?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Wie hoch war das gemeinsame Gesamteinkommen aller Mitglieder Ihrer Familie in den letzten 12 Monaten? ",
     "What's Your Next Accomplishment?": "Was ist Ihr n\u00e4chster Erfolg?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Nutzer sehen sofort nach einreichen ihrer Antworten, ob diese richtig oder falsch sind und welche Punkte sie erhalten.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Wenn Ihr Gesicht in Position ist, klicken Sie auf die Schaltfl\u00e4che des Ausl\u00f6sers {icon} unten, um ein Foto aufzunehmen.",
@@ -2131,7 +2109,6 @@
     "Whole words": "Ganze Worte",
     "Why activate?": "Wieso aktivieren?",
     "Why does %(platformName)s need my photo?": "Wieso braucht %(platformName)s mein Foto?",
-    "Why does edX collect this information?": "Warum braucht edX diese Information?",
     "Width": "Breite",
     "Will Be Visible To:": "Wird sichtbar sein f\u00fcr:",
     "Words: {0}": "W\u00f6rter: {0}",
@@ -2315,7 +2292,6 @@
     "endorsed %(time_ago)s by %(user)s": "bef\u00fcrwortet %(time_ago)s von %(user)s",
     "enter code here": "Code hier eingeben",
     "enter link description here": "Linkbeschreibung hier eingeben",
-    "finish later": "Sp\u00e4ter beenden",
     "follow this post": "Beitrag folgen",
     "for": "f\u00fcr",
     "group configuration": "Gruppenkonfiguration",
@@ -2329,7 +2305,6 @@
     "minute": "Minute",
     "minutes": "Minuten",
     "name": "name",
-    "next page": "n\u00e4chste Seite",
     "off": "Aus",
     "on": "An",
     "one letter Friday\u0004F": "Fr",
@@ -2361,7 +2336,6 @@
     "team count": "Anzahl an Teams",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "desto schneller und gezielter k\u00f6nnen wir Ihnen antworten!",
     "there is currently {numVotes} vote": [
       "aktuell gibt es {numVotes} Stimme",
       "aktuell gibt es {numVotes} Stimmen"
diff --git a/lms/static/js/i18n/el/djangojs.js b/lms/static/js/i18n/el/djangojs.js
index 0290f431d5..c0e07ffc46 100644
--- a/lms/static/js/i18n/el/djangojs.js
+++ b/lms/static/js/i18n/el/djangojs.js
@@ -202,7 +202,6 @@
     "Midnight": "\u039c\u03b5\u03c3\u03ac\u03bd\u03c5\u03c7\u03c4\u03b1",
     "More": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b1",
     "Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-    "Need help logging in?": "\u039e\u03b5\u03c7\u03ac\u03c3\u03b1\u03c4\u03b5 \u03c4\u03bf\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c3\u03b1\u03c2;",
     "Need help signing in?": "\u03a7\u03c1\u03b5\u03b9\u03ac\u03b6\u03b5\u03c3\u03c4\u03b5 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1;",
     "New Password": "\u039d\u03ad\u03bf\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2",
     "No description available": "\u0394\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03b4\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03b7 \u03c0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
@@ -370,7 +369,6 @@
     "Verified Certificate": "\u03a0\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03b9\u03ba\u03cc \u03b5\u03c0\u03b1\u03bb\u03b7\u03b8\u03b5\u03c5\u03bc\u03ad\u03bd\u03bf",
     "View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
     "View Course": "\u0394\u0395\u0399\u03a4\u0395 \u03a4\u039f \u039c\u0391\u0398\u0397\u039c\u0391",
-    "View Live": "\u03a0\u03b1\u03c1\u03b1\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03b6\u03c9\u03bd\u03c4\u03b1\u03bd\u03ac",
     "Vote for good posts and responses": "\u03a5\u03c0\u03b5\u03c1\u03c8\u03b7\u03c6\u03af\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03ba\u03b1\u03bb\u03ad\u03c2 \u03b1\u03bd\u03b1\u03c1\u03c4\u03ae\u03c3\u03b5\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03b1\u03c0\u03bf\u03ba\u03c1\u03af\u03c3\u03b5\u03b9\u03c2",
     "Warning": "\u03a0\u03c1\u03bf\u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
     "We couldn't create your account.": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03ad\u03c3\u03b1\u03bc\u03b5 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03bf\u03c5\u03bc\u03b5 \u03c4\u03bf\u03bd \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c3\u03b1\u03c2",
diff --git a/lms/static/js/i18n/eo/djangojs.js b/lms/static/js/i18n/eo/djangojs.js
index 404d096061..6f35d08ce8 100644
--- a/lms/static/js/i18n/eo/djangojs.js
+++ b/lms/static/js/i18n/eo/djangojs.js
@@ -434,6 +434,7 @@
     "Code block": "\u00c7\u00f6d\u00e9 \u00dfl\u00f6\u00e7k \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#",
     "Cohort Assignment Method": "\u00c7\u00f6h\u00f6rt \u00c0ss\u00efgnm\u00e9nt M\u00e9th\u00f6d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7#",
     "Cohort Name": "\u00c7\u00f6h\u00f6rt N\u00e4m\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
+    "Cohort assignment not allowed: {email_or_username}": "\u00c7\u00f6h\u00f6rt \u00e4ss\u00efgnm\u00e9nt n\u00f6t \u00e4ll\u00f6w\u00e9d: {email_or_username} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442#",
     "Cohorts": "\u00c7\u00f6h\u00f6rts \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #",
     "Cohorts Disabled": "\u00c7\u00f6h\u00f6rts D\u00efs\u00e4\u00dfl\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "Cohorts Enabled": "\u00c7\u00f6h\u00f6rts \u00c9n\u00e4\u00dfl\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1#",
@@ -622,9 +623,7 @@
     "Download Memberships": "D\u00f6wnl\u00f6\u00e4d M\u00e9m\u00df\u00e9rsh\u00efps \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #",
     "Download Software Clicked": "D\u00f6wnl\u00f6\u00e4d S\u00f6ftw\u00e4r\u00e9 \u00c7l\u00ef\u00e7k\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
     "Download Transcript for Editing": "D\u00f6wnl\u00f6\u00e4d Tr\u00e4ns\u00e7r\u00efpt f\u00f6r \u00c9d\u00eft\u00efng \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442#",
-    "Download URL": "D\u00f6wnl\u00f6\u00e4d \u00dbRL \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
     "Download available encodings (.csv)": "D\u00f6wnl\u00f6\u00e4d \u00e4v\u00e4\u00efl\u00e4\u00dfl\u00e9 \u00e9n\u00e7\u00f6d\u00efngs (.\u00e7sv) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442#",
-    "Download the user's certificate": "D\u00f6wnl\u00f6\u00e4d th\u00e9 \u00fcs\u00e9r's \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442#",
     "Draft (Never published)": "Dr\u00e4ft (N\u00e9v\u00e9r p\u00fc\u00dfl\u00efsh\u00e9d) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3#",
     "Draft (Unpublished changes)": "Dr\u00e4ft (\u00dbnp\u00fc\u00dfl\u00efsh\u00e9d \u00e7h\u00e4ng\u00e9s) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454#",
     "Draft saved on {lastSavedStart}{editedOn}{lastSavedEnd} by {editedByStart}{editedBy}{editedByEnd}": "Dr\u00e4ft s\u00e4v\u00e9d \u00f6n {lastSavedStart}{editedOn}{lastSavedEnd} \u00df\u00fd {editedByStart}{editedBy}{editedByEnd} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
@@ -1173,7 +1172,6 @@
     "Not Started": "N\u00f6t St\u00e4rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Not Supported": "N\u00f6t S\u00fcpp\u00f6rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
     "Not able to set passing grade to less than %(minimum_grade_cutoff)s%.": "N\u00f6t \u00e4\u00dfl\u00e9 t\u00f6 s\u00e9t p\u00e4ss\u00efng gr\u00e4d\u00e9 t\u00f6 l\u00e9ss th\u00e4n %(minimum_grade_cutoff)s%. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
-    "Not available": "N\u00f6t \u00e4v\u00e4\u00efl\u00e4\u00dfl\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
     "Not divided": "N\u00f6t d\u00efv\u00efd\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Not in Use": "N\u00f6t \u00efn \u00dbs\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#",
     "Not selected": "N\u00f6t s\u00e9l\u00e9\u00e7t\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
diff --git a/lms/static/js/i18n/es-419/djangojs.js b/lms/static/js/i18n/es-419/djangojs.js
index 9733607a8e..4fd6f115bd 100644
--- a/lms/static/js/i18n/es-419/djangojs.js
+++ b/lms/static/js/i18n/es-419/djangojs.js
@@ -224,7 +224,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Los subt\u00edtulos ser\u00e1n mostrados al iniciar la reproducci\u00f3n del video.)",
     "(Community TA)": "(Profesor ayudante de la comunidad)",
     "(Optional)": "(Opcional)",
-    "(Read-only)": "(Solo-lectura)",
     "(Required Field)": "(Campo requerido)",
     "(Self-paced) Ended {end}": "(A ritmo propio) Terminado {end}",
     "(Self-paced) Ends {end}": "(A ritmo propio)Termina{end}",
@@ -375,7 +374,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Un error ha ocurrido. Espere unos pocos minutos e intenta de nuevo.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Ocurri\u00f3 un error al recuperar tu correo. Por favor intenta nuevamente m\u00e1s tarde. Si el problema persiste, contacta a soporte t\u00e9cnico.",
     "An error occurred when signing you in to %s.": "Ocurri\u00f3 un error al iniciar tu sesi\u00f3n en %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Se produjo un error al intentar recuperar recuperar o guardar la informaci\u00f3n a continuaci\u00f3n. Por favor intenta de nuevo mas tarde. ",
     "An error occurred while looking up team membership. Try refreshing the page.": "Ocurrio un error al buscar la membresia del equipo. Intenta refrescar la pagina.",
     "An error occurred while removing the member from the team. Try again.": "Ocurri\u00f3 un error al remover al miembro del equipo. Intenta nuevamente. ",
     "An error occurred.": "Ha ocurrido un error.",
@@ -463,7 +461,6 @@
     "Bottom": "Base",
     "Browse": "Explorar",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Echa un vistazo a nuestros cursos lanzados recientemente y qu\u00e9 hay de nuevo en tus temas favoritos.",
-    "Browsing": "Explorando",
     "Bulk Exceptions": "Excepciones en lote",
     "Bullet list": "Lista con vi\u00f1etas",
     "Bulleted List (Ctrl+U)": "Vi\u00f1etas (Ctrl+U)",
@@ -650,9 +647,7 @@
     "Course Name": "T\u00edtulo del curso",
     "Course Number": "C\u00f3digo del curso",
     "Course Number Override": "Reemplazo para el n\u00famero de curso",
-    "Course Number:": "N\u00famero del curso:",
     "Course Outline": "Estructura del curso",
-    "Course Run:": "Edici\u00f3n del Curso:",
     "Course Start": "Inicio del Curso",
     "Course Title": "T\u00edtulo del curso",
     "Course Title Override": "Reemplazo para el t\u00edtulo del curso",
@@ -664,7 +659,6 @@
     "Create": "Crear",
     "Create Account": "Crear cuenta",
     "Create Re-run": "Crear reapertura",
-    "Create Support Ticket": "Crear caso de soporte",
     "Create a New Team": "Crear un nuevo equipo",
     "Create a content group": "Crear contenido de grupo",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Crea un nuevo equipo si no puedes encontrar uno existente para unirte o si deseas aprender con personas que ya conoces.",
@@ -734,7 +728,6 @@
     "Describe ": "Describir",
     "Description": "Descripci\u00f3n",
     "Description of the certificate": "Descripci\u00f3n del certificado",
-    "Details": "Detalles",
     "Device with Camera": "Dispositivo con c\u00e1mara",
     "Dimensions": "Dimensiones",
     "Disc": "Disco",
@@ -952,7 +945,6 @@
     "Find next": "Encontrar el siguiente",
     "Find previous": "Encontrar el anterior",
     "Finish": "Finalizar",
-    "Finish later": "Terminar despues",
     "First time here?": "Primera vez aqu\u00ed?",
     "Follow": "Seguir",
     "Follow or unfollow posts": "Seguir o dejar de seguir publicaciones",
@@ -1007,7 +999,6 @@
     "HTML preview of post": "previsiualizaci\u00f3n en HTML",
     "HTML source code": "C\u00f3digo fuente HTML",
     "Have a computer with a functioning webcam": "Contar con un computador con c\u00e1mara web funcionando ",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "\u00bfAlguna vez has servido en un deber activo en las Fuerzas Armadas de Estados Unidos de America, Reservas, o Guardia Nacional? ",
     "Have your valid photo ID (e.g. driver's license or passport) ready": "Tener una foto de identificaci\u00f3n valida (ejemplo: licencia de conducci\u00f3n o pasaporte) a la mano",
     "Header": "Encabezado",
     "Header 1": "Encabezado 1",
@@ -1213,7 +1204,6 @@
     "Loading more threads": "Cargando m\u00e1s discusiones",
     "Loading posts list": "Cargando lista de publicaci\u00f3nes",
     "Loading your courses": "Cargando tus cursos",
-    "Loading...": "Cargando...",
     "Location": "Ubicaci\u00f3n",
     "Location in Course": "Ubicaci\u00f3n en el curso",
     "Lock this asset": "Bloquear este recurso",
@@ -1277,7 +1267,6 @@
     "Name or short description of the configuration": "Nombre o descripci\u00f3n corta de la configuraci\u00f3n",
     "Navigate to onboarding exam": "Navega hacia el examen de inducci\u00f3n",
     "Navigate up": "Navegue hacia arriba",
-    "Need help logging in?": "\u00bfNecesita ayuda para iniciar sesi\u00f3n?",
     "Need help signing in?": "\u00bfNecesita ayuda para iniciar sesi\u00f3n?",
     "Need other help signing in?": "\u00bfNecesita otra ayuda para iniciar sesi\u00f3n?",
     "Needs verified certificate ": "Necesita certificado verificado",
@@ -1393,7 +1382,6 @@
     "Organization ": "Organizaci\u00f3n",
     "Organization Name": "Nombre de la organizaci\u00f3n",
     "Organization of the signatory": "Organizaci\u00f3n del signatario",
-    "Organization:": "Organizaci\u00f3n:",
     "Other": "Otros",
     "Other sign-in issues": "Otros problemas para iniciar sesi\u00f3n",
     "Overall Score": "Puntaje general",
@@ -1540,7 +1528,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Utiliza Pregunta para plantear temas que necesitan respuestas. Utiliza Discusi\u00f3n para compartir tus ideas y comenzar conversaciones. (Requerido)",
     "Queued": "En cola",
     "REMAINING COURSES": "CURSOS RESTANTES",
-    "Re-run Course": "Relanzar Curso",
     "Read More": "Leer mas",
     "Read more": "Leer m\u00e1s",
     "Ready To Start": "Listo para comenzar",
@@ -1618,7 +1605,6 @@
     "Return to Export": "Regresar a exportar",
     "Return to Your Dashboard": "Volver al panel principal",
     "Return to all posts": "Volver a todas las publicaciones",
-    "Return to my dashboard": "Volver a mi panel de control",
     "Return to team listing": "Volver a la lista del equipo",
     "Review Policy Exception": "Revisar excepci\u00f3n a la pol\u00edtica",
     "Review Rules": "Revisar las reglas",
@@ -1671,14 +1657,12 @@
     "Select a subject for your support request.": "Elige un tema para tu petici\u00f3n de ayuda.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Seleccione un tiempo disponible para el examen. Si es mayor a 24 horas, escriba la cantidad de tiempo. Puede otorgar a estudiantes individuales un tiempo extra para completar el examen a trav\u00e9s del panel de control de instructor.",
     "Select all": "Selecionar todo",
-    "Select employment status": "Seleccionar estatus laboral",
     "Select fidelity": "Seleccionar fidelidad",
     "Select language": "Seleccionar lenguaje",
     "Select one or more groups:": "Selecciones uno o mas grupos:",
     "Select the course-wide discussion topics that you want to divide.": "Seleccione los temas de discusi\u00f3n del curso que desea dividir.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Selecciona la zona horaria para exponer las fechas del curso. Si no especificas una zona horaria, las fechas del curso, incluidas las fechas l\u00edmites de tareas, ser\u00e1n expuestas en la zona horaria local de tu navegador.",
     "Select turnaround": "Seleccione tiempo de entrega.",
-    "Selected blocks": "Bloques seleccionados",
     "Selected tab": "Opci\u00f3n seleccionada",
     "Self": "Auto",
     "Send to:": "Enviar a:",
@@ -2314,17 +2298,11 @@
     "Weight of Total Grade": "Peso en la calificaci\u00f3n total",
     "We\u2019re sorry to see you go!": "\u00a1Sentimos que te vayas!",
     "What You Need for Verification": "Lo que necesita para la verificaci\u00f3n",
-    "What can we help you with, {username}?": "\u00bfEn qu\u00e9 podemos ayudarte, {username}?",
     "What does %(platformName)s do with this photo?": "\u00bfQu\u00e9 hace %(platformName)s con esta imagen?",
     "What does this mean?": "\u00bfQu\u00e9 significa esto?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "\u00bfQu\u00e9 sucede si no puedo ver la imagen de la c\u00e1mara, o si no puedo ver mi foto para determinar qu\u00e9 lado es visible?",
     "What if I have difficulty holding my ID in position relative to the camera?": "\u00bfQu\u00e9 sucede si tengo dificultades para mantener mi identificaci\u00f3n en posici\u00f3n con respecto a la c\u00e1mara?",
     "What if I have difficulty holding my head in position relative to the camera?": "\u00bfQu\u00e9 sucede si tengo dificultades para mantener la cabeza en posici\u00f3n con respecto a la c\u00e1mara?",
-    "What industry do you currently work in?": "\u00bfEn que industria trabajas actualmente?",
-    "What industry do you want to work in?": "\u00bfEn que industria te gustar\u00eda trabajar?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "\u00bfCual es el nivel de educaci\u00f3n mas alto que alguno de tus padres o responsables ha adquirido? ",
-    "What is the highest level of education that you have achieved so far?": "\u00bfCual es el nivel mas alto de educaci\u00f3n que has obtenido hasta la fecha?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "\u00bfCual fue el ingreso total combinado, durante los ultimo 12 meses, de todos los miembros de tu familia? ",
     "What's Your Next Accomplishment?": "\u00bfQu\u00e9 ser\u00e1 tu pr\u00f3ximo logro?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Cuando un estudiante ya haya enviado su respuesta en una evaluaci\u00f3n, en seguida ver\u00e1 si esa respuesta es correcta o incorrecta y la puntuaci\u00f3n correspondiente.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Cuando su cara est\u00e9 en posici\u00f3n, use el bot\u00f3n Tomar foto {icon} a continuaci\u00f3n para tomar su foto.",
@@ -2333,7 +2311,6 @@
     "Whole words": "Palabras completas",
     "Why activate?": "Por qu\u00e9 activar?",
     "Why does %(platformName)s need my photo?": "Por qu\u00e9 %(platformName)s necesita mi foto ?",
-    "Why does edX collect this information?": "\u00bfPor qu\u00e9 edX recoleta esta informaci\u00f3n?",
     "Width": "Anchura",
     "Will Be Visible To:": "Ser\u00e1 visible para:",
     "Words: {0}": "Palabras: {0}",
@@ -2538,7 +2515,6 @@
     "endorsed %(time_ago)s by %(user)s": "Validado hace %(time_ago)s por %(user)s",
     "enter code here": "ingresa el c\u00f3digo aqu\u00ed",
     "enter link description here": "Ingresa la descripci\u00f3n del v\u00ednculo aqu\u00ed",
-    "finish later": "terminar despues",
     "follow this post": "sigue esta publicaci\u00f3n",
     "for": "para",
     "group configuration": "Configuraci\u00f3n de Grupo",
@@ -2553,7 +2529,6 @@
     "minute": "minuto",
     "minutes": "minutos",
     "name": "nombre",
-    "next page": "Siguiente p\u00e1gina",
     "off": "Apagar",
     "on": "Encender",
     "one letter Friday\u0004F": "V",
@@ -2585,7 +2560,6 @@
     "team count": "Cantidad de equipos",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "Cuantos m\u00e1s detalles, m\u00e1s r\u00e1pido y mejor podremos responder",
     "there is currently {numVotes} vote": [
       "actualmente hay {numVotes} voto",
       "actualmente hay {numVotes} votos",
diff --git a/lms/static/js/i18n/eu-es/djangojs.js b/lms/static/js/i18n/eu-es/djangojs.js
index bd36c35cd1..0093df513b 100644
--- a/lms/static/js/i18n/eu-es/djangojs.js
+++ b/lms/static/js/i18n/eu-es/djangojs.js
@@ -68,7 +68,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Azpitituluak erakutsiko dira bideoa ikusten hasten zarenean.)",
     "(Community TA)": "(Eztabaida-laguntzailea)",
     "(Optional)": "(Aukerakoa)",
-    "(Read-only)": "(Irakurtzekoa baino ez)",
     "(Required Field)": "(Beharrezko eremua)",
     "(Staff)": "(Arduradunak)",
     "(optional)": "(aukerakoa)",
@@ -349,9 +348,7 @@
     "Course Name": "Ikastaroaren izena",
     "Course Number": "Ikastaro-zenbakia",
     "Course Number Override": "Aldatu Ikastaro-zenbakia",
-    "Course Number:": "Ikastaro-zenbakia",
     "Course Outline": "Ikastaroaren egitura",
-    "Course Run:": "Ikastaroa ematea:",
     "Course Start": "Ikastaroaren hasiera",
     "Course Title": "Ikastaroaren izenburua",
     "Course Title Override": "Aldatu ikastaroaren izenburua",
@@ -412,7 +409,6 @@
     "Describe ": "Deskribatu",
     "Description": "Deskribapena",
     "Description of the certificate": "Ziurtagiriaren deskribapena",
-    "Details": "Xehetasunak",
     "Dimensions": "Neurriak",
     "Disc": "Diskoa",
     "Discard Changes": "Utzi aldaketak",
@@ -752,7 +748,6 @@
     "Name of the signatory": "Sinatzailearen izena",
     "Name or short description of the configuration": "Ezarpenen izena edo deskribapen laburra",
     "Navigate up": "Joan gora",
-    "Need help logging in?": "Laguntza behar duzu saioa hasteko?",
     "New %(item_type)s": "%(item_type)s berria",
     "New Address": "Helbide berria",
     "New Password": "Pasahitz berria",
@@ -825,7 +820,6 @@
     "Organization ": "Erakundea",
     "Organization Name": "Erakundearen izena",
     "Organization of the signatory": "Sinatzailearen erakundea",
-    "Organization:": "Erakundea:",
     "Other": "Bestelako bat",
     "Overall Score": "Puntuazio orokorra",
     "Page break": "Orri-jauzia",
@@ -894,7 +888,6 @@
     "Question": "Galdera",
     "Queued": "Ilaran",
     "REMAINING COURSES": "GERATZEN DIREN IKASTAROAK",
-    "Re-run Course": "Errepikatu ikastaroa",
     "Read More": "Irakurri gehiago",
     "Read more": "Irakurri gehiago",
     "Ready To Start": "Hasteko prest",
@@ -1328,7 +1321,6 @@
     "We've encountered an error. Refresh your browser and then try again.": "Errore bat aurkitu dugu. Frekatu zure nabigatzailea eta saiatu berriz.",
     "Web:": "Web:",
     "Webcam": "Web-kamera",
-    "What can we help you with, {username}?": "Zertan lagundu ahal dizugu, {username}?",
     "What does this mean?": "Zer esan nahi du honek?",
     "What's Your Next Accomplishment?": "Zein izango da hurrengo lorpena?",
     "Whole words": "Hitz osoak",
@@ -1446,7 +1438,6 @@
     "minute": "minutu",
     "minutes": "minutu",
     "name": "izena",
-    "next page": "hurrengo orria",
     "off": "itzalita",
     "on": "piztuta",
     "one letter Friday\u0004F": "O",
diff --git a/lms/static/js/i18n/fr/djangojs.js b/lms/static/js/i18n/fr/djangojs.js
index 254b689959..dbba28e4d7 100644
--- a/lms/static/js/i18n/fr/djangojs.js
+++ b/lms/static/js/i18n/fr/djangojs.js
@@ -224,7 +224,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Les sous-titres s'afficheront quand vous lancerez la vid\u00e9o.)",
     "(Community TA)": "(Assistant technique)",
     "(Optional)": "(Optionnel)",
-    "(Read-only)": "(Lecture-seule)",
     "(Required Field)": "(Champ requis)",
     "(Self-paced) Ended {end}": "(\u00c0 votre rythme) Termin\u00e9 {end}",
     "(Self-paced) Ends {end}": "(\u00c0 votre rythme) Se finit \u00e0 {end}",
@@ -375,7 +374,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Une erreur est survenue. Attendez quelques minutes avant de r\u00e9essayer.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Une erreur est survenue lors de la r\u00e9cup\u00e9ration de votre courriel. S'il vous pla\u00eet r\u00e9essayez plus tard, et contactez le support technique si le probl\u00e8me persiste.",
     "An error occurred when signing you in to %s.": "Une erreur s'est produite en vous connectant \u00e0 %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Une erreur s'est produite lors de la tentative de r\u00e9cup\u00e9ration ou d'enregistrement des informations ci-dessous. Veuillez r\u00e9essayer plus tard.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Une erreur s'est produite lors de la recherche des membres de l'\u00e9quipe. Essayez d'actualiser la page.",
     "An error occurred while removing the member from the team. Try again.": "Une erreur est survenue lors de la suppression du membre de l'\u00e9quipe. R\u00e9essayez.",
     "An error occurred.": "Une erreur est survenue.",
@@ -463,7 +461,6 @@
     "Bottom": "Bas",
     "Browse": "Parcourir",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Parcourez les plus r\u00e9cents cours et voyez ce qui existe de nouveau dans vos sujets favoris",
-    "Browsing": "Navigation",
     "Bulk Exceptions": "D\u00e9rogations en lot",
     "Bullet list": "Liste \u00e0 puces",
     "Bulleted List (Ctrl+U)": "List \u00e0 Puces (Ctrl+U)",
@@ -650,9 +647,7 @@
     "Course Name": "Nom du Cours",
     "Course Number": "Num\u00e9ro du cours",
     "Course Number Override": "Ecrasement du Num\u00e9ro du Cours",
-    "Course Number:": "Num\u00e9ro du cours :",
     "Course Outline": "Plan du Cours",
-    "Course Run:": "Session :",
     "Course Start": "D\u00e9but du Cours",
     "Course Title": "Titre du cours",
     "Course Title Override": "Surcharge du Titre du Cours",
@@ -664,7 +659,6 @@
     "Create": "Cr\u00e9er",
     "Create Account": "Cr\u00e9er un compte",
     "Create Re-run": "Cr\u00e9er une relance",
-    "Create Support Ticket": "Cr\u00e9er un billet de support",
     "Create a New Team": "Cr\u00e9er une nouvelle \u00e9quipe",
     "Create a content group": "Cr\u00e9er un groupe de contenu",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Cr\u00e9ez une nouvelle \u00e9quipe si vous ne trouvez pas une \u00e9quipe existante \u00e0 rejoindre, ou si vous d\u00e9sirez apprendre avec des amis que vous connaissez d\u00e9j\u00e0.",
@@ -734,7 +728,6 @@
     "Describe ": "D\u00e9crire",
     "Description": "Description",
     "Description of the certificate": "Description du certificat",
-    "Details": "D\u00e9tails",
     "Device with Camera": "Appareil avec cam\u00e9ra",
     "Dimensions": "Dimensions",
     "Disc": "Disque",
@@ -952,7 +945,6 @@
     "Find next": "Trouver le suivant",
     "Find previous": "Trouver le pr\u00e9c\u00e9dent",
     "Finish": "Terminer",
-    "Finish later": "Terminer plus tard",
     "First time here?": "C'est votre premi\u00e8re visite ?",
     "Follow": "Suivre",
     "Follow or unfollow posts": "Suivre ou ne plus suivre un message",
@@ -1007,7 +999,6 @@
     "HTML preview of post": "Pr\u00e9visualisation HTML de l'article",
     "HTML source code": "Code source HTML",
     "Have a computer with a functioning webcam": "Ayez un ordinateur avec une webcam fonctionnelle",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Avez-vous d\u00e9j\u00e0 servi en service actif dans les forces arm\u00e9es, les r\u00e9serves ou la garde nationale?",
     "Have your valid photo ID (e.g. driver's license or passport) ready": "Ayez \u00e0 port\u00e9e de main votre pi\u00e8ce d'identit\u00e9 valide avec photo (par exemple, permis de conduire ou passeport)",
     "Header": "En-t\u00eate",
     "Header 1": "En-t\u00eate 1",
@@ -1213,7 +1204,6 @@
     "Loading more threads": "Chargement de plus de messages",
     "Loading posts list": "Chargement de la liste des messages",
     "Loading your courses": "Chargement de vos cours",
-    "Loading...": "Chargement...",
     "Location": "Adresse",
     "Location in Course": "Emplacement dans le cours",
     "Lock this asset": "V\u00e9rouiller cet \u00e9l\u00e9ment",
@@ -1277,7 +1267,6 @@
     "Name or short description of the configuration": "Nom ou description br\u00e8ve de la configuration",
     "Navigate to onboarding exam": "Acc\u00e9dez \u00e0 l'examen d'int\u00e9gration",
     "Navigate up": "Naviguer vers le haut",
-    "Need help logging in?": "Besoin d'aide pour vous connecter ?",
     "Need help signing in?": "Besoin d'aide pour vous enregistrer?",
     "Need other help signing in?": "Encore besoin d'aide pour vous enregistrer?",
     "Needs verified certificate ": "N\u00e9cessite un certificat v\u00e9rifi\u00e9",
@@ -1393,7 +1382,6 @@
     "Organization ": "Organisation",
     "Organization Name": "Nom de l'organisation",
     "Organization of the signatory": "Organisation du signataire",
-    "Organization:": "Organisation:",
     "Other": "Autre",
     "Other sign-in issues": "Autres probl\u00e8mes d'enregistrement",
     "Overall Score": "Score total",
@@ -1540,7 +1528,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Les questions sont adapt\u00e9es pour les sujets qui n\u00e9cessitent une r\u00e9ponse. Les discussions permettent de partager des id\u00e9es et de commencer des conversations. (Requis)",
     "Queued": "Mis en file d'attente",
     "REMAINING COURSES": "RESTANT",
-    "Re-run Course": "Relancer le cours",
     "Read More": "En lire plus.",
     "Read more": "En lire plus",
     "Ready To Start": "Pr\u00eat \u00e0 Commencer",
@@ -1619,7 +1606,6 @@
     "Return to Export": "Retourner \u00e0 l'exportation",
     "Return to Your Dashboard": "Retour au Tableau de bord",
     "Return to all posts": "Revenir \u00e0 tous les sujets",
-    "Return to my dashboard": "Retour \u00e0 mon tableau de bord",
     "Return to team listing": "Retour \u00e0 la liste des membres de l'\u00e9quipe",
     "Review Policy Exception": "Exception aux R\u00e8gles de Revues",
     "Review Rules": "V\u00e9rification des r\u00e8gles",
@@ -1672,14 +1658,12 @@
     "Select a subject for your support request.": "S\u00e9lectionnez un sujet pour votre demande d'assistance.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Choisissez une p\u00e9riode de temps pour l'examen. Si c'est plus de 24 heures, indiquer la quantit\u00e9 de temps. Vous pouvez accorder du temps suppl\u00e9mentaire \u00e0 des apprenants individuels via le tableau de bord de l'enseignant afin de leur permettre de terminer l'examen.",
     "Select all": "Tout s\u00e9lectionner",
-    "Select employment status": "S\u00e9lectionnez le statut d'emploi",
     "Select fidelity": "S\u00e9lectionnez la fid\u00e9lit\u00e9",
     "Select language": "S\u00e9lectionnez la langue",
     "Select one or more groups:": "S\u00e9lectionner au moins un groupe\u00a0:",
     "Select the course-wide discussion topics that you want to divide.": "S\u00e9lectionnez les sujets de discussion du cours que vous souhaitez s\u00e9parer.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "S\u00e9lectionnez le fuseau horaire pour l'affichage des dates de cours. Si vous n'indiquez aucun fuseau horaire, les dates de cours, y compris les \u00e9ch\u00e9ances de devoirs, seront affich\u00e9s en fonction du fuseau horaire local de votre navigateur. ",
     "Select turnaround": "S\u00e9lectionnez le d\u00e9lai d'ex\u00e9cution",
-    "Selected blocks": "Blocs s\u00e9lectionn\u00e9s",
     "Selected tab": "Onglet s\u00e9lectionn\u00e9",
     "Self": "Auto",
     "Send to:": "Envoyez \u00e0 :",
@@ -2316,17 +2300,11 @@
     "Weight of Total Grade": "Valeur de l'ensemble du grade",
     "We\u2019re sorry to see you go!": "Nous sommes d\u00e9sol\u00e9s de vous voir partir !",
     "What You Need for Verification": "Ce qui est n\u00e9c\u00e9saire pour la v\u00e9rification",
-    "What can we help you with, {username}?": "A quoi pouvons-nous vous \u00eatre utile, {username}?",
     "What does %(platformName)s do with this photo?": "Que fait %(platformName)s avec cette photo ?",
     "What does this mean?": "Qu'est ce que cela signifie?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Que se passe-t-il si je ne peux pas voir l'image de l'appareil photo ou si je ne peux pas voir ma photo pour d\u00e9terminer quel c\u00f4t\u00e9 est visible ?",
     "What if I have difficulty holding my ID in position relative to the camera?": "Que faire si j'ai des difficult\u00e9s \u00e0 tenir ma carte d'identit\u00e9 en position par rapport \u00e0 la cam\u00e9ra ?",
     "What if I have difficulty holding my head in position relative to the camera?": "Que faire si j'ai des difficult\u00e9s \u00e0 maintenir ma t\u00eate en position par rapport \u00e0 la cam\u00e9ra ?",
-    "What industry do you currently work in?": "Dans quel secteur travaillez-vous actuellement?",
-    "What industry do you want to work in?": "Dans quel secteur souhaitez-vous travailler?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Quel est le niveau de scolarit\u00e9 le plus \u00e9lev\u00e9 que l'un de vos parents ou tuteurs ait atteint?",
-    "What is the highest level of education that you have achieved so far?": "Quel est le niveau d'\u00e9ducation le plus \u00e9lev\u00e9 que vous ayez atteint jusqu'\u00e0 pr\u00e9sent?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Quel a \u00e9t\u00e9 le revenu total combin\u00e9, au cours des 12 derniers mois, de tous les membres de votre famille?",
     "What's Your Next Accomplishment?": "Quel est votre prochain accomplissement?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Lorsque les \u00e9tudiants r\u00e9pondent \u00e0 une \u00e9valuation, ils voient imm\u00e9diatement si la r\u00e9ponse est juste ou fausse ainsi que leur note. ",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Lorsque votre visage est en position, utilisez le bouton \"Prendre une photo\" {icon} ci-dessous pour prendre votre photo.",
@@ -2335,7 +2313,6 @@
     "Whole words": "Mots entiers",
     "Why activate?": "Pourquoi activer?",
     "Why does %(platformName)s need my photo?": "Pourquoi %(platformName)s a besoin de ma photo ?",
-    "Why does edX collect this information?": "Pourquoi edX collecte-t-il ces informations ?",
     "Width": "Largeur",
     "Will Be Visible To:": "Sera visible pour :",
     "Words: {0}": "Mots : {0}",
@@ -2540,7 +2517,6 @@
     "endorsed %(time_ago)s by %(user)s": "approuv\u00e9 %(time_ago)s par %(user)s",
     "enter code here": "saisir du code ici",
     "enter link description here": "saisir une description du lien ici",
-    "finish later": "terminer plus tard",
     "follow this post": "Suivre ce message",
     "for": "pour",
     "group configuration": "configuration des groupes",
@@ -2555,7 +2531,6 @@
     "minute": "minute",
     "minutes": "minutes",
     "name": "nom",
-    "next page": "page suivante",
     "off": "arr\u00eat",
     "on": "on",
     "one letter Friday\u0004F": "V",
@@ -2587,7 +2562,6 @@
     "team count": "total \u00e9quipe",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "le plus rapidement et efficacement que nous pouvons r\u00e9pondre !",
     "there is currently {numVotes} vote": [
       "il y a actuellement {numVotes} vote",
       "il y a actuellement {numVotes} votes",
diff --git a/lms/static/js/i18n/id/djangojs.js b/lms/static/js/i18n/id/djangojs.js
index ce4883a2e1..1ec5f0cd4e 100644
--- a/lms/static/js/i18n/id/djangojs.js
+++ b/lms/static/js/i18n/id/djangojs.js
@@ -233,7 +233,6 @@
     "Bottom": "Bawah",
     "Browse": "Jelajahi",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Telusuri kursus yang baru dirilis dan lihat yang baru dalam subjek favorit Anda.",
-    "Browsing": "Jelajah",
     "Bulk Exceptions": "Pengecualian Massal",
     "Bullet list": "Bullet list",
     "Bulleted List (Ctrl+U)": "Bulleted List (Ctrl+U)",
@@ -374,9 +373,7 @@
     "Course Name": "Nama Kursus",
     "Course Number": "Nomor Kursus",
     "Course Number Override": "Penggantian Nomor Kursus",
-    "Course Number:": "Nomor Kursus:",
     "Course Outline": "Garis Besar Kursus",
-    "Course Run:": "Kursus Berjalan:",
     "Course Title": "Judul Kursus",
     "Course Title Override": "Penggantian Judul Kursus",
     "Course Video Settings": "Pengaturan Video Kursus",
@@ -428,7 +425,6 @@
     "Describe ": "Deskripsikan",
     "Description": "Deskripsi",
     "Description of the certificate": "Keterangan sertifikat",
-    "Details": "Detil",
     "Dimensions": "Dimensi",
     "Disc": "Cakram",
     "Discard Changes": "Batalkan Perubahan",
@@ -906,7 +902,6 @@
     "Organization ": "Organisasi",
     "Organization Name": "Nama Organisasi",
     "Organization of the signatory": "Organisasi dari penandatangan",
-    "Organization:": "Organisasi:",
     "Other": "Lainnya",
     "Overall Score": "Nilai Keseluruhan",
     "PDF Chapters": "Bab PDF",
@@ -1561,7 +1556,6 @@
     "Weight of Total Grade": "Berat dari total grade",
     "We\u2019re sorry to see you go!": "Kami sedih Anda pergi ",
     "What You Need for Verification": "Apa yang anda perlukan untuk verifikasi",
-    "What can we help you with, {username}?": "Ada yang bisa kami bantu, {username}?",
     "What does %(platformName)s do with this photo?": "Apa yang dilakukan %(platformName)s terhadap foto ini?",
     "What does this mean?": "Apakah ini maksudnya?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Saat peserta mengirimkan jawaban untuk penilaian, mereka langsung dapat melihat apakah jawaban mereka benar atau salah, dan nilai yang mereka terima.",
diff --git a/lms/static/js/i18n/it-it/djangojs.js b/lms/static/js/i18n/it-it/djangojs.js
index 6d7795d97e..cbf49bcad8 100644
--- a/lms/static/js/i18n/it-it/djangojs.js
+++ b/lms/static/js/i18n/it-it/djangojs.js
@@ -210,7 +210,6 @@
     "(Caption will be displayed when you start playing the video.)": "(La trascrizione del video verr\u00e0 mostrata quando inizierai a guardare il video)",
     "(Community TA)": "(Community TA)",
     "(Optional)": "(Facoltativo)",
-    "(Read-only)": "(Sola lettura)",
     "(Required Field)": "(Campo richiesto)",
     "(Self-paced) Ended {end}": "(Apprendimento autonomo) Terminato {end}",
     "(Self-paced) Ends {end}": "(Apprendimento autonomo) Termina {end}",
@@ -360,7 +359,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Si \u00e8 verificato un errore. Aspetta qualche minuto e riprova.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Si \u00e8 verificato un errore mentre cercavi di leggere le tue email. Riprova dopo cortesemente, e contatta il supporto tecnico se il problema persiste.",
     "An error occurred when signing you in to %s.": "Si \u00e8 verificato un errore durante l'accesso a %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Si \u00e8 verificato un errore durante il tentativo di recuperare o salvare le informazioni seguenti. Prova di nuovo pi\u00f9 tardi.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Si \u00e8 verificato un errore durante la ricerca tra le adesioni ai team. Prova ad aggiornare la pagina.",
     "An error occurred while removing the member from the team. Try again.": "Si \u00e8 verificato un errore durante la rimozione del membro dal team. Riprova pi\u00f9 tardi",
     "An error occurred.": "Si \u00e8 verificato un errore. ",
@@ -447,7 +445,6 @@
     "Bottom": "In basso",
     "Browse": "Cerca",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Sfoglia i corsi avviati di recente e scopri le novit\u00e0 nei tuoi soggetti preferiti ",
-    "Browsing": "Esplorazione",
     "Bulk Exceptions": "Eccezioni di massa ",
     "Bullet list": "Elenco puntato",
     "Bulleted List (Ctrl+U)": "Elenco puntato (Ctrl+U)",
@@ -629,9 +626,7 @@
     "Course Name": "Nome Corso",
     "Course Number": "Numero del Corso",
     "Course Number Override": "Sostituzione numero corso",
-    "Course Number:": "Numero Corso",
     "Course Outline": "Struttura del corso",
-    "Course Run:": "Esecuzione corso:",
     "Course Start": "Inizio del corso ",
     "Course Title": "Titolo del Corso",
     "Course Title Override": "Sostituzione titolo corso",
@@ -643,7 +638,6 @@
     "Create": "Crea",
     "Create Account": "Crea account",
     "Create Re-run": "Crea un riavvio",
-    "Create Support Ticket": "Crea ticket di supporto",
     "Create a New Team": "Crea un nuovo gruppo",
     "Create a content group": "Crea un gruppo di contenuti ",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Crea un nuovo gruppo se non ne trovi uno esistente di cui far parte, o se vorresti apprendere insieme ad amici che conosci ",
@@ -713,7 +707,6 @@
     "Describe ": "Descrivi ",
     "Description": "Descrizione",
     "Description of the certificate": "Descrizione del certificato",
-    "Details": "Dettagli",
     "Device with Camera": "Dispositivo con telecamera ",
     "Dimensions": "Dimensioni",
     "Disc": "Disco",
@@ -925,7 +918,6 @@
     "Find next": "Trova successivo",
     "Find previous": "Trova precedente",
     "Finish": "Fine",
-    "Finish later": "Termina pi\u00f9 tardi",
     "First time here?": "Nuovo utente? ",
     "Follow": "Segui ",
     "Follow or unfollow posts": "Segui o non seguire post ",
@@ -979,7 +971,6 @@
     "HTML preview of post": "Anteprima HTML del post",
     "HTML source code": "Codice sorgente HTML",
     "Have a computer with a functioning webcam": "Disporre di un computer con una webcam funzionante",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Hai mai prestato servizio attivo nelle forze armate, nelle riserve o nella guardia nazionale degli Stati Uniti? ",
     "Have your valid photo ID (e.g. driver's license or passport) ready": "Avere a disposizione un documento d'identit\u00e0 valido con foto (ad es. la patente di guida o il passaporto)",
     "Header": "Intestazione",
     "Header 1": "Intestazione 1",
@@ -1182,7 +1173,6 @@
     "Loading more threads": "Carica ulteriori discussioni",
     "Loading posts list": "Caricamento dell'elenco dei post ",
     "Loading your courses": "Caricamento dei tuoi corsi",
-    "Loading...": "Caricamento...",
     "Location": "Posizione",
     "Location in Course": "Posizione in corso",
     "Lock this asset": "Blocca questa attivit\u00e0",
@@ -1246,7 +1236,6 @@
     "Name or short description of the configuration": "Nome o breve descrizione della configurazione ",
     "Navigate to onboarding exam": "Accedi all'esame di onboarding",
     "Navigate up": "Naviga su",
-    "Need help logging in?": "Hai bisogno di aiuto per l'accesso?",
     "Need help signing in?": "Hai bisogno di aiuto per l'accesso? ",
     "Need other help signing in?": "Hai bisogno di altro aiuto per l'accesso? ",
     "Needs verified certificate ": "Richiede un certificato verificato ",
@@ -1361,7 +1350,6 @@
     "Organization ": "Organizzazione",
     "Organization Name": "Nome organizzazione",
     "Organization of the signatory": "Organizzazione del firmatario",
-    "Organization:": "Organizzazione:",
     "Other": "Altro",
     "Other sign-in issues": "Altri problemi di collegamento ",
     "Overall Score": "Voto Finale",
@@ -1504,7 +1492,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Le domande sollevano problemi che richiedono risposte. Le discussioni condividono idee ed avviano le conversazioni. (Obbligatorio) ",
     "Queued": "In coda",
     "REMAINING COURSES": "CORSI RIMANENTI ",
-    "Re-run Course": "Riesegui il corso",
     "Read More": "Per saperne di pi\u00f9",
     "Read more": "Per saperne di pi\u00f9",
     "Ready To Start": "Pronto a partire",
@@ -1580,7 +1567,6 @@
     "Return to Export": "Ritorna a Esporta",
     "Return to Your Dashboard": "Ritorna alla tua dashboard",
     "Return to all posts": "Torna a tutti i post",
-    "Return to my dashboard": "Torna alla mia dashboard",
     "Return to team listing": "Torna alla lista del gruppo",
     "Review Policy Exception": "Verifica Eccezione Policy",
     "Review Rules": "Regole di controllo",
@@ -1632,14 +1618,12 @@
     "Select a subject for your support request.": "Seleziona un argomento per la tua richiesta di supporto. ",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Seleziona il tempo da assegnare per l'esame. Se sono pi\u00f9 di 24 ore, digita la quantit\u00e0 di tempo. Puoi concedere ai singoli studenti pi\u00f9 tempo per completare l'esame tramite la Dashboard dell'Istruttore. ",
     "Select all": "Seleziona tutto",
-    "Select employment status": "Seleziona occupazione",
     "Select fidelity": "Seleziona fedelt\u00e0",
     "Select language": "Seleziona lingua",
     "Select one or more groups:": "Seleziona uno o pi\u00f9 gruppi:",
     "Select the course-wide discussion topics that you want to divide.": "Selezionare gli argomenti di discussione a livello del corso che si desidera dividere. ",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Seleziona il fuso orario per la visualizzazione delle date dei corsi. Se non specifichi un fuso orario, le date dei corsi, comprese le scadenze dei compiti, verranno visualizzate nel fuso orario locale del tuo browser. ",
     "Select turnaround": "Seleziona soluzione temporaneo",
-    "Selected blocks": "Blocchi selezionati",
     "Selected tab": "Tab selezionata",
     "Self": "Autonomo ",
     "Send to:": "Manda a:",
@@ -2259,17 +2243,11 @@
     "Weight of Total Grade": "Peso del Voto totale",
     "We\u2019re sorry to see you go!": "Ci dispiace che tu ci lasci! ",
     "What You Need for Verification": "Cosa serve per la verifica ",
-    "What can we help you with, {username}?": "Come possiamo aiutarti, {username}?",
     "What does %(platformName)s do with this photo?": "Per cosa viene utilizzata la mia foto da %(platformName)s ? ",
     "What does this mean?": "Cosa significa? ",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Cosa devo fare se non posso visualizzare l'immagine della fotocamera o se non posso visualizzare la mia foto per determinare il lato visibile? ",
     "What if I have difficulty holding my ID in position relative to the camera?": "Cosa devo fare se ho difficolt\u00e0 a mantenere il documento di identit\u00e0 in posizione rispetto alla telecamera? ",
     "What if I have difficulty holding my head in position relative to the camera?": "Cosa devo fare se ho difficolt\u00e0 a mantenere la testa in posizione rispetto alla telecamera? ",
-    "What industry do you currently work in?": "In quale settore lavori attualmente? ",
-    "What industry do you want to work in?": "In quale settore vuoi lavorare? ",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Qual \u00e8 il livello di istruzione pi\u00f9 elevato raggiunto da uno dei tuoi genitori o tutori? ",
-    "What is the highest level of education that you have achieved so far?": "Qual \u00e8 il livello di istruzione pi\u00f9 elevato che hai raggiunto finora? ",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Qual \u00e8 stato il reddito totale complessivo, negli ultimi 12 mesi, di tutti i membri della tua famiglia? ",
     "What's Your Next Accomplishment?": "Quale \u00e8 il tuo prossimo risultato? ",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Quando gli studenti inviano una risposta a una valutazione, vedono immediatamente se la risposta \u00e8 corretta o errata e il punteggio ottenuto. ",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Quando il viso \u00e8 in posizione, utilizzare il pulsante Scatta la foto {icon} di seguito per scattare la foto. ",
@@ -2278,7 +2256,6 @@
     "Whole words": "Parole intere",
     "Why activate?": "Perch\u00e9 attivare? ",
     "Why does %(platformName)s need my photo?": "Perch\u00e9 %(platformName)s richiede la mia foto? ",
-    "Why does edX collect this information?": "Perch\u00e9 edX raccoglie queste informazioni?",
     "Width": "Larghezza",
     "Will Be Visible To:": "Sar\u00e0 visibile a:",
     "Words: {0}": "Parole: {0}",
@@ -2480,7 +2457,6 @@
     "endorsed %(time_ago)s by %(user)s": "promosso %(time_ago)s da %(user)s",
     "enter code here": "inserisci qui il codice",
     "enter link description here": "Inserisci qui la descrizione del link",
-    "finish later": "termina pi\u00f9 tardi",
     "follow this post": "segui questo post ",
     "for": "per ",
     "group configuration": "Configurazione del gruppo",
@@ -2494,7 +2470,6 @@
     "minute": "minuto",
     "minutes": "minuti",
     "name": "nome",
-    "next page": "pagina successiva",
     "off": "off",
     "on": "on",
     "one letter Friday\u0004F": "V",
@@ -2526,7 +2501,6 @@
     "team count": "totale gruppo",
     "text_word_{uniqueId}": "text_word_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "text_word_{uniqueId} title_word_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "rispondere nel modo pi\u00f9 veloce e utile possibile. ",
     "there is currently {numVotes} vote": [
       "attualmente \u00e8 presente {numVotes} voto",
       "attualmente sono presenti {numVotes} voti",
diff --git a/lms/static/js/i18n/mn/djangojs.js b/lms/static/js/i18n/mn/djangojs.js
index c733e16930..125410cbf4 100644
--- a/lms/static/js/i18n/mn/djangojs.js
+++ b/lms/static/js/i18n/mn/djangojs.js
@@ -126,9 +126,7 @@
     "Course Id": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u043a\u043e\u0434",
     "Course Name": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u043d\u044d\u0440",
     "Course Number": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0434\u0443\u0433\u0430\u0430\u0440",
-    "Course Number:": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0434\u0443\u0433\u0430\u0430\u0440:",
     "Course Outline": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0433\u0430\u0440\u0447\u0438\u0433",
-    "Course Run:": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u0445\u0443\u0433\u0430\u0446\u0430\u0430:",
     "Course Title": "\u0425\u0438\u0447\u044d\u044d\u043b\u0438\u0439\u043d \u043d\u044d\u0440",
     "Course is not yet visible to students.": "\u0425\u0438\u0447\u044d\u044d\u043b \u0441\u0443\u0440\u0430\u043b\u0446\u0430\u0433\u0447\u0434\u0430\u0434 \u0430\u0440\u0430\u0439 \u0445\u0430\u0440\u0430\u0433\u0434\u0430\u0445\u0433\u04af\u0439 \u0431\u0430\u0439\u0433\u0430\u0430. ",
     "Create": "\u04ae\u04af\u0441\u0433\u044d\u0445",
@@ -149,7 +147,6 @@
     "Delete table": "\u0425\u04af\u0441\u043d\u044d\u0433\u0442 \u0443\u0441\u0442\u0433\u0430\u0445",
     "Deleting": "\u0423\u0441\u0442\u0433\u0430\u0436 \u0431\u0430\u0439\u043d\u0430",
     "Description": "\u0422\u0430\u0439\u043b\u0431\u0430\u0440",
-    "Details": "\u0414\u044d\u043b\u0433\u044d\u0440\u044d\u043d\u0433\u04af\u0439",
     "Dimensions": "\u0425\u044d\u043c\u0436\u044d\u044d\u0441\u04af\u04af\u0434",
     "Discard Changes": "\u04e8\u04e9\u0440\u0447\u043b\u04e9\u043b\u0442\u0438\u0439\u0433 \u0431\u043e\u043b\u0438\u0443\u043b\u0430\u0445",
     "Discussion Home": "\u042d\u0445\u043b\u044d\u043b",
@@ -285,7 +282,6 @@
     "OpenAssessment Save Error": "\u041d\u044d\u044d\u043b\u0442\u0442\u044d\u0439 \u04af\u043d\u044d\u043b\u0433\u044d\u044d \u0425\u0430\u0434\u0433\u0430\u043b\u0430\u0433\u0434\u0430\u0445 \u0410\u043b\u0434\u0430\u0430",
     "Order History": "\u0417\u0430\u0445\u0438\u0430\u043b\u0433\u044b\u043d \u0442\u04af\u04af\u0445",
     "Organization": "\u0411\u0430\u0439\u0433\u0443\u0443\u043b\u043b\u0430\u0433\u0430",
-    "Organization:": "\u0411\u0430\u0439\u0433\u0443\u0443\u043b\u043b\u0430\u0433\u0430:",
     "Other": "\u0411\u0443\u0441\u0430\u0434",
     "Password": "\u041d\u0443\u0443\u0446 \u04af\u0433",
     "Play": "\u0422\u043e\u0433\u043b\u0443\u0443\u043b\u0430\u0445",
@@ -449,7 +445,7 @@
     "Very loud": "\u041c\u0430\u0448 \u0447\u0430\u043d\u0433\u0430",
     "Very low": "\u041c\u0430\u0448 \u0441\u0443\u043b",
     "View": "\u0425\u0430\u0440\u0430\u0445",
-    "View Live": "LMS-\u0434 \u04af\u0437\u044d\u0445",
+    "View Live": "LMS-\u0434 \u0445\u0430\u0440\u0430\u0445",
     "Volume": "\u0426\u0430\u0440\u0430\u0430",
     "Vote for good posts and responses": "\u0427\u0430\u043d\u0430\u0440\u0442\u0430\u0439 \u0431\u0438\u0447\u043b\u044d\u0433 \u0431\u043e\u043b\u043e\u043d \u0445\u0430\u0440\u0438\u0443\u043b\u0442\u0430\u0434 \u0441\u0430\u043d\u0430\u043b \u04e9\u0433\u04e9\u0445",
     "We couldn't sign you in.": "\u0422\u0430\u043d\u044b\u0433 \u0441\u0438\u0441\u0442\u0435\u043c\u0434 \u043d\u044d\u0432\u0442\u0440\u04af\u04af\u043b\u044d\u0445 \u0431\u043e\u043b\u043e\u043c\u0436\u0433\u04af\u0439 \u0431\u0430\u0439\u043d\u0430",
diff --git a/lms/static/js/i18n/pt-pt/djangojs.js b/lms/static/js/i18n/pt-pt/djangojs.js
index 6688e16f7b..477fc56bff 100644
--- a/lms/static/js/i18n/pt-pt/djangojs.js
+++ b/lms/static/js/i18n/pt-pt/djangojs.js
@@ -171,7 +171,6 @@
     "(Caption will be displayed when you start playing the video.)": "(As legendas ser\u00e3o exibidas quando iniciar a reprodu\u00e7\u00e3o do v\u00eddeo.)",
     "(Community TA)": "(Assistente de Ensino da Comunidade)",
     "(Optional)": "(Opcional)",
-    "(Read-only)": "(S\u00f3 leitura)",
     "(Required Field)": "(Campo Obrigat\u00f3rio)",
     "(Self-paced) Ended {end}": "(Ritmo Pr\u00f3prio) Terminado {end}",
     "(Self-paced) Ends {end}": "(Ritmo Pr\u00f3prio) Termina {end}",
@@ -322,7 +321,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Ocorreu um erro. Aguarde alguns minutos e tente novamente.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "Ocorreu um erro ao recuperar o seu email. Por favor, tente novamente mais tarde e contate o suporte t\u00e9cnico se o problema persistir.",
     "An error occurred when signing you in to %s.": "Ocorreu um erro ao iniciar sess\u00e3o em %s.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "Ocorreu um erro ao tentar recuperar ou salvar as informa\u00e7\u00f5es abaixo. Por favor, tente novamente mais tarde.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Um erro ocorreu ao procurar a ades\u00e3o \u00e0 equipa. Tente atualizar a p\u00e1gina.",
     "An error occurred while removing the member from the team. Try again.": "Ocorreu um erro ao remover um membro da equipa. Tente novamente.",
     "An error occurred.": "Ocorreu um erro.",
@@ -409,7 +407,6 @@
     "Bottom": "Fundo",
     "Browse": "Procurar",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Explore os cursos recentemente lan\u00e7ados e veja o que h\u00e1 de novo sobre os seus temas favoritos",
-    "Browsing": "Navega\u00e7\u00e3o",
     "Bulk Exceptions": "Exce\u00e7\u00f5es em massa",
     "Bullet list": "Lista de marcadores",
     "Bulleted List (Ctrl+U)": "Lista de Marcadores(Ctrl+U)",
@@ -590,9 +587,7 @@
     "Course Name": "Nome do curso",
     "Course Number": "C\u00f3digo do Curso",
     "Course Number Override": "Substitui\u00e7\u00e3o do C\u00f3digo do Curso",
-    "Course Number:": "N\u00famero do Curso:",
     "Course Outline": "Descri\u00e7\u00e3o do Curso",
-    "Course Run:": "Curso de Forma\u00e7\u00e3o:",
     "Course Start": "Data de In\u00edcio do Curso",
     "Course Title": "T\u00edtulo do Curso",
     "Course Title Override": "Substitui\u00e7\u00e3o do T\u00edtulo do Curso",
@@ -604,7 +599,6 @@
     "Create": "Criar",
     "Create Account": "Criar Conta",
     "Create Re-run": "Criar Nova Edi\u00e7\u00e3o do Curso",
-    "Create Support Ticket": "Criar Pedido de Apoio",
     "Create a New Team": "Criar nova equipa",
     "Create a content group": "Criar um grupo de conte\u00fado",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Crie uma nova equipa se n\u00e3o conseguir encontrar uma equipa existente para se juntar, ou se pretende aprender com os amigos que conhece.",
@@ -674,7 +668,6 @@
     "Describe ": "Descreva ",
     "Description": "Descri\u00e7\u00e3o",
     "Description of the certificate": "Descri\u00e7\u00e3o do Certificado",
-    "Details": "Detalhes",
     "Device with Camera": "Dispositivo com C\u00e2mara",
     "Dimensions": "Dimens\u00f5es",
     "Disc": "Disco",
@@ -886,7 +879,6 @@
     "Find next": "Encontrar o seguinte",
     "Find previous": "Localizar anterior",
     "Finish": "Terminar",
-    "Finish later": "Terminar mais tarde",
     "First time here?": "\u00c9 a primeira vez aqui?",
     "Follow": "Seguir",
     "Follow or unfollow posts": "Siga ou deixe de seguir publica\u00e7\u00f5es",
@@ -939,7 +931,6 @@
     "H Align": "Alinhamento horizontal",
     "HTML preview of post": "HTML pr\u00e9-visualiza\u00e7\u00e3o da publica\u00e7\u00e3o",
     "HTML source code": "C\u00f3digo-fonte HTML",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "J\u00e1 serviu, em ativo, nas For\u00e7as Armadas, Reservas ou Guarda Nacional dos EUA?",
     "Header": "Cabe\u00e7alho",
     "Header 1": "Cabe\u00e7alho 1",
     "Header 2": "Cabe\u00e7alho 2",
@@ -1142,7 +1133,6 @@
     "Loading more threads": "A carregar mais t\u00f3picos",
     "Loading posts list": "A carregar lista de publica\u00e7\u00f5es",
     "Loading your courses": "Carregando os seus cursos",
-    "Loading...": "Carregando...",
     "Location": "Local",
     "Location in Course": "Localiza\u00e7\u00e3o no Curso",
     "Lock this asset": "Bloquear este ficheiro",
@@ -1203,7 +1193,6 @@
     "Name of the signatory": "Nome do Signat\u00e1rio",
     "Name or short description of the configuration": "Nome ou breve descri\u00e7\u00e3o da configura\u00e7\u00e3o",
     "Navigate up": "Subir",
-    "Need help logging in?": "Precisa de ajuda para iniciar sess\u00e3o?",
     "Need help signing in?": "Precisa de ajuda para entrar?",
     "Need other help signing in?": "Precisa de outra ajuda para entrar?",
     "Needs verified certificate ": "Necessita de certificado validado ",
@@ -1314,7 +1303,6 @@
     "Organization ": "Organiza\u00e7\u00e3o",
     "Organization Name": "Nome da Organiza\u00e7\u00e3o",
     "Organization of the signatory": "Organiza\u00e7\u00e3o do signat\u00e1rio",
-    "Organization:": "Organiza\u00e7\u00e3o:",
     "Other": "Outro",
     "Other sign-in issues": "Outros problemas sobre iniciar sess\u00e3o",
     "Overall Score": "Pontua\u00e7\u00e3o geral",
@@ -1456,7 +1444,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "As perguntas levantam quest\u00f5es que precisam de uma resposta. Os debates partilham ideias e iniciam conversas. (Obrigat\u00f3rio)",
     "Queued": "Em fila de espera",
     "REMAINING COURSES": "RESTANTES CURSOS",
-    "Re-run Course": "Reexecutar Curso",
     "Read More": "Ler Mais",
     "Read more": "Ler mais",
     "Ready To Start": "Pronto Para Come\u00e7ar",
@@ -1531,7 +1518,6 @@
     "Return to Export": "Regressar a Exporta\u00e7\u00e3o",
     "Return to Your Dashboard": "Regressar ao Painel de Controlo",
     "Return to all posts": "Regressar a todos os artigos",
-    "Return to my dashboard": "Voltar ao meu painel",
     "Return to team listing": "Regressar \u00e0 listagem da equipa",
     "Review Policy Exception": "Excep\u00e7\u00e3o \u00e0 Pol\u00edtica de Revis\u00e3o",
     "Review Rules": "Regras de Revis\u00e3o",
@@ -1583,14 +1569,12 @@
     "Select a subject for your support request.": "Selecione um assunto para o seu pedido de apoio.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "Selecione o tempo de aloca\u00e7\u00e3o para o exame. Se for mais de 24 horas, digite a quantidade de tempo. Pode conceder tempo adicional aos estudantes para completarem o exame atrav\u00e9s do painel do formador.",
     "Select all": "Selecionar tudo",
-    "Select employment status": "Selecione o estatuto profissional.",
     "Select fidelity": "Selecionar fidelidade",
     "Select language": "Selecionar idioma",
     "Select one or more groups:": "Selecione um ou mais grupos:",
     "Select the course-wide discussion topics that you want to divide.": "Selecionar os t\u00f3picos de debate de todo o curso que pretende dividir.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Selecione o fuso hor\u00e1rio para exibir as datas do curso. Se n\u00e3o for especificado um fuso hor\u00e1rio, as datas do curso, incluindo os prazos de atribui\u00e7\u00e3o, ser\u00e3o exibidos no fuso hor\u00e1rio local do seu navegador.",
     "Select turnaround": "Selecione uma alernativa",
-    "Selected blocks": "Blocos selecionados",
     "Selected tab": "Separador selecionado",
     "Self": "Auto",
     "Send to:": "Enviar para:",
@@ -2167,7 +2151,7 @@
     "View Cohort": "Ver Grupo",
     "View Course": "Ver Curso",
     "View Current Team Memberships": "Ver Equipas de Membros Actuais",
-    "View Live": "Ver em directo",
+    "View Live": "Visualizar ao vivo",
     "View Program Record": "Ver Registo do Programa",
     "View Report": "Ver Relat\u00f3rio",
     "View Teams in the {topic_name} Topic": "Ver equipas no {topic_name} T\u00f3pico",
@@ -2213,17 +2197,11 @@
     "Weight of Total Grade": "Peso da Classifica\u00e7\u00e3o Total",
     "We\u2019re sorry to see you go!": "Temos pena que se v\u00e1 embora!",
     "What You Need for Verification": "O que \u00e9 necess\u00e1rio para a Valida\u00e7\u00e3o",
-    "What can we help you with, {username}?": "Em que podemos ajud\u00e1-lo, {username}?",
     "What does %(platformName)s do with this photo?": "O que far\u00e1 a %(platformName)s com esta fotografia?",
     "What does this mean?": "O que significa isto?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "E se n\u00e3o conseguir ver a imagem da c\u00e2mara, ou se eu n\u00e3o conseguir ver a minha fotografia para determinar qual lado \u00e9 vis\u00edvel?",
     "What if I have difficulty holding my ID in position relative to the camera?": "E se eu tiver dificuldade em manter o meu documento de identifica\u00e7\u00e3o em posi\u00e7\u00e3o em rela\u00e7\u00e3o \u00e0 c\u00e2mara?",
     "What if I have difficulty holding my head in position relative to the camera?": "E se eu tiver dificuldade em manter minha cabe\u00e7a em posi\u00e7\u00e3o em rela\u00e7\u00e3o \u00e0 c\u00e2mara?",
-    "What industry do you currently work in?": "Em que sector trabalha atualmente?",
-    "What industry do you want to work in?": "Em que sector pretende trabalhar?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Qual o n\u00edvel mais alto de educa\u00e7\u00e3o que um dos seus pais ou tutores atingiu?",
-    "What is the highest level of education that you have achieved so far?": "Qual o n\u00edvel mais alto de educa\u00e7\u00e3o que atingiu at\u00e9 agora?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "Qual foi o rendimento total combinado, de todos os seus membros da sua fam\u00edlia, durante os \u00faltimos 12 meses? ",
     "What's Your Next Accomplishment?": "Qual \u00e9 a Sua Pr\u00f3xima Realiza\u00e7\u00e3o?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Quando os estudantes submetem uma resposta a uma avalia\u00e7\u00e3o, podem confirmar imediatamente se a resposta est\u00e1 correta ou incorreta e qual a pontua\u00e7\u00e3o recebida.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Quando a sua cara estiver em posi\u00e7\u00e3o, use o bot\u00e3o Tirar foto {icon} abaixo para tirar uma fotografia.",
@@ -2232,7 +2210,6 @@
     "Whole words": "Palavras completas",
     "Why activate?": "Porqu\u00ea ativar?",
     "Why does %(platformName)s need my photo?": "Porque \u00e9 que a %(platformName)s necessita da minha fotografia?",
-    "Why does edX collect this information?": "Por que \u00e9 que a edX recolhe estas informa\u00e7\u00f5es?",
     "Width": "Largura",
     "Will Be Visible To:": "Estar\u00e1 vis\u00edvel para:",
     "Words: {0}": "Palavras: {0}",
@@ -2421,7 +2398,6 @@
     "endorsed %(time_ago)s by %(user)s": "aprovado %(time_ago)s por %(user)s",
     "enter code here": "introduza o c\u00f3digo aqui",
     "enter link description here": "inserir descri\u00e7\u00e3o do link aqui",
-    "finish later": "terminar mais tarde",
     "follow this post": "siga esta publica\u00e7\u00e3o",
     "for": "para",
     "group configuration": "configura\u00e7\u00e3o de grupo",
@@ -2435,7 +2411,6 @@
     "minute": "minuto",
     "minutes": "minutos",
     "name": "nome",
-    "next page": "p\u00e1gina seguinte",
     "off": "desligado",
     "on": "ligado",
     "one letter Friday\u0004F": "S",
@@ -2467,7 +2442,6 @@
     "team count": "contagem de equipa",
     "text_word_{uniqueId}": "texto_palavra_{uniqueId}",
     "text_word_{uniqueId} title_word_{uniqueId}": "texto_palavra_{uniqueId} t\u00edtulo_palavra_{uniqueId}",
-    "the more quickly and helpfully we can respond!": "O mais r\u00e1pido e \u00fatil que conseguimos responder!",
     "there is currently {numVotes} vote": [
       "existe atualmente {numVotes} voto",
       "existem atualmente {numVotes} votos",
diff --git a/lms/static/js/i18n/rtl/djangojs.js b/lms/static/js/i18n/rtl/djangojs.js
index fd178a6ae9..316b90b64c 100644
--- a/lms/static/js/i18n/rtl/djangojs.js
+++ b/lms/static/js/i18n/rtl/djangojs.js
@@ -403,6 +403,7 @@
     "Code block": "\u023b\u00f8d\u01dd bl\u00f8\u0254\u029e",
     "Cohort Assignment Method": "\u023b\u00f8\u0265\u00f8\u0279\u0287 \u023ass\u1d09\u0183n\u026f\u01ddn\u0287 M\u01dd\u0287\u0265\u00f8d",
     "Cohort Name": "\u023b\u00f8\u0265\u00f8\u0279\u0287 N\u0250\u026f\u01dd",
+    "Cohort assignment not allowed: {email_or_username}": "\u023b\u00f8\u0265\u00f8\u0279\u0287 \u0250ss\u1d09\u0183n\u026f\u01ddn\u0287 n\u00f8\u0287 \u0250ll\u00f8\u028d\u01ddd: {email_or_username}",
     "Cohorts": "\u023b\u00f8\u0265\u00f8\u0279\u0287s",
     "Cohorts Disabled": "\u023b\u00f8\u0265\u00f8\u0279\u0287s \u0110\u1d09s\u0250bl\u01ddd",
     "Cohorts Enabled": "\u023b\u00f8\u0265\u00f8\u0279\u0287s \u0246n\u0250bl\u01ddd",
@@ -577,9 +578,7 @@
     "Download": "\u0110\u00f8\u028dnl\u00f8\u0250d",
     "Download Memberships": "\u0110\u00f8\u028dnl\u00f8\u0250d M\u01dd\u026fb\u01dd\u0279s\u0265\u1d09ds",
     "Download Transcript for Editing": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0166\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u00f8\u0279 \u0246d\u1d09\u0287\u1d09n\u0183",
-    "Download URL": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0244\u024c\u0141",
     "Download available encodings (.csv)": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0250\u028c\u0250\u1d09l\u0250bl\u01dd \u01ddn\u0254\u00f8d\u1d09n\u0183s (.\u0254s\u028c)",
-    "Download the user's certificate": "\u0110\u00f8\u028dnl\u00f8\u0250d \u0287\u0265\u01dd ns\u01dd\u0279's \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd",
     "Draft (Never published)": "\u0110\u0279\u0250\u025f\u0287 (N\u01dd\u028c\u01dd\u0279 dnbl\u1d09s\u0265\u01ddd)",
     "Draft (Unpublished changes)": "\u0110\u0279\u0250\u025f\u0287 (\u0244ndnbl\u1d09s\u0265\u01ddd \u0254\u0265\u0250n\u0183\u01dds)",
     "Draft saved on {lastSavedStart}{editedOn}{lastSavedEnd} by {editedByStart}{editedBy}{editedByEnd}": "\u0110\u0279\u0250\u025f\u0287 s\u0250\u028c\u01ddd \u00f8n {lastSavedStart}{editedOn}{lastSavedEnd} b\u028e {editedByStart}{editedBy}{editedByEnd}",
@@ -1094,7 +1093,6 @@
     "Not Graded": "N\u00f8\u0287 \u01e4\u0279\u0250d\u01ddd",
     "Not Supported": "N\u00f8\u0287 Sndd\u00f8\u0279\u0287\u01ddd",
     "Not able to set passing grade to less than %(minimum_grade_cutoff)s%.": "N\u00f8\u0287 \u0250bl\u01dd \u0287\u00f8 s\u01dd\u0287 d\u0250ss\u1d09n\u0183 \u0183\u0279\u0250d\u01dd \u0287\u00f8 l\u01ddss \u0287\u0265\u0250n %(minimum_grade_cutoff)s%.",
-    "Not available": "N\u00f8\u0287 \u0250\u028c\u0250\u1d09l\u0250bl\u01dd",
     "Not divided": "N\u00f8\u0287 d\u1d09\u028c\u1d09d\u01ddd",
     "Not in Use": "N\u00f8\u0287 \u1d09n \u0244s\u01dd",
     "Not selected": "N\u00f8\u0287 s\u01ddl\u01dd\u0254\u0287\u01ddd",
diff --git a/lms/static/js/i18n/ru/djangojs.js b/lms/static/js/i18n/ru/djangojs.js
index 5b212d4091..a3327ceec2 100644
--- a/lms/static/js/i18n/ru/djangojs.js
+++ b/lms/static/js/i18n/ru/djangojs.js
@@ -522,7 +522,6 @@
     "Describe ": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
     "Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
     "Description of the certificate": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430",
-    "Details": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438",
     "Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440\u044b",
     "Disc": "\u0434\u0438\u0441\u043a",
     "Discard Changes": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f",
diff --git a/lms/static/js/i18n/sk/djangojs.js b/lms/static/js/i18n/sk/djangojs.js
index 667f58c9c7..ab0fce0ba9 100644
--- a/lms/static/js/i18n/sk/djangojs.js
+++ b/lms/static/js/i18n/sk/djangojs.js
@@ -153,7 +153,6 @@
     "Deleted Group": "Zmazan\u00e1 skupina",
     "Deleting this %(item_display_name)s is permanent and cannot be undone.": "Odstr\u00e1nenie %(item_display_name)s je trval\u00e9 a nie je mo\u017en\u00e9 ho vr\u00e1ti\u0165 sp\u00e4\u0165.",
     "Description": "Popis",
-    "Details": "Podrobnosti",
     "Dimensions": "Rozmery",
     "Disc": "Disk",
     "Discard Changes": "Zahodi\u0165 zmeny",
diff --git a/lms/static/js/i18n/tr-tr/djangojs.js b/lms/static/js/i18n/tr-tr/djangojs.js
index 8e097b9d5e..2c89b57353 100644
--- a/lms/static/js/i18n/tr-tr/djangojs.js
+++ b/lms/static/js/i18n/tr-tr/djangojs.js
@@ -121,7 +121,6 @@
     "(Caption will be displayed when you start playing the video.)": "(Altyaz\u0131 videoyu oynatmaya ba\u015flad\u0131\u011f\u0131n\u0131zda g\u00f6sterilecek.)",
     "(Community TA)": "(Topluluk Asistan\u0131)",
     "(Optional)": "(\u0130ste\u011fe Ba\u011fl\u0131)",
-    "(Read-only)": "(Salt-okunur)",
     "(Required Field)": "(Gerekli Alan)",
     "(Self-paced) Ended {end}": "(Kendi kendine) Bitti {end}",
     "(Self-paced) Ends {end}": "(Kendi kendine) Biti\u015f {end}",
@@ -270,7 +269,6 @@
     "An error has occurred. Wait a few minutes, and then try again.": "Bir hata olu\u015ftu. Birka\u00e7 dakika bekleyin, ve ondan sonra tekrar deneyin.",
     "An error occurred retrieving your email. Please try again later, and contact technical support if the problem persists.": "E-posta adresinizi al\u0131rken bir hata olu\u015ftu. L\u00fctfen daha sonra tekrar deneyiniz, ve e\u011fer problem devam ederse teknik destek ile ileti\u015fime ge\u00e7iniz.",
     "An error occurred when signing you in to %s.": "%s ortam\u0131nda oturum a\u00e7arken hata olu\u015ftu.",
-    "An error occurred while attempting to retrieve or save the information below. Please try again later.": "A\u015fa\u011f\u0131daki bilgiyi \u00e7ekmeye ya da kaydetmeye \u00e7al\u0131\u015f\u0131rken bir hata ger\u00e7ekle\u015fti. Bir s\u00fcre sonra l\u00fctfen tekrar deneyin.",
     "An error occurred while looking up team membership. Try refreshing the page.": "Tak\u0131m \u00fcyeli\u011fine aran\u0131rken bir hata olu\u015ftu. Sayfay\u0131 yenilemeyi deneyin.",
     "An error occurred while removing the member from the team. Try again.": "Tak\u0131mdan \u00fcyeyi \u00e7\u0131kart\u0131rken bir hata olu\u015ftu. Tekrar deneyin.",
     "An error occurred.": "Bir hata meydana geldi.",
@@ -356,7 +354,6 @@
     "Bottom": "Alt",
     "Browse": "G\u00f6z at",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "Yeni a\u00e7\u0131lm\u0131\u015f dersleri taray\u0131n ve ilginizi \u00e7eken konularda ne yenilikler var g\u00f6r\u00fcnt\u00fcleyin",
-    "Browsing": "G\u00f6z at\u0131l\u0131yor",
     "Bulk Exceptions": "Toplu \u0130stisnalar",
     "Bullet list": "Madde imli liste",
     "Bulleted List (Ctrl+U)": "Noktal\u0131 Liste (Ctrl+U)",
@@ -531,9 +528,7 @@
     "Course Name": "Ders \u0130smi",
     "Course Number": "Ders Numaras\u0131",
     "Course Number Override": "Ders Numaras\u0131n\u0131 Ge\u00e7ersiz K\u0131l",
-    "Course Number:": "Ders Numaras\u0131:",
     "Course Outline": "Ders Tasla\u011f\u0131",
-    "Course Run:": "Ders Yay\u0131n\u0131:",
     "Course Start": "Ders Ba\u015flang\u0131c\u0131",
     "Course Title": "Ders Ba\u015fl\u0131\u011f\u0131",
     "Course Title Override": "Ders Ba\u015fl\u0131\u011f\u0131n\u0131 Ge\u00e7ersiz K\u0131l",
@@ -545,7 +540,6 @@
     "Create": "Olu\u015ftur",
     "Create Account": "Hesap Olu\u015ftur",
     "Create Re-run": "Yeniden \u00c7al\u0131\u015ft\u0131rma Olu\u015ftur",
-    "Create Support Ticket": "Destek Talebi Olu\u015ftur",
     "Create a New Team": "Yeni Bir Tak\u0131m Olu\u015ftur",
     "Create a content group": "\u0130\u00e7erik grubu yarat",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "Kat\u0131lacak bir tak\u0131m bulamad\u0131ysan\u0131z, ya da tan\u0131d\u0131\u011f\u0131n\u0131z arkada\u015flar\u0131n\u0131zla \u00f6\u011frenmek istiyorsan\u0131z yeni bir tak\u0131m olu\u015fturun.",
@@ -614,7 +608,6 @@
     "Describe ": "Tan\u0131mla",
     "Description": "A\u00e7\u0131klama",
     "Description of the certificate": "Sertifikan\u0131n a\u00e7\u0131klamas\u0131",
-    "Details": "Ayr\u0131nt\u0131lar",
     "Device with Camera": "Kameral\u0131 Cihaz",
     "Dimensions": "Boyutlar",
     "Disc": "Disk",
@@ -819,7 +812,6 @@
     "Find next": "Sonrakini bul",
     "Find previous": "\u00d6ncekini bul",
     "Finish": "Bitir",
-    "Finish later": "Sonra tamamla",
     "First time here?": "\u0130lk kez mi buradas\u0131n\u0131z?",
     "Follow": "Takip et",
     "Follow or unfollow posts": "G\u00f6nderileri takip et veya takipten \u00e7\u0131k",
@@ -873,7 +865,6 @@
     "H Align": "H Hizalama",
     "HTML preview of post": "G\u00f6nderinin HTML \u00f6nizlemesi",
     "HTML source code": "HTML kaynak kodu",
-    "Have you ever served on active duty in the U.S. Armed Forces, Reserves, or National Guard?": "Bug\u00fcne dek ABD Ordusu, Yedek Kuvvetler ya da Ulusal Muhaf\u0131zlarda hizmet ettiniz mi?",
     "Header": "\u00dcst bilgi ",
     "Header 1": "\u00dcst bilgi 1",
     "Header 2": "\u00dcst bilgi 2",
@@ -1071,7 +1062,6 @@
     "Loading more threads": "Daha fazla ileti dizisi y\u00fckl\u00fcyor",
     "Loading posts list": "\u0130leti listesi y\u00fckleniyor",
     "Loading your courses": "Dersleriniz y\u00fckleniyor",
-    "Loading...": "Y\u00fckl\u00fcyor...",
     "Location": "Yer",
     "Location in Course": "Dersteki Konum",
     "Lock this asset": "Bu veriyi kitle",
@@ -1131,7 +1121,6 @@
     "Name of the signatory": "\u0130mza sahibinin ad\u0131",
     "Name or short description of the configuration": "Yap\u0131land\u0131rman\u0131n ad\u0131 ya da k\u0131sa a\u00e7\u0131klamas\u0131",
     "Navigate up": "Yukar\u0131 git",
-    "Need help logging in?": "Oturum a\u00e7mak i\u00e7in yard\u0131ma m\u0131 ihtiyac\u0131n\u0131z var?",
     "Need help signing in?": "Giri\u015f yapmak i\u00e7in yard\u0131ma m\u0131 ihtiyac\u0131n\u0131z var?",
     "Need other help signing in?": "Giri\u015f yapmak i\u00e7in farkl\u0131 bir yard\u0131ma m\u0131 ihtiyac\u0131n\u0131z var?",
     "Needs verified certificate ": "Onayl\u0131 sertifika gerekiyor",
@@ -1238,7 +1227,6 @@
     "Organization ": "Kurum",
     "Organization Name": "Kurum Ad\u0131",
     "Organization of the signatory": "\u0130mza sahibinin kurumu",
-    "Organization:": "Kurum:",
     "Other": "Di\u011fer",
     "Other sign-in issues": "Di\u011fer giri\u015f sorunlar\u0131",
     "Overall Score": "Toplam Skor",
@@ -1382,7 +1370,6 @@
     "Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)": "Sorular cevap gerektiren konular\u0131 ileri s\u00fcrer. Tart\u0131\u015fmalar fikirleri payla\u015f\u0131r ve sohbeti ba\u015flat\u0131r. (Gerekli)",
     "Queued": "Kuyru\u011fa Al\u0131nd\u0131",
     "REMAINING COURSES": "KALAN DERSLER",
-    "Re-run Course": "Dersi Yeniden \u00c7al\u0131\u015ft\u0131r",
     "Read More": "Daha Fazlas\u0131 \u0130\u00e7in",
     "Read more": "Daha fazlas\u0131",
     "Ready To Start": "Ba\u015flamaya Haz\u0131r",
@@ -1458,7 +1445,6 @@
     "Return to Export": "D\u0131\u015fa Aktarmaya Geri D\u00f6n",
     "Return to Your Dashboard": "Panele Geri D\u00f6n",
     "Return to all posts": "T\u00fcm g\u00f6nderilere d\u00f6n",
-    "Return to my dashboard": "Panelime geri d\u00f6n",
     "Return to team listing": "Tak\u0131m listesine geri d\u00f6n",
     "Review Policy Exception": "\u0130nceleme Politikas\u0131 \u0130stisnas\u0131",
     "Review Rules": "Kurallar\u0131 G\u00f6zden Ge\u00e7ir",
@@ -1509,12 +1495,10 @@
     "Select a subject for your support request.": "Destek talebiniz i\u00e7in bir konu se\u00e7in.",
     "Select a time allotment for the exam. If it is over 24 hours, type in the amount of time. You can grant individual learners extra time to complete the exam through the Instructor Dashboard.": "S\u0131nav i\u00e7in ayr\u0131lan s\u00fcreyi se\u00e7in. E\u011fer 24 saatten fazlaysa, s\u00fcreyi yazarak girin. E\u011fitmen Paneli arac\u0131l\u0131\u011f\u0131yla belli \u00f6\u011frencilere s\u0131nav\u0131 tamamlamalar\u0131 i\u00e7in daha fazla s\u00fcre tan\u0131mlayabilirsiniz.",
     "Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
-    "Select employment status": "Meslek durumunu se\u00e7in",
     "Select language": "Dil Se\u00e7imi",
     "Select one or more groups:": "Bir ya da daha fazla grup se\u00e7in:",
     "Select the course-wide discussion topics that you want to divide.": "B\u00f6lmek istedi\u011finiz ders-geneli tart\u0131\u015fma konular\u0131n\u0131 se\u00e7in.",
     "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser's local time zone.": "Ders tarihleri g\u00f6sterimi i\u00e7in saat dilimini se\u00e7in. Herhangi bir saat dilimini se\u00e7memeniz durumunda, g\u00f6rev teslimleri d\u00e2hil olmak \u00fczere t\u00fcm ders tarihleri, web taray\u0131c\u0131n\u0131z\u0131n yerel zaman\u0131na g\u00f6re g\u00f6sterilecektir. ",
-    "Selected blocks": "Se\u00e7ili blocklar",
     "Selected tab": "Se\u00e7ili sekme",
     "Self": "Kendin",
     "Send to:": "G\u00f6nderilecek ki\u015fi:",
@@ -2111,17 +2095,11 @@
     "Weight of Total Grade": "Toplam Not A\u011f\u0131rl\u0131\u011f\u0131",
     "We\u2019re sorry to see you go!": "Gitti\u011finizi g\u00f6rmek bizi \u00fcz\u00fcyor!",
     "What You Need for Verification": "Do\u011frulama \u0130\u00e7in Gerekenler",
-    "What can we help you with, {username}?": "Sana nas\u0131l yard\u0131mc\u0131 olabiliriz, {username}?",
     "What does %(platformName)s do with this photo?": "%(platformName)s bu foto\u011fraf ile ne yapar?",
     "What does this mean?": "Ne anlama geliyor?",
     "What if I can't see the camera image, or if I can't see my photo do determine which side is visible?": "Ya kamera g\u00f6r\u00fcnt\u00fcs\u00fcn\u00fc g\u00f6remezsem veya hangi taraf\u0131n g\u00f6r\u00fcn\u00fcr oldu\u011funu belirlemeye \u00e7al\u0131\u015f\u0131rken foto\u011fraf\u0131m\u0131 g\u00f6remezsem?",
     "What if I have difficulty holding my ID in position relative to the camera?": "Kimli\u011fimi kameraya g\u00f6re yerinde tutmakta zorluk \u00e7ekersem ne olur? ",
     "What if I have difficulty holding my head in position relative to the camera?": "Ba\u015f\u0131m\u0131 kameraya g\u00f6re pozisyonda tutmakta zorluk \u00e7ekiyorsam ne olur? ",
-    "What industry do you currently work in?": "\u015eu anda hangi sekt\u00f6rde \u00e7al\u0131\u015f\u0131yorsunuz?",
-    "What industry do you want to work in?": "Gelecekte hangi sekt\u00f6rde \u00e7al\u0131\u015fmak istiyorsunuz?",
-    "What is the highest level of education that any of your parents or guardians have achieved?": "Ebeveyn ya da velilerinizin \u015fimdiye kadar ula\u015ft\u0131\u011f\u0131 en y\u00fcksek e\u011fitim seviyesi nedir?",
-    "What is the highest level of education that you have achieved so far?": "\u015eimdiye kadar ula\u015ft\u0131\u011f\u0131n\u0131z en y\u00fcksek e\u011fitim seviyesi nedir?",
-    "What was the total combined income, during the last 12 months, of all members of your family? ": "T\u00fcm aile \u00fcyelerinizin son 12 ayl\u0131k toplam geliri, ne kadard\u0131?",
     "What's Your Next Accomplishment?": "Bir Sonraki Ba\u015far\u0131n Ne Olacak?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "\u00d6\u011frenciler bir de\u011ferlendirmeye cevap g\u00f6nderdi\u011finde, de\u011ferlendirmedeki cevaplar\u0131n\u0131n do\u011fru ya da yanl\u0131\u015f olup olmad\u0131\u011f\u0131n\u0131 ve ald\u0131klar\u0131 notu hemen g\u00f6rebilirler.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Y\u00fcz\u00fcn\u00fcz \u00e7er\u00e7eve i\u00e7indeyken, a\u015fa\u011f\u0131daki Foto\u011fraf \u00c7ek {icon} d\u00fc\u011fmesini kullanarak foto\u011fraf\u0131n\u0131z\u0131 \u00e7ekin.",
@@ -2130,7 +2108,6 @@
     "Whole words": "Tam s\u00f6zc\u00fckler",
     "Why activate?": "Neden etkinle\u015ftirme ad\u0131m\u0131?",
     "Why does %(platformName)s need my photo?": "Ni\u00e7in %(platformName)s benim foto\u011fraf\u0131ma gerek duyuyor?",
-    "Why does edX collect this information?": "edX neden bu bilgiyi topluyor?",
     "Width": "Geni\u015flik",
     "Will Be Visible To:": "\u015eu Ki\u015filere G\u00f6r\u00fcnecek:",
     "Words: {0}": "Kelimeler: {0}",
@@ -2327,7 +2304,6 @@
     "endorsed %(time_ago)s by %(user)s": "%(user)s kullan\u0131c\u0131 taraf\u0131ndan %(time_ago)s \u00f6nce desteklenmi\u015f",
     "enter code here": "kodu buraya girin",
     "enter link description here": "ba\u011flant\u0131 a\u00e7\u0131klamas\u0131n\u0131 buraya girin",
-    "finish later": "sonra tamamla",
     "follow this post": "bu iletiyi takip et",
     "for": "i\u00e7in",
     "group configuration": "grup ayar\u0131",
@@ -2341,7 +2317,6 @@
     "minute": "dakika",
     "minutes": "dakika",
     "name": "isim",
-    "next page": "sonraki sayfa",
     "off": "kapal\u0131",
     "on": "a\u00e7\u0131k",
     "one letter Friday\u0004F": "C",
@@ -2370,7 +2345,6 @@
     "strong text": "kal\u0131n metin",
     "subsection": "altb\u00f6l\u00fcm",
     "team count": "tak\u0131m say\u0131s\u0131",
-    "the more quickly and helpfully we can respond!": "o kadar h\u0131zl\u0131 ve yard\u0131mc\u0131 bir \u015fekilde yan\u0131t verebiliriz!",
     "unanswered question": "cevaplanmayan soru",
     "unit": "\u00fcnite",
     "unsubmitted": "g\u00f6nderilmedi",
diff --git a/lms/static/js/i18n/uk/djangojs.js b/lms/static/js/i18n/uk/djangojs.js
index 88de8b4656..6d1bd8c71b 100644
--- a/lms/static/js/i18n/uk/djangojs.js
+++ b/lms/static/js/i18n/uk/djangojs.js
@@ -84,7 +84,6 @@
     "(Add signatories for a certificate)": "(\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u0456\u0434\u043f\u0438\u0441\u0430\u043d\u0442\u0456\u0432 \u0434\u043b\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0456\u043a\u0430\u0442\u0443)",
     "(Caption will be displayed when you start playing the video.)": "(\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u0438\u043c\u0443\u0442\u044c\u0441\u044f, \u043a\u043e\u043b\u0438 \u0412\u0438 \u043f\u043e\u0447\u043d\u0435\u0442\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e.)",
     "(Optional)": "(\u043d\u0435\u043e\u0431\u043e\u0432'\u044f\u0437\u043a\u043e\u0432\u043e)",
-    "(Read-only)": "(\u041b\u0438\u0448\u0435 \u0434\u043b\u044f \u0447\u0438\u0442\u0430\u043d\u043d\u044f)",
     "(Required Field)": "(\u041e\u0431\u043e\u0432'\u044f\u0437\u043a\u043e\u0432\u0435 \u043f\u043e\u043b\u0435)",
     "(Self-paced) Ended {end}": " (\u0421\u0430\u043c\u043e\u0441\u0442\u0456\u0439\u043d\u0456 \u043a\u0443\u0440\u0441\u0438) \u0417\u0430\u043a\u0456\u043d\u0447\u0438\u043b\u0438\u0441\u044f {end}",
     "(Self-paced) Ends {end}": "\u0417\u0430\u043a\u0456\u043d\u0447\u0443\u044e\u0442\u044c\u0441\u044f {end} (\u0421\u0430\u043c\u043e\u0441\u0442\u0456\u0439\u043d\u0456 \u043a\u0443\u0440\u0441\u0438) ",
@@ -340,7 +339,6 @@
     "Course Name": "\u041d\u0430\u0437\u0432\u0430 \u043a\u0443\u0440\u0441\u0443",
     "Course Number": "\u041d\u043e\u043c\u0435\u0440 \u041a\u0443\u0440\u0441\u0443",
     "Course Number Override": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u043e\u043c\u0435\u0440 \u043a\u0443\u0440\u0441\u0443",
-    "Course Number:": "\u041d\u043e\u043c\u0435\u0440 \u041a\u0443\u0440\u0441\u0443:",
     "Course Outline": "\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u043a\u0443\u0440\u0441\u0443",
     "Course Title": "\u041d\u0430\u0437\u0432\u0430 \u043a\u0443\u0440\u0441\u0443",
     "Course Title Override": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430\u0437\u0432\u0443 \u043a\u0443\u0440\u0441\u0443",
@@ -389,7 +387,6 @@
     "Deleting this {xblock_type} is permanent and cannot be undone.": "\u0412\u0438\u0434\u0430\u043b\u0435\u043d\u043d\u044f \u0446\u044c\u043e\u0433\u043e  {xblock_type} \u0454 \u0431\u0435\u0437\u043f\u043e\u0432\u043e\u0440\u043e\u0442\u043d\u0456\u043c \u0456 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 \u0441\u043a\u0430\u0441\u043e\u0432\u0430\u043d\u0435. ",
     "Describe ": "\u041e\u043f\u0438\u0448\u0456\u0442\u044c",
     "Description": "\u041e\u043f\u0438\u0441",
-    "Details": "\u0414\u0435\u0442\u0430\u043b\u0456",
     "Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440\u043d\u0456\u0441\u0442\u044c",
     "Disc": "\u0414\u0438\u0441\u043a",
     "Discard Changes": "\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0437\u043c\u0456\u043d\u0438",
diff --git a/lms/static/js/i18n/vi/djangojs.js b/lms/static/js/i18n/vi/djangojs.js
index 9800b0eeea..986d87a76b 100644
--- a/lms/static/js/i18n/vi/djangojs.js
+++ b/lms/static/js/i18n/vi/djangojs.js
@@ -59,7 +59,6 @@
     "(Add signatories for a certificate)": "(Th\u00eam ng\u01b0\u1eddi k\u00fd cho ch\u1ee9ng ch\u1ec9)",
     "(Caption will be displayed when you start playing the video.)": "(Ph\u1ee5 \u0111\u1ec1 s\u1ebd \u0111\u01b0\u1ee3c hi\u1ec3n th\u1ecb khi b\u1ea1n b\u1eaft \u0111\u1ea7u ph\u00e1t video)",
     "(Optional)": "(Kh\u00f4ng b\u1eaft bu\u1ed9c)",
-    "(Read-only)": "(Ch\u1ec9-\u0111\u1ecdc)",
     "(Required Field)": "(Th\u00f4ng tin b\u1eaft bu\u1ed9c)",
     "(Self-paced) Ended {end}": "(Self-paced) \u0110\u00e3 k\u1ebft th\u00fac {end}",
     "(Self-paced) Ends {end}": "(Self-paced) K\u1ebft th\u00fac {end}",
@@ -360,9 +359,7 @@
     "Course Name": "T\u00ean Kh\u00f3a H\u1ecdc",
     "Course Number": "S\u1ed1 Kh\u00f3a H\u1ecdc",
     "Course Number Override": "Ch\u00e8n l\u00ean s\u1ed1 th\u1ee9 t\u1ef1 kh\u00f3a h\u1ecdc",
-    "Course Number:": "M\u00e3 kh\u00f3a h\u1ecdc:",
     "Course Outline": "Ph\u00e1c Th\u1ea3o Kh\u00f3a H\u1ecdc",
-    "Course Run:": "Ch\u1ea1y kh\u00f3a h\u1ecdc",
     "Course Title": "Kh\u00f3a h\u1ecdc:",
     "Course Title Override": "Ch\u00e8n l\u00ean t\u00ean kh\u00f3a h\u1ecdc",
     "Course Video Settings": "Thi\u1ebft l\u1eadp Video Kh\u00f3a h\u1ecdc",
@@ -419,7 +416,6 @@
     "Deprecated": "\u0110\u00e3 l\u1ed7i th\u1eddi",
     "Description": "M\u00f4 t\u1ea3",
     "Description of the certificate": "M\u00f4 t\u1ea3 ch\u1ee9ng ch\u1ec9",
-    "Details": "Chi ti\u1ebft",
     "Dimensions": "K\u00edch th\u01b0\u1edbc",
     "Disc": "\u0110\u0129a",
     "Discard Changes": "X\u00f3a Thay \u0110\u1ed5i",
@@ -886,7 +882,6 @@
     "Organization ": "T\u1ed5 ch\u1ee9c",
     "Organization Name": "T\u00ean t\u1ed5 ch\u1ee9c",
     "Organization of the signatory": "T\u1ed5 ch\u1ee9c c\u1ee7a ng\u01b0\u1eddi k\u00fd",
-    "Organization:": "T\u1ed5 ch\u1ee9c:",
     "Other": "L\u1ef1a ch\u1ecdn kh\u00e1c",
     "Overall Score": "T\u1ed5ng \u0110i\u1ec3m",
     "Page break": "Ng\u1eaft trang",
@@ -990,7 +985,6 @@
     "Publishing": "Ph\u00e1t h\u00e0nh",
     "Publishing Status": "Tr\u1ea1ng th\u00e1i Xu\u1ea5t b\u1ea3n",
     "Queued": "\u0110\u00e3 x\u1ebfp h\u00e0ng",
-    "Re-run Course": "Ch\u1ea1y l\u1ea1i Kh\u00f3a h\u1ecdc",
     "Read More": "Xem Th\u00eam",
     "Reason field should not be left blank.": "Vui l\u00f2ng \u0111i\u1ec1n v\u00e0o m\u1ee5c L\u00fd do.",
     "Receive updates": "Nh\u1eadn th\u00f4ng b\u00e1o khi c\u00f3 b\u00e0i \u0111\u0103ng m\u1edbi",
@@ -1543,7 +1537,6 @@
     "Weight of Total Grade": "S\u0129 s\u1ed1 c\u1ee7a l\u1edbp",
     "We\u2019re sorry to see you go!": "Ch\u00fang t\u00f4i r\u1ea5t ti\u1ebfc khi th\u1ea5y b\u1ea1n ra \u0111i!",
     "What You Need for Verification": "Nh\u1eefng g\u00ec b\u1ea1n c\u1ea7n \u0111\u1ec3 x\u00e1c minh",
-    "What can we help you with, {username}?": "Ch\u00fang t\u00f4i c\u00f3 th\u1ec3 gi\u00fap g\u00ec cho b\u1ea1n, {username}?",
     "What does this mean?": "\u0110i\u1ec1u n\u00e0y c\u00f3 ngh\u0129a l\u00e0 g\u00ec?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Khi h\u1ecdc vi\u00ean g\u1eedi c\u00e2u tr\u1ea3 l\u1eddi cho m\u1ed9t b\u00e0i \u0111\u00e1nh gi\u00e1, h\u1ecd s\u1ebd ngay l\u1eadp t\u1ee9c \u0111\u01b0\u1ee3c xem c\u00e2u tr\u1ea3 l\u1eddi l\u00e0 ch\u00ednh x\u00e1c hay kh\u00f4ng, v\u00e0 \u0111i\u1ec3m s\u1ed1 nh\u1eadn \u0111\u01b0\u1ee3c.",
     "Which timed transcript would you like to use?": "B\u1ea1n mu\u1ed1n s\u1eed d\u1ee5ng b\u1ea3n d\u1ecbch n\u00e0o?",
diff --git a/lms/static/js/i18n/zh-cn/djangojs.js b/lms/static/js/i18n/zh-cn/djangojs.js
index 93efdd50ee..051cee1b7c 100644
--- a/lms/static/js/i18n/zh-cn/djangojs.js
+++ b/lms/static/js/i18n/zh-cn/djangojs.js
@@ -95,7 +95,6 @@
     "(Add signatories for a certificate)": "(\u6dfb\u52a0\u8bc1\u4e66\u4e2d\u7684\u7b7e\u7f72\u65b9)",
     "(Caption will be displayed when you start playing the video.)": "(\u5f00\u59cb\u64ad\u653e\u89c6\u9891\u65f6\u5c06\u663e\u793a\u5b57\u5e55)",
     "(Optional)": "(\u975e\u5fc5\u586b)",
-    "(Read-only)": "\uff08\u53ea\u8bfb\uff09",
     "(Required Field)": "(\u5fc5\u586b\u5b57\u6bb5)",
     "(Self-paced) Ended {end}": "(\u81ea\u4e3b\u6a21\u5f0f) \u7ed3\u675f {end}",
     "(Self-paced) Ends {end}": "(\u81ea\u4e3b\u6a21\u5f0f) \u7ed3\u675f {end}",
@@ -308,7 +307,6 @@
     "Bottom": "\u5e95\u7aef",
     "Browse": "\u6d4f\u89c8",
     "Browse recently launched courses and see what\\'s new in your favorite subjects": "\u6d4f\u89c8\u6700\u65b0\u4e0a\u7ebf\u7684\u8bfe\u7a0b\u5e76\u67e5\u770b\u60a8\u6700\u559c\u7231\u79d1\u76ee\u7684\u66f4\u65b0\u60c5\u51b5",
-    "Browsing": "\u6d4f\u89c8",
     "Bulk Exceptions": "\u6279\u91cf\u7279\u6b8a\u5904\u7406",
     "Bullet list": "\u9879\u76ee\u7b26\u53f7\u5217\u8868",
     "Bulleted List (Ctrl+U)": "\u7b26\u53f7\u5217\u8868(Ctrl+U)",
@@ -464,9 +462,7 @@
     "Course Name": "\u8bfe\u7a0b\u540d\u79f0",
     "Course Number": "\u8bfe\u7a0b\u4ee3\u7801",
     "Course Number Override": "\u91cd\u5199\u8bfe\u7a0b\u7f16\u53f7",
-    "Course Number:": "\u8bfe\u7a0b\u7f16\u53f7\uff1a",
     "Course Outline": "\u8bfe\u7a0b\u5927\u7eb2",
-    "Course Run:": "\u8bfe\u7a0b\u957f\u5ea6\uff1a",
     "Course Start": "\u8bfe\u7a0b\u5f00\u59cb",
     "Course Title": "\u8bfe\u7a0b\u6807\u9898",
     "Course Title Override": "\u91cd\u5199\u8bfe\u7a0b\u6807\u9898",
@@ -537,7 +533,6 @@
     "Describe ": "\u63cf\u8ff0",
     "Description": "\u63cf\u8ff0",
     "Description of the certificate": "\u8ba4\u8bc1\u63cf\u8ff0",
-    "Details": "\u7ec6\u8282",
     "Dimensions": "\u5c3a\u5bf8",
     "Disc": "\u5b9e\u5fc3\u5706",
     "Discard Changes": "\u653e\u5f03\u66f4\u6539",
@@ -1089,7 +1084,6 @@
     "Organization ": "\u673a\u6784",
     "Organization Name": "\u673a\u6784\u540d\u79f0",
     "Organization of the signatory": "\u7ec4\u7ec7\u673a\u6784\u7b7e\u7ae0",
-    "Organization:": "\u673a\u6784\uff1a",
     "Other": "\u5176\u4ed6",
     "Overall Score": "\u603b\u6210\u7ee9",
     "PDF Chapters": "PDF\u5404\u7ae0\u8282",
@@ -1219,7 +1213,6 @@
     "Publishing Status": "\u53d1\u5e03\u72b6\u6001",
     "Queued": "\u5df2\u6392\u961f",
     "REMAINING COURSES": "\u5269\u4f59\u8bfe\u7a0b",
-    "Re-run Course": "\u91cd\u542f\u8bfe\u7a0b",
     "Read More": "\u4e86\u89e3\u66f4\u591a",
     "Read more": "\u4e86\u89e3\u66f4\u591a",
     "Ready To Start": "\u51c6\u5907\u5f00\u59cb",
@@ -1850,7 +1843,7 @@
     "View Archived Course": "\u67e5\u770b\u5b58\u6863\u7684\u8bfe\u7a0b",
     "View Cohort": "\u67e5\u770b\u7fa4\u7ec4",
     "View Course": "\u67e5\u770b\u8bfe\u7a0b",
-    "View Live": "\u67e5\u770b\u7ebf\u4e0a\u7248\u672c",
+    "View Live": "\u67e5\u770b\u5728\u7ebf\u7248",
     "View Program Record": "\u67e5\u770b\u8bfe\u7a0b\u8bb0\u5f55",
     "View all errors": "\u67e5\u770b\u6240\u6709\u9519\u8bef",
     "View child items": "\u67e5\u770b\u5b50\u7c7b\u76ee",
@@ -1884,7 +1877,6 @@
     "Weight of Total Grade": "\u5728\u603b\u8bc4\u5206\u4e2d\u7684\u6743\u91cd",
     "We\u2019re sorry to see you go!": "\u5f88\u9057\u61be\u770b\u5230\u60a8\u8981\u79bb\u5f00\uff01",
     "What You Need for Verification": "\u8ba4\u8bc1\u6240\u9700",
-    "What can we help you with, {username}?": "\u4eb2\u7231\u7684{username}\uff0c\u6709\u4ec0\u4e48\u53ef\u4ee5\u5e2e\u52a9\u60a8\uff1f",
     "What does %(platformName)s do with this photo?": "%(platformName)s\u7528\u8fd9\u5f20\u7167\u7247\u505a\u4ec0\u4e48\uff1f",
     "What does this mean?": "\u8fd9\u662f\u4ec0\u4e48\u610f\u601d\uff1f",
     "What's Your Next Accomplishment?": "\u60a8\u7684\u4e0b\u4e00\u4e2a\u76ee\u6807\u662f\u4ec0\u4e48\uff1f",
diff --git a/lms/static/js/spec/groups/views/cohorts_spec.js b/lms/static/js/spec/groups/views/cohorts_spec.js
index 709930814b..51579701b5 100644
--- a/lms/static/js/spec/groups/views/cohorts_spec.js
+++ b/lms/static/js/spec/groups/views/cohorts_spec.js
@@ -14,6 +14,7 @@ define(['backbone', 'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers
             var catLoversInitialCount = 123,
                 dogLoversInitialCount = 456,
                 unknownUserMessage,
+                notAllowedUserMessage,
                 invalidEmailMessage, createMockCohort, createMockCohorts, createMockContentGroups,
                 createMockCohortSettingsJson,
                 createCohortsView, cohortsView, requests, respondToRefresh, verifyMessage, verifyNoMessage,
@@ -210,6 +211,10 @@ define(['backbone', 'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers
                 return 'Invalid email address: ' + name;
             };
 
+            notAllowedUserMessage = function(email) {
+                return 'Cohort assignment not allowed: ' + email;
+            };
+
             beforeEach(function() {
                 setFixtures('<ul class="instructor-nav">' +
                     '<li class="nav-item"><button type="button" data-section="cohort_management" ' +
@@ -602,7 +607,7 @@ define(['backbone', 'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers
                 respondToAdd = function(result) {
                     AjaxHelpers.respondWithJson(
                         requests,
-                        _.extend({unknown: [], added: [], present: [], changed: [],
+                        _.extend({unknown: [], added: [], present: [], changed: [], not_allowed: [],
                             success: true, preassigned: [], invalid: []}, result)
                     );
                 };
@@ -670,6 +675,19 @@ define(['backbone', 'jquery', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers
                     );
                 });
 
+                it('shows an error when user assignment not allowed', function() {
+                    createCohortsView(this, {selectCohort: 1});
+                    addStudents('not_allowed');
+                    AjaxHelpers.expectRequest(
+                        requests, 'POST', '/mock_service/cohorts/1/add', 'users=not_allowed'
+                    );
+                    respondToAdd({not_allowed: ['not_allowed']});
+                    respondToRefresh(catLoversInitialCount, dogLoversInitialCount);
+                    verifyHeader(1, 'Cat Lovers', catLoversInitialCount);
+                    verifyDetailedMessage('There was an error when trying to add learners:', 'error',
+                        [notAllowedUserMessage('not_allowed')]
+                    );
+                });
 
                 it('shows a "view all" button when more than 5 students do not exist', function() {
                     var sixUsers = 'unknown1, unknown2, unknown3, unknown4, unknown5, unknown6';
diff --git a/lms/static/sass/_build-course.scss b/lms/static/sass/_build-course.scss
index 8388f836ea..103e299b2e 100644
--- a/lms/static/sass/_build-course.scss
+++ b/lms/static/sass/_build-course.scss
@@ -45,7 +45,6 @@
 @import "course/wiki/table";
 
 // course - views
-@import "course/info";
 @import "course/syllabus"; // TODO arjun replace w/ custom tabs, see courseware/courses.py
 @import "course/textbook";
 @import "course/profile";
diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss
deleted file mode 100644
index b1331985c6..0000000000
--- a/lms/static/sass/course/_info.scss
+++ /dev/null
@@ -1,386 +0,0 @@
-//// Notifications
-// Upgrade
-
-$notification-highlight-border-color: $uxpl-green-base !default;
-$notification-background: rgb(255, 255, 255) !default;
-
-.home {
-  @include clearfix();
-
-  max-width: map-get($container-max-widths, xl);
-  margin: 0 auto;
-  padding: $baseline $baseline ($baseline/2) $baseline;
-
-  .page-header-main {
-    display: inline-block;
-    width: flex-grid(8, 12);
-    margin: 0;
-
-    .page-title {
-      margin-bottom: 5px;
-      color: $dark-gray1;
-      text-transform: none;
-    }
-
-    .page-subtitle {
-      color: $dark-gray1;
-      font-size: 14px;
-      text-transform: none;
-    }
-  }
-
-  .page-header-secondary {
-    @include float(right);
-
-    display: inline-block;
-    margin: ($baseline/2);
-    padding: ($baseline/2) ($baseline*0.75);
-    background-color: $blue;
-    border-radius: 2px;
-
-    .last-accessed-link {
-      @extend %t-title6;
-
-      color: $very-light-text;
-    }
-  }
-}
-
-div.info-wrapper {
-  background-color: $homepage-background;
-
-  section.updates {
-    @extend .content;
-
-    @include padding-left($baseline);
-
-    line-height: lh();
-    width: 100%;
-    display: block;
-
-    > p {
-      margin-bottom: lh();
-    }
-
-    > ol,
-    section,
-    div {
-      list-style: none;
-      margin-bottom: lh();
-      padding-left: 0;
-
-      .updates-article {
-        border-radius: 3px;
-        background-color: $white;
-        border: 1px solid transparent;
-
-        &:hover {
-          border: 1px solid $gray-l3;
-        }
-      }
-
-      .show-older-updates {
-        @extend %btn-pl-white-base;
-
-        padding: ($baseline/2);
-
-        @include font-size(14);
-
-        width: 100%;
-        display: block;
-        text-align: center;
-        cursor: pointer;
-        background: none;
-
-        &:hover,
-        &:focus {
-          background-color: unset;
-          color: $m-blue-d3;
-          border: 1px solid black;
-        }
-      }
-
-      > li,
-      article {
-        @extend .clearfix;
-
-        padding: $baseline;
-        list-style-type: none;
-        margin-bottom: lh(1.5);
-        background-color: $white;
-
-        ol,
-        ul {
-          ol,
-          ul {
-            list-style-type: disc;
-          }
-        }
-
-        .date {
-          @extend %t-title9;
-
-          margin-bottom: ($baseline/4);
-          text-transform: none;
-          background: url('#{$static-path}/images/calendar-icon.png') 0 center no-repeat;
-
-          @include padding-left($baseline);
-          @include float(left);
-        }
-
-
-        .toggle-visibility-button {
-          @extend %t-title9;
-
-          @include float(right);
-
-          padding: 0;
-          cursor: pointer;
-          background: none;
-          border: none;
-          color: $blue;
-          font-weight: normal;
-        }
-
-        .toggle-visibility-element {
-          content: '';
-          display: block;
-          clear: both;
-        }
-
-        section.update-description {
-          section {
-            &.primary {
-              border: 1px solid #ddd;
-              background: $gray-l6;
-              padding: 20px;
-
-              p {
-                font-weight: bold;
-              }
-
-              .author {
-                font-weight: normal;
-                font-style: italic;
-              }
-            }
-          }
-
-          h3 {
-            font-size: 1em;
-            font-weight: bold;
-            margin: lh(1.5) 0 lh(0.5);
-          }
-
-          > ul {
-            list-style-type: disc;
-          }
-
-          > ol {
-            list-style: decimal outside none;
-            padding: 0 0 0 1em;
-          }
-
-          li {
-            margin-bottom: lh(0.5);
-          }
-        }
-      }
-    }
-  }
-
-  section.handouts {
-    padding: 20px 30px;
-    margin: 0;
-
-    @extend .sidebar;
-
-    background: rgba(0, 0, 0, 0);
-    box-shadow: none;
-    font-size: 14px;
-
-    a {
-      color: $link-color;
-      display: block;
-      font-size: 16px;
-
-      span {
-        width: 20px;
-        text-align: center;
-      }
-
-      &:not(:first-child) {
-        margin-top: 10px;
-      }
-    }
-
-    &::after {
-      left: -1px;
-      right: auto;
-    }
-
-    .handouts-header {
-      @include text-align(left);
-
-      @extend %t-strong;
-      @extend %t-title6;
-
-      margin-bottom: 0;
-      padding: 12px 26px 10px 0;
-    }
-
-    ul {
-      margin-bottom: 14px;
-    }
-
-    ol {
-      margin-bottom: 14px;
-
-      li {
-        @include text-align(left);
-
-        a {
-          display: block;
-          padding: 0;
-          color: $link-color;
-
-          &:hover,
-          &:focus {
-            background: transparent;
-          }
-        }
-
-        &.expandable,
-        &.collapsable {
-          margin: 0 16px 14px;
-
-          @include transition(all 0.2s linear 0s);
-
-          h4 {
-            color: $link-color;
-            font-size: 1em;
-            font-weight: normal;
-            padding-left: 30px;
-          }
-        }
-
-        &.collapsable {
-          background: $white;
-          border-radius: 3px;
-          padding: 14px 0;
-          box-shadow: 0 0 1px 1px $shadow-l1, 0 1px 3px rgba(0, 0, 0, 0.25);
-
-          h4 {
-            margin-bottom: 16px;
-          }
-        }
-
-        &.multiple {
-          a {
-            display: inline-block;
-            padding: 0;
-
-            &:hover,
-            &:focus {
-              background: transparent;
-            }
-          }
-        }
-
-        ul {
-          background: none;
-          margin: 0;
-
-          li {
-            border-bottom: 0;
-            border-top: 1px solid #e6e6e6;
-            font-size: 0.9em;
-            margin: 0;
-            padding: 15px 30px;
-
-            a {
-              display: inline-block;
-              padding: 0;
-
-              &:hover,
-              &:focus {
-                background: transparent;
-              }
-            }
-          }
-        }
-
-        div.hitarea {
-          background-image: url('#{$static-path}/images/treeview-default.gif') no-repeat;
-          display: block;
-          height: 100%;
-          margin-left: 0;
-          max-height: 20px;
-          position: absolute;
-          width: 100%;
-
-          &:hover,
-          &:focus {
-            opacity: 0.6;
-            filter: alpha(opacity=60);
-
-            + h4 {
-              @extend a:hover;
-
-              text-decoration: underline;
-            }
-          }
-
-          &.expandable-hitarea {
-            background-position: -72px 0;
-          }
-
-          &.collapsable-hitarea {
-            background-position: -55px -23px;
-          }
-        }
-
-        h3 {
-          border-bottom: 0;
-          box-shadow: none;
-          color: #888;
-          font-size: 1em;
-          margin-bottom: 0;
-        }
-
-        p {
-          letter-spacing: 0;
-          margin: 0;
-          text-transform: none;
-
-          a {
-            padding-right: 8px;
-
-            &::before {
-              color: $gray-l3;
-              content: "•";
-              display: inline-block;
-              padding-right: 8px;
-            }
-
-            &:first-child {
-              &::before {
-                content: "";
-                padding-right: 0;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    @media print {
-      background: transparent !important;
-    }
-  }
-
-  @media print {
-    background: transparent !important;
-    border: 0;
-  }
-}
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 67a5a70405..33f8dae798 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/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 882f453e76..1003efb57f 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -22,7 +22,7 @@ from openedx.features.course_experience import course_home_page_title, DISABLE_C
    (course.enable_proctored_exams or course.enable_timed_exams)
    )
 
-   completion_aggregator_url = settings.COMPLETION_AGGREGATOR_URL if settings.FEATURES.get("SHOW_PROGRESS_BAR", False) else ""
+   completion_aggregator_url = getattr(settings, "COMPLETION_AGGREGATOR_URL", "")
 %>
 
 <%def name="course_name()">
@@ -238,7 +238,7 @@ ${HTML(fragment.foot_html())}
                                 <span class="nav-item nav-item-sequence">${sequence_title}</span>
                             % endif
                         </div>
-                        % if settings.FEATURES.get("SHOW_PROGRESS_BAR", False):
+                        % if settings.FEATURES.get("SHOW_PROGRESS_BAR", False) and completion_aggregator_url:
                           <div class="container">
                             <iframe style="border: none; height: 50px; position: relative; top: 10px; width: -webkit-fill-available" src="${completion_aggregator_url}/${course.id}/">
                             </iframe>
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html
deleted file mode 100644
index 022ef48669..0000000000
--- a/lms/templates/courseware/info.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="../main.html" />
-<%def name="online_help_token()"><% return "courseinfo" %></%def>
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from datetime import datetime
-from pytz import timezone, utc
-
-from django.urls import reverse
-from django.utils.translation import ugettext as _
-
-from lms.djangoapps.courseware.courses import get_course_info_section
-from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
-from openedx.core.djangolib.markup import HTML, Text
-%>
-
-<%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
-
-<%block name="headextra">
-<%static:css group='style-course-vendor'/>
-<%static:css group='style-course'/>
-</%block>
-
-% if show_enroll_banner:
-<div class="wrapper-msg urgency-low" id="failed-verification-banner">
-  <div class="msg msg-reverify is-dismissable">
-    <div class="msg-content">
-      <h2 class="title">${_("You are not enrolled yet")}</h2>
-      <div class="copy">
-        <p class='enroll-message'>
-          ${Text(_("You are not currently enrolled in this course. {link_start}Enroll now!{link_end}")).format(
-                link_start=HTML("<a href={}>").format(url_to_enroll),
-                link_end=HTML("</a>")
-          )}
-        </p>
-      </div>
-    </div>
-  </div>
-</div>
-% endif
-
-<%include file="/courseware/course_navigation.html" args="active_page='info'" />
-
-<%static:require_module_async module_name="js/courseware/toggle_element_visibility" class_name="ToggleElementVisibility">
-        ToggleElementVisibility();
-</%static:require_module_async>
-<%static:require_module_async module_name="js/courseware/course_info_events" class_name="CourseInfoEvents">
-        CourseInfoEvents();
-</%static:require_module_async>
-
-<%block name="bodyclass">view-in-course view-course-info ${course.css_class or ''}</%block>
-
-<main id="main" aria-label="Content" tabindex="-1">
-    <div class="container"
-    % if getattr(course, 'language'):
-      lang="${course.language}"
-    % endif
-    >
-      <div class="home">
-        <div class="page-header-main">
-            <h2 class="hd hd-2 page-title">
-              % if show_org:
-                ${_("Welcome to {org}'s {course_title}!").format(org=course.display_org_with_default, course_title=course_title)}
-              % else:
-                ${_("Welcome to {course_title}!").format(course_title=course_title)}
-              % endif
-              % if show_subtitle:
-                <div class="page-subtitle">${course_subtitle}</div>
-              % endif
-            </h2>
-        </div>
-        % if resume_course_url and user_is_enrolled:
-          <div class="page-header-secondary">
-              <a href="${resume_course_url}" class="last-accessed-link">${_("Resume Course")}</a>
-          </div>
-        % endif
-      </div>
-      <div class="info-wrapper">
-      % if user.is_authenticated:
-        <section class="updates">
-          % if studio_url is not None and masquerade and masquerade.role == 'staff':
-            <div class="wrap-instructor-info studio-view">
-              <a class="instructor-info-action" href="${studio_url}">
-                ${_("View Updates in Studio")}
-              </a>
-            </div>
-          % endif
-
-          <h3 class="hd hd-3">${_("Course Updates and News")}</h3>
-          ${HTML(get_course_info_section(request, masquerade_user, course, 'updates'))}
-
-        </section>
-        <section aria-label="${_('Handout Navigation')}" class="handouts">
-          % if course_tools:
-            <h3 class="hd hd-3 handouts-header">${_("Course Tools")}</h3>
-            % for course_tool in course_tools:
-              <a href="${course_tool.url(course.id)}">
-                <span class="icon ${course_tool.icon_classes()}" aria-hidden="true"></span>
-                ${course_tool.title()}
-              </a>
-            % endfor
-          % endif
-          % if SelfPacedConfiguration.current().enable_course_home_improvements:
-            ${HTML(dates_fragment.body_html())}
-          % endif
-          <h3 class="hd hd-3  handouts-header">${_(course.info_sidebar_name)}</h3>
-          ${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))}
-        </section>
-      % else:
-        <section class="updates">
-          <h3 class="hd hd-3 handouts-header">${_("Course Updates and News")}</h3>
-          ${HTML(get_course_info_section(request, masquerade_user, course, 'guest_updates'))}
-        </section>
-        <section aria-label="${_('Handout Navigation')}" class="handouts">
-          <h3 class="hd hd-3 handouts-header">${_("Course Handouts")}</h3>
-          ${HTML(get_course_info_section(request, masquerade_user, course, 'guest_handouts'))}
-        </section>
-      % endif <!-- if course authenticated -->
-      </div>
-  </div>
-</main>
-
-<%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">
-    DateUtilFactory.transform(iterationKey=".localized-datetime");
-</%static:require_module_async>
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 63b340c1e4..f0f1850e6e 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -83,8 +83,6 @@ username = get_enterprise_learner_generic_name(request) or student.username
                                 <div class="msg-actions">
                                     %if certificate_data.cert_web_view_url:
                                     <a class="btn" href="${certificate_data.cert_web_view_url}" rel="noopener" target="_blank">${_("View Certificate")} <span class="sr">${_("Opens in a new browser window")}</span></a>
-                                    %elif certificate_data.cert_status == CertificateStatuses.downloadable and certificate_data.download_url:
-                                    <a class="btn" href="${certificate_data.download_url}" rel="noopener" target="_blank">${_("Download Your Certificate")} <span class="sr">${_("Opens in a new browser window")}</span></a>
                                     %elif certificate_data.cert_status == CertificateStatuses.requesting:
                                     <button class="btn generate_certs" data-endpoint="${post_url}" id="btn_generate_cert">${_('Request Certificate')}</button>
                                     %endif
diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html
index 51e2c58dc6..5f3436a7f7 100644
--- a/lms/templates/dashboard/_dashboard_certificate_information.html
+++ b/lms/templates/dashboard/_dashboard_certificate_information.html
@@ -107,27 +107,6 @@ else:
                   ${_("View my {cert_name_short}").format(cert_name_short=cert_name_short)}
                 </a>
               </li>
-            % elif cert_status['status'] == CertificateStatuses.downloadable and enrollment.mode in CourseMode.NON_VERIFIED_MODES:
-              <li>
-                <a class="btn btn-primary" href="${cert_status['download_url']}"
-                   title="${_('This link will open/download a PDF document')}">
-                  ${_("Download my {cert_name_short}").format(cert_name_short=cert_name_short,)}
-                </a>
-              </li>
-            % elif cert_status['status'] == CertificateStatuses.downloadable and enrollment.mode == 'verified' and cert_status['mode'] == 'honor':
-              <li>
-                <a class="btn btn-primary" href="${cert_status['download_url']}"
-                   title="${_('This link will open/download a PDF document')}">
-                  ${_("Download my {cert_name_short}").format(cert_name_short=cert_name_short)}
-                </a>
-              </li>
-            % elif cert_status['status'] == CertificateStatuses.downloadable and enrollment.mode in CourseMode.VERIFIED_MODES:
-              <li>
-                <a class="btn btn-primary" href="${cert_status['download_url']}"
-                   title="${_('This link will open/download a PDF document of your verified {cert_name_long}.').format(cert_name_long=cert_name_long)}">
-                  ${_("Download my {cert_name_short}").format(cert_name_short=cert_name_short)}
-                </a>
-              </li>
             % endif
 
             % if cert_status['show_survey_button']:
diff --git a/lms/templates/logout.html b/lms/templates/logout.html
index 48a9428c84..272d933542 100644
--- a/lms/templates/logout.html
+++ b/lms/templates/logout.html
@@ -10,9 +10,9 @@
 
         <p style="text-align: center; margin-bottom: 20px;">
             {% blocktrans trimmed asvar sso_signout_msg %}
-              {start_anchor}Click here{end_anchor} to delete your single signed on (SSO) session.
+              {start_anchor}{{ tpa_logout_url }}{middle_anchor}Click here{end_anchor} to delete your single signed on (SSO) session.
             {% endblocktrans %}
-            {% interpolate_html sso_signout_msg start_anchor='<a href="'|add:tpa_logout_url|add:'">'|safe end_anchor='</a>'|safe %}
+            {% interpolate_html sso_signout_msg start_anchor='<a href="' middle_anchor='">'|safe end_anchor='</a>'|safe %}
         </p>
 
     {% else %}
@@ -36,9 +36,9 @@
 
             <p style="text-align: center; margin-bottom: 20px;">
                 {% blocktrans trimmed asvar signout_msg1 %}
-                  If you are not redirected within 5 seconds, {start_anchor}click here to go to the home page{end_anchor}.
+                  If you are not redirected within 5 seconds, {start_anchor}{{ target }}{middle_anchor}click here to go to the home page{end_anchor}.
                 {% endblocktrans %}
-                {% interpolate_html signout_msg1 start_anchor='<a href="'|add:target|add:'">'|safe end_anchor='</a>'|safe %}
+                {% interpolate_html signout_msg1 start_anchor='<a href="'|safe middle_anchor='">'|safe end_anchor='</a>'|safe %}
             </p>
         {% endif %}
 
diff --git a/lms/templates/seq_module.html b/lms/templates/seq_module.html
index 6a7aa6c7cc..f29f6ae062 100644
--- a/lms/templates/seq_module.html
+++ b/lms/templates/seq_module.html
@@ -117,7 +117,7 @@
     ${gated_sequence_paywall | n, decode.utf8}
   % else:
   <div class="sr-is-focusable" tabindex="-1"></div>
-  % if settings.FEATURES.get("SHOW_PROGRESS_BAR", False):
+  % if settings.FEATURES.get("SHOW_PROGRESS_BAR", False) and getattr(settings, 'COMPLETION_AGGREGATOR_URL', ''):
     <div class="progress-container">
       <iframe id="progress-frame" style="border: none; width: 100%; height: 70px;" src="${chapter_completion_aggregator_url}"></iframe>
     </div>
diff --git a/lms/templates/vert_module.html b/lms/templates/vert_module.html
index 131bbfc8ca..0e52e3c7f4 100644
--- a/lms/templates/vert_module.html
+++ b/lms/templates/vert_module.html
@@ -69,6 +69,12 @@ from openedx.core.djangolib.markup import HTML
 % 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/lms/urls.py b/lms/urls.py
index 7c9e08a745..48f3e00ba2 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -47,7 +47,6 @@ from openedx.core.djangoapps.password_policy import compliance as password_polic
 from openedx.core.djangoapps.password_policy.forms import PasswordPolicyAwareAdminAuthForm
 from openedx.core.djangoapps.plugins.constants import ProjectType
 from openedx.core.djangoapps.programs.models import ProgramsApiConfig
-from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_authn.views.login import redirect_to_lms_login
 from openedx.features.enterprise_support.api import enterprise_enabled
@@ -379,16 +378,9 @@ urlpatterns += [
         r'^courses/{}/$'.format(
             settings.COURSE_ID_PATTERN,
         ),
-        courseware_views.course_info,
+        courseware_views.course_about,
         name='course_root',
     ),
-    re_path(
-        r'^courses/{}/info$'.format(
-            settings.COURSE_ID_PATTERN,
-        ),
-        courseware_views.course_info,
-        name='info',
-    ),
     # TODO arjun remove when custom tabs in place, see courseware/courses.py
     re_path(
         r'^courses/{}/syllabus$'.format(
@@ -892,7 +884,6 @@ if settings.FEATURES.get('ENABLE_LTI_PROVIDER'):
     ]
 
 urlpatterns += [
-    path('config/self_paced', ConfigurationModelCurrentAPIView.as_view(model=SelfPacedConfiguration)),
     path('config/programs', ConfigurationModelCurrentAPIView.as_view(model=ProgramsApiConfig)),
     path('config/catalog', ConfigurationModelCurrentAPIView.as_view(model=CatalogIntegration)),
     path('config/forums', ConfigurationModelCurrentAPIView.as_view(model=ForumsConfig)),
diff --git a/openedx/core/djangoapps/ace_common/settings/common.py b/openedx/core/djangoapps/ace_common/settings/common.py
index c1c751ba72..11bfbce5c5 100644
--- a/openedx/core/djangoapps/ace_common/settings/common.py
+++ b/openedx/core/djangoapps/ace_common/settings/common.py
@@ -2,6 +2,8 @@
 Settings for ace_common app.
 """
 
+ACE_ROUTING_KEY = 'edx.lms.core.default'
+
 
 def plugin_settings(settings):  # lint-amnesty, pylint: disable=missing-function-docstring, missing-module-docstring
     settings.ACE_ENABLED_CHANNELS = [
@@ -17,6 +19,6 @@ def plugin_settings(settings):  # lint-amnesty, pylint: disable=missing-function
     settings.ACE_CHANNEL_DEFAULT_EMAIL = 'django_email'
     settings.ACE_CHANNEL_TRANSACTIONAL_EMAIL = 'django_email'
 
-    settings.ACE_ROUTING_KEY = 'edx.core.low'
+    settings.ACE_ROUTING_KEY = ACE_ROUTING_KEY
 
     settings.FEATURES['test_django_plugin'] = True
diff --git a/openedx/core/djangoapps/content/block_structure/block_structure.py b/openedx/core/djangoapps/content/block_structure/block_structure.py
index a8d10c4d81..ba9990bb79 100644
--- a/openedx/core/djangoapps/content/block_structure/block_structure.py
+++ b/openedx/core/djangoapps/content/block_structure/block_structure.py
@@ -11,9 +11,12 @@ The following internal data structures are implemented:
 
 
 from copy import deepcopy
+from datetime import datetime
 from functools import partial
 from logging import getLogger
 
+from dateutil.tz import tzlocal
+
 from openedx.core.lib.graph_traversals import traverse_post_order, traverse_topologically
 
 from .exceptions import TransformerException
@@ -464,7 +467,8 @@ class BlockStructureBlockData(BlockStructure):
                 not found.
         """
         block_data = self._block_data_map.get(usage_key)
-        return getattr(block_data, field_name, default) if block_data else default
+        xblock_field = getattr(block_data, field_name, default) if block_data else default
+        return self._make_datetime_field_compatible(xblock_field)
 
     def override_xblock_field(self, usage_key, field_name, override_data):
         """
@@ -554,7 +558,8 @@ class BlockStructureBlockData(BlockStructure):
             transformer_data = self.get_transformer_block_data(usage_key, transformer)
         except KeyError:
             return default
-        return getattr(transformer_data, key, default)
+        field = getattr(transformer_data, key, default)
+        return self._make_datetime_field_compatible(field)
 
     def set_transformer_block_field(self, usage_key, transformer, key, value):
         """
@@ -763,6 +768,23 @@ class BlockStructureBlockData(BlockStructure):
             self._block_data_map[usage_key] = block_data
             return block_data
 
+    def _make_datetime_field_compatible(self, field):
+        """
+        Creates a new datetime object to avoid issues occurring due to upgrading
+        python-datetuil version from 2.4.0
+
+        More info: https://openedx.atlassian.net/browse/BOM-2245
+        """
+        if isinstance(field, datetime):
+            if isinstance(field.tzinfo, tzlocal) and not hasattr(field.tzinfo, '_hasdst'):
+
+                return datetime(
+                    year=field.year, month=field.month, day=field.day,
+                    hour=field.hour, minute=field.minute, second=field.second,
+                    tzinfo=tzlocal()
+                )
+        return field
+
 
 class BlockStructureModulestoreData(BlockStructureBlockData):
     """
diff --git a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py
index d9b8859a60..3af01b49a3 100644
--- a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py
+++ b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py
@@ -62,7 +62,7 @@ class CourseOverviewTestCase(CatalogIntegrationMixin, ModuleStoreTestCase, Cache
         None: None,
     }
 
-    COURSE_OVERVIEW_TABS = {'courseware', 'info', 'textbooks', 'discussion', 'wiki', 'progress', 'dates'}
+    COURSE_OVERVIEW_TABS = {'courseware', 'textbooks', 'discussion', 'wiki', 'progress', 'dates'}
 
     ENABLED_SIGNALS = ['course_deleted', 'course_published']
 
diff --git a/openedx/core/djangoapps/content_libraries/api.py b/openedx/core/djangoapps/content_libraries/api.py
index c1d95c9d68..1604a4f85c 100644
--- a/openedx/core/djangoapps/content_libraries/api.py
+++ b/openedx/core/djangoapps/content_libraries/api.py
@@ -426,6 +426,10 @@ def create_library(
     """
     assert isinstance(collection_uuid, UUID)
     assert isinstance(org, Organization)
+    assert not transaction.get_autocommit(), (
+        "Call within a django.db.transaction.atomic block so that all created objects are rolled back on error."
+    )
+
     validate_unicode_slug(slug)
     # First, create the blockstore bundle:
     bundle = create_bundle(
@@ -436,20 +440,16 @@ def create_library(
     )
     # Now create the library reference in our database:
     try:
-        # Atomic transaction required because if this fails,
-        # we need to delete the bundle in the exception handler.
-        with transaction.atomic():
-            ref = ContentLibrary.objects.create(
-                org=org,
-                slug=slug,
-                type=library_type,
-                bundle_uuid=bundle.uuid,
-                allow_public_learning=allow_public_learning,
-                allow_public_read=allow_public_read,
-                license=library_license,
-            )
+        ref = ContentLibrary.objects.create(
+            org=org,
+            slug=slug,
+            type=library_type,
+            bundle_uuid=bundle.uuid,
+            allow_public_learning=allow_public_learning,
+            allow_public_read=allow_public_read,
+            license=library_license,
+        )
     except IntegrityError:
-        delete_bundle(bundle.uuid)
         raise LibraryAlreadyExists(slug)  # lint-amnesty, pylint: disable=raise-missing-from
     CONTENT_LIBRARY_CREATED.send(sender=None, library_key=ref.library_key)
     return ContentLibraryMetadata(
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index a39c5371e8..594c7b0f02 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -30,6 +30,7 @@ from openedx.core.djangoapps.content_libraries.tests.base import (
 )
 from openedx.core.djangoapps.content_libraries.constants import VIDEO, COMPLEX, PROBLEM, CC_4_BY, ALL_RIGHTS_RESERVED
 from openedx.core.djangolib.blockstore_cache import cache
+from openedx.core.lib import blockstore_api
 from common.djangoapps.student.tests.factories import UserFactory
 
 
@@ -189,10 +190,22 @@ class ContentLibrariesTestMixin:
         You can't create a library with the same slug as an existing library,
         or an invalid slug.
         """
+        assert 0 == len(blockstore_api.get_bundles(text_search='some-slug'))
         self._create_library(slug="some-slug", title="Existing Library")
-        self._create_library(slug="some-slug", title="Duplicate Library", expect_response=400)
+        assert 1 == len(blockstore_api.get_bundles(text_search='some-slug'))
 
-        self._create_library(slug="Invalid Slug!", title="Library with Bad Slug", expect_response=400)
+        # Try to create a library+bundle with a duplicate slug
+        response = self._create_library(slug="some-slug", title="Duplicate Library", expect_response=400)
+        assert response == {
+            'slug': 'A library with that ID already exists.',
+        }
+        # The second bundle created with that slug is removed when the transaction rolls back.
+        assert 1 == len(blockstore_api.get_bundles(text_search='some-slug'))
+
+        response = self._create_library(slug="Invalid Slug!", title="Library with Bad Slug", expect_response=400)
+        assert response == {
+            'slug': ['Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or hyphens.'],
+        }
 
     @ddt.data(True, False)
     @patch("openedx.core.djangoapps.content_libraries.views.LibraryApiPagination.page_size", new=2)
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
index cf9da3dff3..e21fd1edd8 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
@@ -5,7 +5,7 @@ import json
 from gettext import GNUTranslations
 
 from completion.test_utils import CompletionWaffleTestMixin
-from django.db import connections
+from django.db import connections, transaction
 from django.test import LiveServerTestCase, TestCase
 from django.utils.text import slugify
 from organizations.models import Organization
@@ -51,17 +51,18 @@ class ContentLibraryContentTestMixin:
             short_name="CL-TEST",
         )
         _, slug = self.id().rsplit('.', 1)
-        self.library = library_api.create_library(
-            collection_uuid=self.collection.uuid,
-            library_type=COMPLEX,
-            org=self.organization,
-            slug=slugify(slug),
-            title=(f"{slug} Test Lib"),
-            description="",
-            allow_public_learning=True,
-            allow_public_read=False,
-            library_license=ALL_RIGHTS_RESERVED,
-        )
+        with transaction.atomic():
+            self.library = library_api.create_library(
+                collection_uuid=self.collection.uuid,
+                library_type=COMPLEX,
+                org=self.organization,
+                slug=slugify(slug),
+                title=(f"{slug} Test Lib"),
+                description="",
+                allow_public_learning=True,
+                allow_public_read=False,
+                library_license=ALL_RIGHTS_RESERVED,
+            )
 
 
 class ContentLibraryRuntimeTestMixin(ContentLibraryContentTestMixin):
@@ -83,17 +84,18 @@ class ContentLibraryRuntimeTestMixin(ContentLibraryContentTestMixin):
         library_api.create_library_block_child(unit_block_key, "problem", "p1")
         library_api.publish_changes(self.library.key)
         # Now do the same in a different library:
-        library2 = library_api.create_library(
-            collection_uuid=self.collection.uuid,
-            org=self.organization,
-            slug="idolx",
-            title=("Identical OLX Test Lib 2"),
-            description="",
-            library_type=COMPLEX,
-            allow_public_learning=True,
-            allow_public_read=False,
-            library_license=CC_4_BY,
-        )
+        with transaction.atomic():
+            library2 = library_api.create_library(
+                collection_uuid=self.collection.uuid,
+                org=self.organization,
+                slug="idolx",
+                title=("Identical OLX Test Lib 2"),
+                description="",
+                library_type=COMPLEX,
+                allow_public_learning=True,
+                allow_public_read=False,
+                library_license=CC_4_BY,
+            )
         unit_block2_key = library_api.create_library_block(library2.key, "unit", "u1").usage_key
         library_api.create_library_block_child(unit_block2_key, "problem", "p1")
         library_api.publish_changes(library2.key)
diff --git a/openedx/core/djangoapps/content_libraries/views.py b/openedx/core/djangoapps/content_libraries/views.py
index a71ac03998..c83a9c4fcb 100644
--- a/openedx/core/djangoapps/content_libraries/views.py
+++ b/openedx/core/djangoapps/content_libraries/views.py
@@ -18,6 +18,7 @@ from django.contrib.auth import authenticate
 from django.contrib.auth import get_user_model
 from django.contrib.auth import login
 from django.contrib.auth.models import Group
+from django.db.transaction import atomic
 from django.http import Http404
 from django.http import HttpResponseBadRequest
 from django.http import JsonResponse
@@ -142,6 +143,7 @@ class LibraryRootView(APIView):
     Views to list, search for, and create content libraries.
     """
 
+    @atomic
     @apidocs.schema(
         parameters=[
             *LibraryApiPagination.apidoc_params,
@@ -184,6 +186,7 @@ class LibraryRootView(APIView):
             return paginator.get_paginated_response(serializer.data)
         return Response(serializer.data)
 
+    @atomic
     def post(self, request):
         """
         Create a new content library.
@@ -223,6 +226,7 @@ class LibraryDetailsView(APIView):
     """
     Views to work with a specific content library
     """
+    @atomic
     @convert_exceptions
     def get(self, request, lib_key_str):
         """
@@ -233,6 +237,7 @@ class LibraryDetailsView(APIView):
         result = api.get_library(key)
         return Response(ContentLibraryMetadataSerializer(result).data)
 
+    @atomic
     @convert_exceptions
     def patch(self, request, lib_key_str):
         """
@@ -255,6 +260,7 @@ class LibraryDetailsView(APIView):
         result = api.get_library(key)
         return Response(ContentLibraryMetadataSerializer(result).data)
 
+    @atomic
     @convert_exceptions
     def delete(self, request, lib_key_str):  # pylint: disable=unused-argument
         """
@@ -275,6 +281,7 @@ class LibraryTeamView(APIView):
     Note also the 'allow_public_' settings which can be edited by PATCHing the
     library itself (LibraryDetailsView.patch).
     """
+    @atomic
     @convert_exceptions
     def post(self, request, lib_key_str):
         """
@@ -302,6 +309,7 @@ class LibraryTeamView(APIView):
         grant = api.get_library_user_permissions(key, user)
         return Response(ContentLibraryPermissionSerializer(grant).data)
 
+    @atomic
     @convert_exceptions
     def get(self, request, lib_key_str):
         """
@@ -320,6 +328,7 @@ class LibraryTeamUserView(APIView):
     View to add/remove/edit an individual user's permissions for a content
     library.
     """
+    @atomic
     @convert_exceptions
     def put(self, request, lib_key_str, username):
         """
@@ -338,6 +347,7 @@ class LibraryTeamUserView(APIView):
         grant = api.get_library_user_permissions(key, user)
         return Response(ContentLibraryPermissionSerializer(grant).data)
 
+    @atomic
     @convert_exceptions
     def get(self, request, lib_key_str, username):
         """
@@ -351,6 +361,7 @@ class LibraryTeamUserView(APIView):
             raise NotFound
         return Response(ContentLibraryPermissionSerializer(grant).data)
 
+    @atomic
     @convert_exceptions
     def delete(self, request, lib_key_str, username):
         """
@@ -372,6 +383,7 @@ class LibraryTeamGroupView(APIView):
     """
     View to add/remove/edit a group's permissions for a content library.
     """
+    @atomic
     @convert_exceptions
     def put(self, request, lib_key_str, group_name):
         """
@@ -386,6 +398,7 @@ class LibraryTeamGroupView(APIView):
         api.set_library_group_permissions(key, group, access_level=serializer.validated_data["access_level"])
         return Response({})
 
+    @atomic
     @convert_exceptions
     def delete(self, request, lib_key_str, username):
         """
@@ -404,6 +417,7 @@ class LibraryBlockTypesView(APIView):
     """
     View to get the list of XBlock types that can be added to this library
     """
+    @atomic
     @convert_exceptions
     def get(self, request, lib_key_str):
         """
@@ -428,6 +442,7 @@ class LibraryLinksView(APIView):
     Links always point to a specific published version of the target bundle.
     Links are identified by a slug-like ID, e.g. "link1"
     """
+    @atomic
     @convert_exceptions
     def get(self, request, lib_key_str):
         """
@@ -438,6 +453,7 @@ class LibraryLinksView(APIView):
         result = api.get_bundle_links(key)
         return Response(LibraryBundleLinkSerializer(result, many=True).data)
 
+    @atomic
     @convert_exceptions
     def post(self, request, lib_key_str):
         """
@@ -462,6 +478,7 @@ class LibraryLinkDetailView(APIView):
     """
     View to update/delete an existing library link
     """
+    @atomic
     @convert_exceptions
     def patch(self, request, lib_key_str, link_id):
         """
@@ -478,6 +495,7 @@ class LibraryLinkDetailView(APIView):
         api.update_bundle_link(key, link_id, version=serializer.validated_data['version'])
         return Response({})
 
+    @atomic
     @convert_exceptions
     def delete(self, request, lib_key_str, link_id):  # pylint: disable=unused-argument
         """
@@ -494,6 +512,7 @@ class LibraryCommitView(APIView):
     """
     Commit/publish or revert all of the draft changes made to the library.
     """
+    @atomic
     @convert_exceptions
     def post(self, request, lib_key_str):
         """
@@ -505,6 +524,7 @@ class LibraryCommitView(APIView):
         api.publish_changes(key)
         return Response({})
 
+    @atomic
     @convert_exceptions
     def delete(self, request, lib_key_str):  # pylint: disable=unused-argument
         """
@@ -522,6 +542,7 @@ class LibraryBlocksView(APIView):
     """
     Views to work with XBlocks in a specific content library.
     """
+    @atomic
     @apidocs.schema(
         parameters=[
             *LibraryApiPagination.apidoc_params,
@@ -560,6 +581,7 @@ class LibraryBlocksView(APIView):
 
         return Response(LibraryXBlockMetadataSerializer(result, many=True).data)
 
+    @atomic
     @convert_exceptions
     def post(self, request, lib_key_str):
         """
@@ -592,6 +614,7 @@ class LibraryBlockView(APIView):
     """
     Views to work with an existing XBlock in a content library.
     """
+    @atomic
     @convert_exceptions
     def get(self, request, usage_key_str):
         """
@@ -602,6 +625,7 @@ class LibraryBlockView(APIView):
         result = api.get_library_block(key)
         return Response(LibraryXBlockMetadataSerializer(result).data)
 
+    @atomic
     @convert_exceptions
     def delete(self, request, usage_key_str):  # pylint: disable=unused-argument
         """
@@ -628,6 +652,7 @@ class LibraryBlockLtiUrlView(APIView):
 
     Returns 404 in case the block not found by the given key.
     """
+    @atomic
     @convert_exceptions
     def get(self, request, usage_key_str):
         """
@@ -647,6 +672,7 @@ class LibraryBlockOlxView(APIView):
     """
     Views to work with an existing XBlock's OLX
     """
+    @atomic
     @convert_exceptions
     def get(self, request, usage_key_str):
         """
@@ -657,6 +683,7 @@ class LibraryBlockOlxView(APIView):
         xml_str = api.get_library_block_olx(key)
         return Response(LibraryXBlockOlxSerializer({"olx": xml_str}).data)
 
+    @atomic
     @convert_exceptions
     def post(self, request, usage_key_str):
         """
@@ -682,6 +709,7 @@ class LibraryBlockAssetListView(APIView):
     """
     Views to list an existing XBlock's static asset files
     """
+    @atomic
     @convert_exceptions
     def get(self, request, usage_key_str):
         """
@@ -700,6 +728,7 @@ class LibraryBlockAssetView(APIView):
     """
     parser_classes = (MultiPartParser, )
 
+    @atomic
     @convert_exceptions
     def get(self, request, usage_key_str, file_path):
         """
@@ -713,6 +742,7 @@ class LibraryBlockAssetView(APIView):
                 return Response(LibraryXBlockStaticFileSerializer(f).data)
         raise NotFound
 
+    @atomic
     @convert_exceptions
     def put(self, request, usage_key_str, file_path):
         """
@@ -735,6 +765,7 @@ class LibraryBlockAssetView(APIView):
             raise ValidationError("Invalid file path")  # lint-amnesty, pylint: disable=raise-missing-from
         return Response(LibraryXBlockStaticFileSerializer(result).data)
 
+    @atomic
     @convert_exceptions
     def delete(self, request, usage_key_str, file_path):
         """
@@ -757,6 +788,7 @@ class LibraryImportTaskViewSet(ViewSet):
     Import blocks from Courseware through modulestore.
     """
 
+    @atomic
     @convert_exceptions
     def list(self, request, lib_key_str):
         """
@@ -775,6 +807,7 @@ class LibraryImportTaskViewSet(ViewSet):
             paginator.paginate_queryset(result, request)
         )
 
+    @atomic
     @convert_exceptions
     def create(self, request, lib_key_str):
         """
@@ -795,6 +828,7 @@ class LibraryImportTaskViewSet(ViewSet):
         import_task = api.import_blocks_create_task(library_key, course_key)
         return Response(ContentLibraryBlockImportTaskSerializer(import_task).data)
 
+    @atomic
     @convert_exceptions
     def retrieve(self, request, lib_key_str, pk=None):
         """
diff --git a/openedx/core/djangoapps/course_groups/models.py b/openedx/core/djangoapps/course_groups/models.py
index ae7bc15da9..e4dd769824 100644
--- a/openedx/core/djangoapps/course_groups/models.py
+++ b/openedx/core/djangoapps/course_groups/models.py
@@ -13,7 +13,7 @@ from django.db.models.signals import pre_delete
 from django.dispatch import receiver
 
 from opaque_keys.edx.django.models import CourseKeyField
-from openedx_filters.learning.filters import CohortChangeRequested
+from openedx_filters.learning.filters import CohortAssignmentRequested, CohortChangeRequested
 
 from openedx.core.djangolib.model_mixins import DeletableByUserValue
 
@@ -31,6 +31,10 @@ class CohortChangeNotAllowed(CohortMembershipException):
     pass
 
 
+class CohortAssignmentNotAllowed(CohortMembershipException):
+    pass
+
+
 class CourseUserGroup(models.Model):
     """
     This model represents groups of users in a course.  Groups may have different types,
@@ -113,6 +117,13 @@ class CohortMembership(models.Model):
         cohort
         Returns CohortMembership, previous_cohort (if any)
         """
+        try:
+            # .. filter_implemented_name: CohortAssignmentRequested
+            # .. filter_type: org.openedx.learning.cohort.assignment.requested.v1
+            user, cohort = CohortAssignmentRequested.run_filter(user=user, target_cohort=cohort)
+        except CohortAssignmentRequested.PreventCohortAssignment as exc:
+            raise CohortAssignmentNotAllowed(str(exc)) from exc
+
         with transaction.atomic():
             membership, created = cls.objects.select_for_update().get_or_create(
                 user__id=user.id,
diff --git a/openedx/core/djangoapps/course_groups/tests/test_filters.py b/openedx/core/djangoapps/course_groups/tests/test_filters.py
index d7e8d1b34b..f51818d676 100755
--- a/openedx/core/djangoapps/course_groups/tests/test_filters.py
+++ b/openedx/core/djangoapps/course_groups/tests/test_filters.py
@@ -3,12 +3,16 @@ Test that various filters are executed for models in the course_groups app.
 """
 from django.test import override_settings
 from openedx_filters import PipelineStep
-from openedx_filters.learning.filters import CohortChangeRequested
+from openedx_filters.learning.filters import CohortAssignmentRequested, CohortChangeRequested
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
-from openedx.core.djangoapps.course_groups.models import CohortChangeNotAllowed, CohortMembership
+from openedx.core.djangoapps.course_groups.models import (
+    CohortAssignmentNotAllowed,
+    CohortChangeNotAllowed,
+    CohortMembership,
+)
 from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
 from openedx.core.djangolib.testing.utils import skip_unless_lms
 
@@ -31,6 +35,23 @@ class TestCohortChangeStep(PipelineStep):
         return {}
 
 
+class TestCohortAssignmentStep(PipelineStep):
+    """
+    Utility function used when getting steps for pipeline.
+    """
+
+    def run_filter(self, user, target_cohort):  # pylint: disable=arguments-differ
+        """Pipeline step that adds cohort info to the users profile."""
+        user.profile.set_meta(
+            {
+                "cohort_info":
+                f"User assigned to Cohort {str(target_cohort)}",
+            }
+        )
+        user.profile.save()
+        return {}
+
+
 class TestStopCohortChangeStep(PipelineStep):
     """
     Utility function used when getting steps for pipeline.
@@ -41,6 +62,16 @@ class TestStopCohortChangeStep(PipelineStep):
         raise CohortChangeRequested.PreventCohortChange("You can't change cohorts.")
 
 
+class TestStopAssignmentChangeStep(PipelineStep):
+    """
+    Utility function used when getting steps for pipeline.
+    """
+
+    def run_filter(self, user, target_cohort, *args, **kwargs):  # pylint: disable=arguments-differ
+        """Pipeline step that stops the cohort change process."""
+        raise CohortAssignmentRequested.PreventCohortAssignment("You can't be assign to this cohort.")
+
+
 @skip_unless_lms
 class CohortFiltersTest(SharedModuleStoreTestCase):
     """
@@ -92,6 +123,33 @@ class CohortFiltersTest(SharedModuleStoreTestCase):
             cohort_membership.user.profile.get_meta(),
         )
 
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.cohort.assignment.requested.v1": {
+                "pipeline": [
+                    "openedx.core.djangoapps.course_groups.tests.test_filters.TestCohortAssignmentStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_cohort_assignment_filter_executed(self):
+        """
+        Test whether the student cohort assignment filter is triggered before the user's
+        assignment.
+
+        Expected result:
+            - CohortAssignmentRequested is triggered and executes TestCohortAssignmentStep.
+            - The user's profile meta contains cohort_info.
+        """
+
+        cohort_membership, _ = CohortMembership.assign(user=self.user, cohort=self.second_cohort, )
+
+        self.assertEqual(
+            {"cohort_info": "User assigned to Cohort SecondCohort"},
+            cohort_membership.user.profile.get_meta(),
+        )
+
     @override_settings(
         OPEN_EDX_FILTERS_CONFIG={
             "org.openedx.learning.cohort.change.requested.v1": {
@@ -115,6 +173,27 @@ class CohortFiltersTest(SharedModuleStoreTestCase):
         with self.assertRaises(CohortChangeNotAllowed):
             CohortMembership.assign(cohort=self.second_cohort, user=self.user)
 
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.cohort.assignment.requested.v1": {
+                "pipeline": [
+                    "openedx.core.djangoapps.course_groups.tests.test_filters.TestStopAssignmentChangeStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_cohort_assignment_filter_prevent_move(self):
+        """
+        Test prevent the user's cohort assignment through a pipeline step.
+
+        Expected result:
+            - CohortAssignmentRequested is triggered and executes TestStopAssignmentChangeStep.
+            - The user can't be assigned to the cohort.
+        """
+        with self.assertRaises(CohortAssignmentNotAllowed):
+            CohortMembership.assign(cohort=self.second_cohort, user=self.user)
+
     @override_settings(OPEN_EDX_FILTERS_CONFIG={})
     def test_cohort_change_without_filter_configuration(self):
         """
@@ -129,3 +208,16 @@ class CohortFiltersTest(SharedModuleStoreTestCase):
         cohort_membership, _ = CohortMembership.assign(cohort=self.second_cohort, user=self.user)
 
         self.assertEqual({}, cohort_membership.user.profile.get_meta())
+
+    @override_settings(OPEN_EDX_FILTERS_CONFIG={})
+    def test_cohort_assignment_without_filter_configuration(self):
+        """
+        Test usual cohort assignment process, without filter's intervention.
+
+        Expected result:
+            - CohortAssignmentRequested does not have any effect on the cohort change process.
+            - The cohort assignment process ends successfully.
+        """
+        cohort_membership, _ = CohortMembership.assign(cohort=self.second_cohort, user=self.user)
+
+        self.assertEqual({}, cohort_membership.user.profile.get_meta())
diff --git a/openedx/core/djangoapps/course_groups/views.py b/openedx/core/djangoapps/course_groups/views.py
index 606e5c617d..da66240e74 100644
--- a/openedx/core/djangoapps/course_groups/views.py
+++ b/openedx/core/djangoapps/course_groups/views.py
@@ -26,7 +26,11 @@ from rest_framework.serializers import Serializer
 
 from lms.djangoapps.courseware.courses import get_course, get_course_with_access
 from common.djangoapps.edxmako.shortcuts import render_to_response
-from openedx.core.djangoapps.course_groups.models import CohortMembership
+from openedx.core.djangoapps.course_groups.models import (
+    CohortAssignmentNotAllowed,
+    CohortChangeNotAllowed,
+    CohortMembership,
+)
 from openedx.core.djangoapps.course_groups.permissions import IsStaffOrAdmin
 from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
 from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin
@@ -321,6 +325,7 @@ def add_users_to_cohort(request, course_key_string, cohort_id):
     unknown = []
     preassigned = []
     invalid = []
+    not_allowed = []
     for username_or_email in split_by_comma_and_whitespace(users):
         if not username_or_email:
             continue
@@ -346,6 +351,8 @@ def add_users_to_cohort(request, course_key_string, cohort_id):
             invalid.append(username_or_email)
         except ValueError:
             present.append(username_or_email)
+        except (CohortAssignmentNotAllowed, CohortChangeNotAllowed):
+            not_allowed.append(username_or_email)
 
     return json_http_response({'success': True,
                                'added': added,
@@ -353,7 +360,8 @@ def add_users_to_cohort(request, course_key_string, cohort_id):
                                'present': present,
                                'unknown': unknown,
                                'preassigned': preassigned,
-                               'invalid': invalid})
+                               'invalid': invalid,
+                               'not_allowed': not_allowed})
 
 
 @ensure_csrf_cookie
diff --git a/openedx/core/djangoapps/course_live/tab.py b/openedx/core/djangoapps/course_live/tab.py
index 14a1355277..27b8e5ff29 100644
--- a/openedx/core/djangoapps/course_live/tab.py
+++ b/openedx/core/djangoapps/course_live/tab.py
@@ -4,8 +4,8 @@ Configurations to render Course Live Tab
 from django.utils.translation import gettext_lazy
 from lti_consumer.models import LtiConfiguration
 
-from common.lib.xmodule.xmodule.course_module import CourseBlock
-from common.lib.xmodule.xmodule.tabs import TabFragmentViewMixin
+from xmodule.course_module import CourseBlock
+from xmodule.tabs import TabFragmentViewMixin
 from lms.djangoapps.courseware.tabs import EnrolledTab
 from openedx.core.djangoapps.course_live.config.waffle import ENABLE_COURSE_LIVE
 from openedx.core.djangoapps.course_live.models import CourseLiveConfiguration
diff --git a/openedx/core/djangoapps/discussions/serializers.py b/openedx/core/djangoapps/discussions/serializers.py
index 5f01ca457e..2f465ae15d 100644
--- a/openedx/core/djangoapps/discussions/serializers.py
+++ b/openedx/core/djangoapps/discussions/serializers.py
@@ -5,11 +5,12 @@ from django.core.exceptions import ValidationError
 from lti_consumer.api import get_lti_pii_sharing_state_for_course
 from lti_consumer.models import LtiConfiguration
 from rest_framework import serializers
+from xmodule.modulestore.django import modulestore
 
 from lms.djangoapps.discussion.toggles import ENABLE_REPORTED_CONTENT_EMAIL_NOTIFICATIONS
+from openedx.core.djangoapps.discussions.tasks import update_discussions_settings_from_course_task
 from openedx.core.djangoapps.django_comment_common.models import CourseDiscussionSettings
 from openedx.core.lib.courses import get_course_by_id
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from .models import DiscussionsConfiguration, Provider
 from .utils import available_division_schemes, get_divided_discussions
 
@@ -257,6 +258,7 @@ class DiscussionsConfigurationSerializer(serializers.ModelSerializer):
         # have already been set
         instance = self._update_lti(instance, validated_data)
         instance.save()
+        update_discussions_settings_from_course_task.delay(str(instance.context_key))
         return instance
 
     def _update_lti(
diff --git a/openedx/core/djangoapps/schedules/docs/README.rst b/openedx/core/djangoapps/schedules/docs/README.rst
index 9b662eb7bb..4e9f02ca39 100644
--- a/openedx/core/djangoapps/schedules/docs/README.rst
+++ b/openedx/core/djangoapps/schedules/docs/README.rst
@@ -236,17 +236,6 @@ Configuration Flags
 Configuring Schedule Creation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Self-paced Configuration
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Schedules will only be created for a course if it is self-paced. A
-course can be configured to be self-paced by going to
-``<studio_url>/admin/self_paced/selfpacedconfiguration/`` and adding an
-enabled self paced config. Then, go to Studio settings for the course
-and change the Course Pacing value to “Self-Paced”. Note that the Course
-Start Date has to be set to sometime in the future in order to change
-the Course Pacing.
-
 Configuring Upgrade Deadline on Schedule
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/openedx/core/djangoapps/schedules/tests/test_resolvers.py b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
index 83b98e5b76..2557c3c961 100644
--- a/openedx/core/djangoapps/schedules/tests/test_resolvers.py
+++ b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
@@ -252,7 +252,7 @@ class TestCourseNextSectionUpdateResolver(SchedulesResolverTestMixin, ModuleStor
     def test_schedule_context(self):
         resolver = self.create_resolver()
         # using this to make sure the select_related stays intact
-        with self.assertNumQueries(41):
+        with self.assertNumQueries(38):
             sc = resolver.get_schedules()
             schedules = list(sc)
 
diff --git a/openedx/core/djangoapps/self_paced/__init__.py b/openedx/core/djangoapps/self_paced/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/openedx/core/djangoapps/self_paced/admin.py b/openedx/core/djangoapps/self_paced/admin.py
deleted file mode 100644
index df3ff01b25..0000000000
--- a/openedx/core/djangoapps/self_paced/admin.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-Admin site bindings for self-paced courses.
-"""
-
-
-from config_models.admin import ConfigurationModelAdmin
-from django.contrib import admin
-
-from .models import SelfPacedConfiguration
-
-admin.site.register(SelfPacedConfiguration, ConfigurationModelAdmin)
diff --git a/openedx/core/djangoapps/self_paced/migrations/0001_initial.py b/openedx/core/djangoapps/self_paced/migrations/0001_initial.py
deleted file mode 100644
index 0e8c85408d..0000000000
--- a/openedx/core/djangoapps/self_paced/migrations/0001_initial.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from django.db import migrations, models
-import django.db.models.deletion
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SelfPacedConfiguration',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')),
-                ('enabled', models.BooleanField(default=False, verbose_name='Enabled')),
-                ('enable_course_home_improvements', models.BooleanField(default=False, verbose_name='Enable course home page improvements.')),
-                ('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='Changed by')),
-            ],
-            options={
-                'ordering': ('-change_date',),
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/openedx/core/djangoapps/self_paced/migrations/__init__.py b/openedx/core/djangoapps/self_paced/migrations/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/openedx/core/djangoapps/self_paced/models.py b/openedx/core/djangoapps/self_paced/models.py
deleted file mode 100644
index 333214a9c6..0000000000
--- a/openedx/core/djangoapps/self_paced/models.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-Configuration for self-paced courses.
-"""
-
-
-from config_models.models import ConfigurationModel
-from django.db.models import BooleanField
-from django.utils.translation import gettext_lazy as _
-
-
-class SelfPacedConfiguration(ConfigurationModel):
-    """
-    Configuration for self-paced courses.
-
-    .. no_pii:
-    """
-
-    enable_course_home_improvements = BooleanField(
-        default=False,
-        verbose_name=_("Enable course home page improvements.")
-    )
diff --git a/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py b/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py
index fd3f97f86a..c97944b910 100644
--- a/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py
+++ b/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py
@@ -70,6 +70,7 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         site_id = options.get('site_id')
         domain = options.get('domain')
+        name = domain
         configuration = options.get('configuration')
         config_file_data = options.get('config_file_data')
 
@@ -78,9 +79,18 @@ class Command(BaseCommand):
         if site_id is not None:
             site, created = Site.objects.get_or_create(id=site_id)
         else:
+            name_max_length = Site._meta.get_field("name").max_length
+            if name:
+                if len(str(name)) > name_max_length:
+                    LOG.warning(
+                        f"The name {name} is too long, truncating to {name_max_length}"
+                        " characters. Please update site name in admin."
+                    )
+                # trim name as the column has a limit of 50 characters
+                name = name[:name_max_length]
             site, created = Site.objects.get_or_create(
                 domain=domain,
-                name=domain,
+                name=name,
             )
         if created:
             LOG.info(f"Site does not exist. Created new site '{site.domain}'")
diff --git a/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py b/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py
index 5b4d3f8ae1..e572c3631f 100644
--- a/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py
+++ b/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py
@@ -107,6 +107,19 @@ class CreateOrUpdateSiteConfigurationTest(TestCase):
         assert not site_configuration.site_values
         assert not site_configuration.enabled
 
+    def test_site_created_when_domain_longer_than_50_characters(self):
+        """
+        Verify that a SiteConfiguration instance is created with name trimmed
+        to 50 characters when domain is longer than 50 characters
+        """
+        self.assert_site_configuration_does_not_exist()
+
+        domain = "studio.newtestserverwithlongname.development.opencraft.hosting"
+        call_command(self.command, f"{domain}")
+        site = Site.objects.filter(domain=domain)
+        assert site.exists()
+        assert site[0].name == domain[:50]
+
     def test_both_enabled_disabled_flags(self):
         """
         Verify the error on providing both the --enabled and --disabled flags.
diff --git a/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py b/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py
index 0971ac0415..21b9ba952a 100644
--- a/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py
+++ b/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py
@@ -124,8 +124,8 @@ class TestComprehensiveThemeLMS(TestCase):
         courses_url = reverse('courses')
         resp = self.client.get(courses_url)
         assert resp.status_code == 200
-        # The courses.html template includes the info.html file, which is overriden in the theme.
-        self.assertContains(resp, "This overrides the courseware/info.html template.")
+        # The courses.html template includes the progress.html file, which is overriden in the theme.
+        self.assertContains(resp, "This overrides the courseware/progress.html template.")
 
     @with_comprehensive_theme("test-theme")
     def test_include_custom_template(self):
diff --git a/openedx/core/djangoapps/user_api/accounts/__init__.py b/openedx/core/djangoapps/user_api/accounts/__init__.py
index 0bcdda4362..301adf9889 100644
--- a/openedx/core/djangoapps/user_api/accounts/__init__.py
+++ b/openedx/core/djangoapps/user_api/accounts/__init__.py
@@ -98,6 +98,7 @@ REQUIRED_FIELD_NAME_MSG = _("Enter your full name.")
 REQUIRED_FIELD_FIRST_NAME_MSG = _("Enter your first name.")
 REQUIRED_FIELD_LAST_NAME_MSG = _("Enter your last name.")
 REQUIRED_FIELD_CONFIRM_EMAIL_MSG = _("The email addresses do not match.")
+REQUIRED_FIELD_CONFIRM_EMAIL_TEXT_MSG = _("Enter your confirm email")
 REQUIRED_FIELD_COUNTRY_MSG = _("Select your country or region of residence.")
 REQUIRED_FIELD_PROFESSION_SELECT_MSG = _("Select your profession.")
 REQUIRED_FIELD_SPECIALTY_SELECT_MSG = _("Select your specialty.")
diff --git a/openedx/core/djangoapps/user_api/accounts/api.py b/openedx/core/djangoapps/user_api/accounts/api.py
index 754882f2ce..8cc013cb94 100644
--- a/openedx/core/djangoapps/user_api/accounts/api.py
+++ b/openedx/core/djangoapps/user_api/accounts/api.py
@@ -5,6 +5,7 @@ Programmatic integration point for User API Accounts sub-application
 
 
 import datetime
+import re
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -403,7 +404,11 @@ def get_name_validation_error(name):
     :return: Validation error message.
 
     """
-    return '' if name else accounts.REQUIRED_FIELD_NAME_MSG
+    if name:
+        regex = re.findall(r'https|http?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+', name)
+        return _('Enter a valid name') if bool(regex) else ''
+    else:
+        return accounts.REQUIRED_FIELD_NAME_MSG
 
 
 def get_username_validation_error(username):
diff --git a/openedx/core/djangoapps/user_authn/api/form_fields.py b/openedx/core/djangoapps/user_authn/api/form_fields.py
index 0080a531e8..bfceb93fc6 100644
--- a/openedx/core/djangoapps/user_authn/api/form_fields.py
+++ b/openedx/core/djangoapps/user_authn/api/form_fields.py
@@ -347,3 +347,20 @@ def add_country_field(is_field_required=False):
     empty
     """
     return {'name': 'country', 'error_message': is_field_required}
+
+
+def add_confirm_email_field(is_field_required=False):
+    """
+    Returns a email confirmation field description
+    """
+    # Translators: This label appears above a field on the registration form
+    # meant to confirm the user's email address.
+
+    email_label = _("Confirm Email")
+
+    return {
+        'name': 'confirm_email',
+        'type': SUPPORTED_FIELDS_TYPES['TEXT'],
+        'label': email_label,
+        'error_message': accounts.REQUIRED_FIELD_CONFIRM_EMAIL_TEXT_MSG if is_field_required else '',
+    }
diff --git a/openedx/core/djangoapps/user_authn/api/helper.py b/openedx/core/djangoapps/user_authn/api/helper.py
index e5f8092f1d..f5e355afe6 100644
--- a/openedx/core/djangoapps/user_authn/api/helper.py
+++ b/openedx/core/djangoapps/user_authn/api/helper.py
@@ -15,8 +15,6 @@ class RegistrationFieldsContext(APIView):
     """
     Registration Fields View used by optional and required fields view.
     """
-    # allow to define custom set of required/optional/hidden fields via configuration
-    FIELD_TYPE = 'hidden'
 
     EXTRA_FIELDS = [
         'confirm_email',
@@ -58,8 +56,9 @@ class RegistrationFieldsContext(APIView):
 
         return field_order
 
-    def __init__(self):
+    def __init__(self, field_type='required'):
         super().__init__()
+        self.field_type = field_type
         self._fields_setting = copy.deepcopy(configuration_helpers.get_value('REGISTRATION_EXTRA_FIELDS'))
         if not self._fields_setting:
             self._fields_setting = copy.deepcopy(settings.REGISTRATION_EXTRA_FIELDS)
@@ -70,18 +69,18 @@ class RegistrationFieldsContext(APIView):
             ordered_extra_fields.remove('year_of_birth')
 
         self.valid_fields = [
-            field for field in ordered_extra_fields if self._fields_setting.get(field) == self.FIELD_TYPE
+            field for field in ordered_extra_fields if self._fields_setting.get(field) == self.field_type
         ]
 
         custom_form = get_registration_extension_form()
         if custom_form:
             for field_name, field in custom_form.fields.items():
-                # If the FIELD_TYPE is required make sure the custom field is required in the form and if the
-                # FIELD_TYPE is optional only add field if it is not required. This is to make sure field is
+                # If the field_type is required make sure the custom field is required in the form and if the
+                # field_type is optional only add field if it is not required. This is to make sure field is
                 # added only once either on Registration Page or Progressive Profiling page.
                 if (
-                    field.required and self.FIELD_TYPE == 'required' or
-                    not field.required and self.FIELD_TYPE == 'optional'
+                    field.required and self.field_type == 'required' or
+                    not field.required and self.field_type == 'optional'
                 ):
                     self.valid_fields.append(field_name)
 
@@ -95,11 +94,15 @@ class RegistrationFieldsContext(APIView):
         for field in self.valid_fields:
             if custom_form and field in custom_form.fields:
                 response[field] = form_fields.add_extension_form_field(
-                    field, custom_form, custom_form.fields[field], self.FIELD_TYPE
+                    field, custom_form, custom_form.fields[field], self.field_type
                 )
             else:
                 field_handler = getattr(form_fields, f'add_{field}_field', None)
                 if field_handler:
-                    response[field] = field_handler(self.FIELD_TYPE == 'required')
+                    if field == 'confirm_email':
+                        if self.field_type == 'required':
+                            response[field] = field_handler(self.field_type == 'required')
+                    else:
+                        response[field] = field_handler(self.field_type == 'required')
 
         return response
diff --git a/openedx/core/djangoapps/user_authn/api/tests/test_optional_fields.py b/openedx/core/djangoapps/user_authn/api/tests/test_optional_fields.py
deleted file mode 100644
index 412a2c9364..0000000000
--- a/openedx/core/djangoapps/user_authn/api/tests/test_optional_fields.py
+++ /dev/null
@@ -1,106 +0,0 @@
-"""
-Tests for OptionalFieldsData View
-"""
-from django.conf import settings
-from django.test.utils import override_settings
-from django.urls import reverse
-from rest_framework import status
-from rest_framework.test import APITestCase
-
-from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration
-from openedx.core.djangolib.testing.utils import skip_unless_lms
-from common.djangoapps.student.tests.factories import UserFactory
-
-
-@skip_unless_lms
-class OptionalFieldsDataViewTest(APITestCase):
-    """
-    Tests for the end-point that returns optional fields.
-    """
-
-    def setUp(self):
-        super().setUp()
-
-        self.user = UserFactory.create(username='test_user', password='password123')
-        self.client.force_authenticate(user=self.user)
-        self.url = reverse('optional_fields')
-
-    def test_unauthenticated_request_is_forbidden(self):
-        """
-        Test that unauthenticated user should not be able to access the endpoint.
-        """
-        self.client.logout()
-        response = self.client.get(self.url)
-        assert response.status_code == status.HTTP_401_UNAUTHORIZED
-
-    @override_settings(REGISTRATION_EXTRA_FIELDS={"goals": "required", "level_of_education": "required"})
-    def test_optional_fields_not_configured(self):
-        """
-        Test that when no optional fields are configured in REGISTRATION_EXTRA_FIELDS
-        settings, then API returns proper response.
-        """
-        response = self.client.get(self.url)
-        assert response.status_code == status.HTTP_400_BAD_REQUEST
-        assert response.data.get('error_code') == 'optional_fields_configured_incorrectly'
-
-    @override_settings(REGISTRATION_EXTRA_FIELDS={"new_field_with_no_description": "optional", "goals": "optional"})
-    def test_optional_field_has_no_description(self):
-        """
-        Test that if a new optional field is added to REGISTRATION_EXTRA_FIELDS without
-        adding field description then that field is omitted from the final response.
-        """
-        expected_response = {
-            'goals': {
-                'name': 'goals',
-                'type': 'textarea',
-                'label': "Tell us why you're interested in {platform_name}".format(
-                    platform_name=settings.PLATFORM_NAME
-                ),
-                'error_message': '',
-            }
-        }
-        response = self.client.get(self.url)
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data.get('fields') == expected_response
-
-    @with_site_configuration(
-        configuration={
-            'EXTRA_FIELD_OPTIONS': {'profession': ['Software Engineer', 'Teacher', 'Other']}
-        }
-    )
-    @override_settings(REGISTRATION_EXTRA_FIELDS={'profession': 'optional', 'specialty': 'optional'})
-    def test_configurable_select_option_fields(self):
-        """
-        Test that if optional fields have configurable options present in EXTRA_FIELD_OPTIONS,
-        they are returned in response as "select" fields otherwise as "text" field.
-        """
-        expected_response = {
-            'profession': {
-                'name': 'profession',
-                'label': 'Profession',
-                'error_message': '',
-                'type': 'select',
-                'options': [('software engineer', 'Software Engineer'), ('teacher', 'Teacher'), ('other', 'Other')],
-            },
-            'specialty': {
-                'name': 'specialty',
-                'label': 'Specialty',
-                'error_message': '',
-                'type': 'text',
-            }
-        }
-        response = self.client.get(self.url)
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data.get('fields') == expected_response
-
-    @override_settings(
-        REGISTRATION_EXTRA_FIELDS={'goals': 'optional', 'specialty': 'optional'},
-        REGISTRATION_FIELD_ORDER=['specialty', 'goals'],
-    )
-    def test_field_order(self):
-        """
-        Test that order of fields
-        """
-        response = self.client.get(self.url)
-        assert response.status_code == status.HTTP_200_OK
-        assert list(response.data['fields'].keys()) == ['specialty', 'goals']
diff --git a/openedx/core/djangoapps/user_authn/api/tests/test_views.py b/openedx/core/djangoapps/user_authn/api/tests/test_views.py
index dd2c24f099..c7aff51071 100644
--- a/openedx/core/djangoapps/user_authn/api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_authn/api/tests/test_views.py
@@ -16,6 +16,7 @@ from common.djangoapps.student.models import Registration
 from common.djangoapps.student.tests.factories import UserFactory
 from common.djangoapps.third_party_auth import pipeline
 from common.djangoapps.third_party_auth.tests.testutil import ThirdPartyAuthTestMixin, simulate_running_pipeline
+from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration
 from openedx.core.djangoapps.geoinfo.api import country_code_from_ip
 from openedx.core.djangoapps.user_api.tests.test_views import UserAPITestCase
 from openedx.core.djangolib.testing.utils import skip_unless_lms
@@ -34,6 +35,7 @@ class MFEContextViewTest(ThirdPartyAuthTestMixin, APITestCase):
         """
         super().setUp()
 
+        self.user = UserFactory.create(username='test_user', password='password123')
         self.url = reverse('mfe_context')
         self.query_params = {'next': '/dashboard'}
 
@@ -103,6 +105,7 @@ class MFEContextViewTest(ThirdPartyAuthTestMixin, APITestCase):
                 'countryCode': self.country_code
             },
             'registration_fields': {},
+            'optional_fields': {},
         }
 
     @patch.dict(settings.FEATURES, {'ENABLE_THIRD_PARTY_AUTH': False})
@@ -194,7 +197,8 @@ class MFEContextViewTest(ThirdPartyAuthTestMixin, APITestCase):
         Test that when no required fields are configured in REGISTRATION_EXTRA_FIELDS
         settings, then API returns proper response.
         """
-        response = self.client.get(self.url)
+        self.query_params.update({'is_registered': True})
+        response = self.client.get(self.url, self.query_params)
         assert response.status_code == status.HTTP_200_OK
         assert response.data['registration_fields']['fields'] == {}
 
@@ -203,13 +207,83 @@ class MFEContextViewTest(ThirdPartyAuthTestMixin, APITestCase):
         REGISTRATION_EXTRA_FIELDS={'state': 'required', 'last_name': 'required', 'first_name': 'required'},
         REGISTRATION_FIELD_ORDER=['first_name', 'last_name', 'state'],
     )
-    def test_field_order(self):
+    def test_required_field_order(self):
         """
-        Test that order of fields
+        Test that order of required fields
+        """
+        self.query_params.update({'is_registered': True})
+        response = self.client.get(self.url, self.query_params)
+        assert response.status_code == status.HTTP_200_OK
+        assert list(response.data['registration_fields']['fields'].keys()) == ['first_name', 'last_name', 'state']
+
+    @override_settings(
+        ENABLE_DYNAMIC_REGISTRATION_FIELDS=True,
+        REGISTRATION_EXTRA_FIELDS={"new_field_with_no_description": "optional", "goals": "optional"}
+    )
+    def test_optional_field_has_no_description(self):
+        """
+        Test that if a new optional field is added to REGISTRATION_EXTRA_FIELDS without
+        adding field description then that field is omitted from the final response.
+        """
+        expected_response = {
+            'goals': {
+                'name': 'goals',
+                'type': 'textarea',
+                'label': "Tell us why you're interested in {platform_name}".format(
+                    platform_name=settings.PLATFORM_NAME
+                ),
+                'error_message': '',
+            }
+        }
+        response = self.client.get(self.url)
+        assert response.status_code == status.HTTP_200_OK
+        assert response.data['optional_fields']['fields'] == expected_response
+
+    @with_site_configuration(
+        configuration={
+            'EXTRA_FIELD_OPTIONS': {'profession': ['Software Engineer', 'Teacher', 'Other']}
+        }
+    )
+    @override_settings(
+        ENABLE_DYNAMIC_REGISTRATION_FIELDS=True,
+        REGISTRATION_EXTRA_FIELDS={'profession': 'optional', 'specialty': 'optional'}
+    )
+    def test_configurable_select_option_fields(self):
+        """
+        Test that if optional fields have configurable options present in EXTRA_FIELD_OPTIONS,
+        they are returned in response as "select" fields otherwise as "text" field.
+        """
+        expected_response = {
+            'profession': {
+                'name': 'profession',
+                'label': 'Profession',
+                'error_message': '',
+                'type': 'select',
+                'options': [('software engineer', 'Software Engineer'), ('teacher', 'Teacher'), ('other', 'Other')],
+            },
+            'specialty': {
+                'name': 'specialty',
+                'label': 'Specialty',
+                'error_message': '',
+                'type': 'text',
+            }
+        }
+        response = self.client.get(self.url)
+        assert response.status_code == status.HTTP_200_OK
+        assert response.data['optional_fields']['fields'] == expected_response
+
+    @override_settings(
+        ENABLE_DYNAMIC_REGISTRATION_FIELDS=True,
+        REGISTRATION_EXTRA_FIELDS={'goals': 'optional', 'specialty': 'optional'},
+        REGISTRATION_FIELD_ORDER=['specialty', 'goals'],
+    )
+    def test_optional_field_order(self):
+        """
+        Test that order of optional fields
         """
         response = self.client.get(self.url)
         assert response.status_code == status.HTTP_200_OK
-        assert list(response.data['registration_fields']['fields'].keys()) == ['first_name', 'last_name', 'state']
+        assert list(response.data['optional_fields']['fields'].keys()) == ['specialty', 'goals']
 
 
 @skip_unless_lms
diff --git a/openedx/core/djangoapps/user_authn/api/urls.py b/openedx/core/djangoapps/user_authn/api/urls.py
index c4ac9dc57c..212249d1c8 100644
--- a/openedx/core/djangoapps/user_authn/api/urls.py
+++ b/openedx/core/djangoapps/user_authn/api/urls.py
@@ -5,7 +5,6 @@ from django.urls import path
 from openedx.core.djangoapps.user_authn.api.views import (
     MFEContextView,
     SendAccountActivationEmail,
-    OptionalFieldsView,
 )
 urlpatterns = [
     path('third_party_auth_context', MFEContextView.as_view(), name='third_party_auth_context'),
@@ -13,5 +12,4 @@ urlpatterns = [
     path('send_account_activation_email', SendAccountActivationEmail.as_view(),
          name='send_account_activation_email'
          ),
-    path('optional_fields', OptionalFieldsView.as_view(), name='optional_fields'),
 ]
diff --git a/openedx/core/djangoapps/user_authn/api/views.py b/openedx/core/djangoapps/user_authn/api/views.py
index 6c9176dcca..93f37a1a26 100644
--- a/openedx/core/djangoapps/user_authn/api/views.py
+++ b/openedx/core/djangoapps/user_authn/api/views.py
@@ -4,12 +4,10 @@ Authn API Views
 
 from django.conf import settings
 
-from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from rest_framework import status
 from rest_framework.response import Response
-from rest_framework.throttling import AnonRateThrottle, UserRateThrottle
+from rest_framework.throttling import AnonRateThrottle
 from rest_framework.views import APIView
-from rest_framework.authentication import SessionAuthentication
 from rest_framework.permissions import IsAuthenticated
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 
@@ -18,7 +16,6 @@ from common.djangoapps.student.views import compose_and_send_activation_email
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_authn.api.helper import RegistrationFieldsContext
 from openedx.core.djangoapps.user_authn.views.utils import get_mfe_context
-from openedx.core.lib.api.authentication import BearerAuthentication
 
 
 class MFEContextThrottle(AnonRateThrottle):
@@ -28,17 +25,18 @@ class MFEContextThrottle(AnonRateThrottle):
     rate = settings.LOGISTRATION_API_RATELIMIT
 
 
-class MFEContextView(RegistrationFieldsContext):
+class MFEContextView(APIView):
     """
-    API to get third party auth providers, user country code and the currently running pipeline.
+    API to get third party auth providers, optional fields, required fields,
+    user country code and the currently running pipeline.
     """
-    FIELD_TYPE = 'required'
     throttle_classes = [MFEContextThrottle]
 
     def get(self, request, **kwargs):  # lint-amnesty, pylint: disable=unused-argument
         """
         Returns
         - dynamic registration fields
+        - dynamic optional fields
         - the context for third party auth providers
         - user country code
         - the currently running pipeline.
@@ -48,22 +46,31 @@ class MFEContextView(RegistrationFieldsContext):
                 is currently running.
             tpa_hint (string): An override flag that will return a matching provider
                 as long as its configuration has been enabled
+            is_register_page (boolen): Determine the call is from register or login page
         """
         request_params = request.GET
         redirect_to = get_next_url_for_login_page(request)
         third_party_auth_hint = request_params.get('tpa_hint')
-
+        is_register_page = request_params.get('is_registered')
         context = {
             'context_data': get_mfe_context(request, redirect_to, third_party_auth_hint),
             'registration_fields': {},
+            'optional_fields': {},
         }
 
         if settings.ENABLE_DYNAMIC_REGISTRATION_FIELDS:
-            registration_fields = self._get_fields()
-            context['registration_fields'].update({
-                'fields': registration_fields,
-                'extended_profile': configuration_helpers.get_value('extended_profile_fields', []),
-            })
+            if is_register_page:
+                registration_fields = RegistrationFieldsContext()._get_fields()  # pylint: disable=protected-access
+                context['registration_fields'].update({
+                    'fields': registration_fields,
+                    'extended_profile': configuration_helpers.get_value('extended_profile_fields', []),
+                })
+            optional_fields = RegistrationFieldsContext('optional')._get_fields()  # pylint: disable=protected-access
+            if optional_fields:
+                context['optional_fields'].update({
+                    'fields': optional_fields,
+                    'extended_profile': configuration_helpers.get_value('extended_profile_fields', []),
+                })
 
         return Response(
             status=status.HTTP_200_OK,
@@ -95,40 +102,3 @@ class SendAccountActivationEmail(APIView):
             return Response(
                 status=status.HTTP_500_INTERNAL_SERVER_ERROR
             )
-
-
-class OptionalFieldsThrottle(UserRateThrottle):
-    """
-    Setting rate limit for OptionalFieldsData API
-    """
-    rate = settings.OPTIONAL_FIELD_API_RATELIMIT
-
-
-class OptionalFieldsView(RegistrationFieldsContext):
-    """
-    Construct Registration forms and associated fields.
-    """
-    FIELD_TYPE = 'optional'
-
-    throttle_classes = [OptionalFieldsThrottle]
-    authentication_classes = (JwtAuthentication, BearerAuthentication, SessionAuthentication,)
-    permission_classes = (IsAuthenticated,)
-
-    def get(self, request):  # lint-amnesty, pylint: disable=unused-argument
-        """
-        Returns Optional fields to be shown on Progressive Profiling page
-        """
-        response = self._get_fields()
-        if not self.valid_fields or not response:
-            return Response(
-                status=status.HTTP_400_BAD_REQUEST,
-                data={'error_code': f'{self.FIELD_TYPE}_fields_configured_incorrectly'}
-            )
-
-        return Response(
-            status=status.HTTP_200_OK,
-            data={
-                'fields': response,
-                'extended_profile': configuration_helpers.get_value('extended_profile_fields', []),
-            },
-        )
diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index 528fbc7e4d..ef72e27673 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -350,6 +350,7 @@ def _link_user_to_third_party_provider(
 def _track_user_registration(user, profile, params, third_party_provider, registration):
     """ Track the user's registration. """
     if hasattr(settings, 'LMS_SEGMENT_KEY') and settings.LMS_SEGMENT_KEY:
+        is_marketable = params.get('marketing_emails_opt_in') in ['true', '1']
         traits = {
             'email': user.email,
             'username': user.username,
@@ -361,10 +362,10 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
             'address': profile.mailing_address,
             'gender': profile.gender_display,
             'country': str(profile.country),
-            'is_marketable': params.get('marketing_emails_opt_in') == 'true'
+            'is_marketable': is_marketable
         }
         if settings.MARKETING_EMAILS_OPT_IN and params.get('marketing_emails_opt_in'):
-            email_subscribe = 'subscribed' if params.get('marketing_emails_opt_in') == 'true' else 'unsubscribed'
+            email_subscribe = 'subscribed' if is_marketable else 'unsubscribed'
             traits['email_subscribe'] = email_subscribe
 
         # .. pii: Many pieces of PII are sent to Segment here. Retired directly through Segment API call in Tubular.
@@ -386,7 +387,7 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
         }
         # VAN-738 - added below properties to experiment marketing emails opt in/out events on Braze.
         if params.get('marketing_emails_opt_in') and settings.MARKETING_EMAILS_OPT_IN:
-            properties['marketing_emails_opt_in'] = params.get('marketing_emails_opt_in') == 'true'
+            properties['marketing_emails_opt_in'] = is_marketable
 
         # DENG-803: For segment events forwarded along to Hubspot, duplicate the `properties` section of
         # the event payload into the `traits` section so that they can be received. This is a temporary
@@ -792,8 +793,11 @@ class RegistrationValidationView(APIView):
     def name_handler(self, request):
         """ Validates whether fullname is valid """
         name = request.data.get('name')
+        validation_error = get_name_validation_error(name)
+        if validation_error:
+            return validation_error
         self.username_suggestions = generate_username_suggestions(name)
-        return get_name_validation_error(name)
+        return validation_error
 
     def username_handler(self, request):
         """ Validates whether the username is valid. """
diff --git a/openedx/core/djangoapps/xblock/runtime/runtime.py b/openedx/core/djangoapps/xblock/runtime/runtime.py
index ba06df6da5..d3f98e2cb9 100644
--- a/openedx/core/djangoapps/xblock/runtime/runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/runtime.py
@@ -23,6 +23,7 @@ from xblock.runtime import KvsFieldData, MemoryIdManager, Runtime
 from xmodule.errortracker import make_error_tracker
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import ModuleI18nService
+from xmodule.services import RebindUserService
 from xmodule.util.sandboxing import SandboxService
 from common.djangoapps.edxmako.services import MakoService
 from common.djangoapps.static_replace.services import ReplaceURLService
@@ -30,6 +31,7 @@ from common.djangoapps.track import contexts as track_contexts
 from common.djangoapps.track import views as track_views
 from common.djangoapps.xblock_django.user_service import DjangoXBlockUserService
 from lms.djangoapps.courseware.model_data import DjangoKeyValueStore, FieldDataCache
+from lms.djangoapps.courseware import module_render
 from lms.djangoapps.grades.api import signals as grades_signals
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
 from openedx.core.djangoapps.xblock.runtime.blockstore_field_data import BlockstoreChildrenData, BlockstoreFieldData
@@ -37,7 +39,7 @@ from openedx.core.djangoapps.xblock.runtime.ephemeral_field_data import Ephemera
 from openedx.core.djangoapps.xblock.runtime.mixin import LmsBlockMixin
 from openedx.core.djangoapps.xblock.utils import get_xblock_id_for_anonymous_user
 from openedx.core.lib.cache_utils import CacheService
-from openedx.core.lib.xblock_utils import wrap_fragment, xblock_local_resource_url
+from openedx.core.lib.xblock_utils import wrap_fragment, xblock_local_resource_url, request_token
 
 from .id_managers import OpaqueKeyReader
 from .shims import RuntimeShim, XBlockShim
@@ -217,6 +219,7 @@ class XBlockRuntime(RuntimeShim, Runtime):
         # TODO: Do these declarations actually help with anything? Maybe this check should
         # be removed from here and from XBlock.runtime
         declaration = block.service_declaration(service_name)
+        context_key = block.scope_ids.usage_id.context_key
         if declaration is None:
             raise NoSuchServiceError(f"Service {service_name!r} was not requested.")
         # Most common service is field-data so check that first:
@@ -230,7 +233,6 @@ class XBlockRuntime(RuntimeShim, Runtime):
                     raise
             return self.block_field_datas[block.scope_ids]
         elif service_name == "completion":
-            context_key = block.scope_ids.usage_id.context_key
             return CompletionService(user=self.user, context_key=context_key)
         elif service_name == "user":
             return DjangoXBlockUserService(
@@ -253,6 +255,17 @@ class XBlockRuntime(RuntimeShim, Runtime):
             return CacheService(cache)
         elif service_name == 'replace_urls':
             return ReplaceURLService(xblock=block, lookup_asset_url=self._lookup_asset_url)
+        elif service_name == 'rebind_user':
+            # this service should ideally be initialized with all the arguments of get_module_system_for_user
+            # but only the positional arguments are passed here as the other arguments are too
+            # specific to the lms.module_render module
+            return RebindUserService(
+                self.user,
+                context_key,
+                module_render.get_module_system_for_user,
+                track_function=make_track_function(),
+                request_token=request_token(crum.get_current_request()),
+            )
 
         # Check if the XBlockRuntimeSystem wants to handle this:
         service = self.system.get_service(block, service_name)
diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py
index 41b028de42..5225d249c5 100644
--- a/openedx/core/djangoapps/xblock/runtime/shims.py
+++ b/openedx/core/djangoapps/xblock/runtime/shims.py
@@ -97,14 +97,6 @@ class RuntimeShim:
         # TODO: Refactor capa to access this directly, don't bother the runtime. Then remove it from here.
         return False  # Change this if/when we need to support unsafe courses in the new runtime.
 
-    @property
-    def DEBUG(self):
-        """
-        Should DEBUG mode (?) be used? This flag is only read by capa.
-        """
-        # TODO: Refactor capa to access this directly, don't bother the runtime. Then remove it from here.
-        return False
-
     def get_python_lib_zip(self):
         """
         A function returning a bytestring or None. The bytestring is the
@@ -145,16 +137,6 @@ class RuntimeShim:
         )
         return self.resources_fs
 
-    @property
-    def node_path(self):
-        """
-        Get the path to Node.js
-
-        Seems only to be used by capa. Remove this if capa can be refactored.
-        """
-        # TODO: Refactor capa to access this directly, don't bother the runtime. Then remove it from here.
-        return getattr(settings, 'NODE_PATH', None)  # Only defined in the LMS
-
     def render_template(self, template_name, dictionary, namespace='main'):
         """
         Render a mako template
diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py
index e8c0e6ac64..52b870033a 100644
--- a/openedx/features/course_experience/__init__.py
+++ b/openedx/features/course_experience/__init__.py
@@ -16,11 +16,6 @@ DISABLE_COURSE_OUTLINE_PAGE_FLAG = CourseWaffleFlag(  # lint-amnesty, pylint: di
     f'{WAFFLE_FLAG_NAMESPACE}.disable_course_outline_page', __name__
 )
 
-# Waffle flag to enable a single unified "Course" tab.
-DISABLE_UNIFIED_COURSE_TAB_FLAG = CourseWaffleFlag(  # lint-amnesty, pylint: disable=toggle-missing-annotation
-    f'{WAFFLE_FLAG_NAMESPACE}.disable_unified_course_tab', __name__
-)
-
 # Waffle flag to enable the sock on the footer of the home and courseware pages.
 DISPLAY_COURSE_SOCK_FLAG = CourseWaffleFlag(f'{WAFFLE_FLAG_NAMESPACE}.display_course_sock', __name__)  # lint-amnesty, pylint: disable=toggle-missing-annotation
 
@@ -100,8 +95,4 @@ def course_home_url(course_key):
         course_key (CourseKey): The course key for which the home url is being requested.
     """
     from .url_helpers import get_learning_mfe_home_url
-
-    if DISABLE_UNIFIED_COURSE_TAB_FLAG.is_enabled(course_key):
-        return reverse('info', args=[str(course_key)])
-
     return get_learning_mfe_home_url(course_key, url_fragment='home')
diff --git a/openedx/features/course_experience/plugins.py b/openedx/features/course_experience/plugins.py
index 1d3adab33c..35f0cea023 100644
--- a/openedx/features/course_experience/plugins.py
+++ b/openedx/features/course_experience/plugins.py
@@ -11,7 +11,6 @@ from django.utils.translation import gettext as _
 from common.djangoapps.student.models import CourseEnrollment
 from openedx.core.lib.courses import get_course_by_id
 
-from . import DISABLE_UNIFIED_COURSE_TAB_FLAG
 from .course_tools import CourseTool
 from .views.course_updates import CourseUpdatesFragmentView
 
@@ -46,8 +45,6 @@ class CourseUpdatesTool(CourseTool):
         """
         Returns True if the user should be shown course updates for this course.
         """
-        if DISABLE_UNIFIED_COURSE_TAB_FLAG.is_enabled(course_key):
-            return False
         if not CourseEnrollment.is_enrolled(request.user, course_key):
             return False
         course = get_course_by_id(course_key)
diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py
index a09600dfa3..373eaf4bd5 100644
--- a/openedx/features/enterprise_support/api.py
+++ b/openedx/features/enterprise_support/api.py
@@ -753,6 +753,7 @@ def get_enterprise_consent_url(request, course_id, user=None, return_to=None, en
     url_params = {
         'enterprise_customer_uuid': enterprise_customer_uuid_for_request(request),
         'course_id': course_id,
+        'source': 'lms-courseware',
         'next': request.build_absolute_uri(return_path),
         'failure_url': request.build_absolute_uri(
             reverse('dashboard') + '?' + urlencode(
diff --git a/openedx/features/enterprise_support/tests/test_api.py b/openedx/features/enterprise_support/tests/test_api.py
index 08e108a67e..3731e81a1b 100644
--- a/openedx/features/enterprise_support/tests/test_api.py
+++ b/openedx/features/enterprise_support/tests/test_api.py
@@ -704,11 +704,15 @@ class TestEnterpriseApi(EnterpriseServiceMockMixin, CacheIsolationTestCase):
         )
 
         course_id = 'course-v1:edX+DemoX+Demo_Course'
-        return_to = None if is_return_to_null else 'info'
+        return_to = None if is_return_to_null else 'courseware'
 
-        expected_path = request_mock.path if is_return_to_null else '/courses/course-v1:edX+DemoX+Demo_Course/info'
+        if is_return_to_null:
+            expected_path = request_mock.path
+        else:
+            expected_path = '/courses/course-v1:edX+DemoX+Demo_Course/courseware'
         expected_url_args = {
             'course_id': ['course-v1:edX+DemoX+Demo_Course'],
+            'source': ['lms-courseware'],
             'failure_url': ['http://localhost:8000/dashboard?consent_failed=course-v1%3AedX%2BDemoX%2BDemo_Course'],
             'enterprise_customer_uuid': ['cf246b88-d5f6-4908-a522-fc307e0b0c59'],
             'next': [f'http://localhost:8000{expected_path}']
diff --git a/openedx/features/enterprise_support/tests/test_serializers.py b/openedx/features/enterprise_support/tests/test_serializers.py
index aa82b8dbb0..1f1b73bae6 100644
--- a/openedx/features/enterprise_support/tests/test_serializers.py
+++ b/openedx/features/enterprise_support/tests/test_serializers.py
@@ -1,7 +1,6 @@
 """
 Tests for custom enterprise_support Serializers.
 """
-
 from uuid import uuid4
 
 from django.test import TestCase
diff --git a/openedx/features/enterprise_support/tests/test_signals.py b/openedx/features/enterprise_support/tests/test_signals.py
index 5ebb1123e1..d1b6f9390f 100644
--- a/openedx/features/enterprise_support/tests/test_signals.py
+++ b/openedx/features/enterprise_support/tests/test_signals.py
@@ -45,7 +45,6 @@ class EnterpriseSupportSignals(SharedModuleStoreTestCase):
     """
     Tests for the enterprise support signals.
     """
-
     def setUp(self):
         UserFactory.create(username=TEST_ECOMMERCE_WORKER)
         self.user = UserFactory.create(username='test', email=TEST_EMAIL)
diff --git a/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html b/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html
index 8818a284fe..33fe77186f 100644
--- a/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html
+++ b/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html
@@ -15,7 +15,6 @@ from openedx.core.djangolib.markup import HTML, Text
         % if course_certificates:
             % for certificate in course_certificates:
                 <%
-                certificate_url = certificate['download_url']
                 course = certificate['course']
 
                 completion_date_message_html = Text(_('Completed {completion_date_html}')).format(
@@ -34,39 +33,20 @@ from openedx.core.djangolib.markup import HTML, Text
                     ),
                 )
                 %>
-                % if certificate_url:
-                    <a href="${certificate_url}" rel="noopener" target="_blank">
-                        <div class="card certificate-card mode-${certificate['type']}">
-                            <div class="card-logo">
-                                <h4 class="sr-only">
-                                    ${_('{course_mode} certificate').format(
-                                        course_mode=certificate['type'],
-                                    )}
-                                </h4>
-                            </div>
-                            <div class="card-content">
-                                <div class="card-supertitle">${course.display_org_with_default}</div>
-                                <div class="card-title">${course.display_name_with_default}</div>
-                                <p class="card-text">${completion_date_message_html}</p>
-                            </div>
-                        </div>
-                    </a>
-                % else:
-                    <div class="card certificate-card mode-${certificate['type']}">
-                        <div class="card-logo">
-                            <h4 class="sr-only">
-                                ${_('{course_mode} certificate').format(
-                                    course_mode=certificate['type'],
-                                )}
-                            </h4>
-                        </div>
-                        <div class="card-content">
-                            <div class="card-supertitle">${course.display_org_with_default}</div>
-                            <div class="card-title">${course.display_name_with_default}</div>
-                            <p class="card-text">${completion_date_message_html}</p>
-                        </div>
+                <div class="card certificate-card mode-${certificate['type']}">
+                    <div class="card-logo">
+                        <h4 class="sr-only">
+                            ${_('{course_mode} certificate').format(
+                                course_mode=certificate['type'],
+                            )}
+                        </h4>
                     </div>
-                % endif
+                    <div class="card-content">
+                        <div class="card-supertitle">${course.display_org_with_default}</div>
+                        <div class="card-title">${course.display_name_with_default}</div>
+                        <p class="card-text">${completion_date_message_html}</p>
+                    </div>
+                </div>
             % endfor
         % elif own_profile:
             <div class="learner-message">
diff --git a/package-lock.json b/package-lock.json
index 81ddbe0537..47c28e4e19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -89,7 +89,7 @@
         "eslint-config-edx-es5": "2.0.0",
         "eslint-import-resolver-webpack": "0.8.4",
         "jasmine-core": "2.6.4",
-        "jasmine-jquery": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
+        "jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
         "jest": "26.0.0",
         "jest-enzyme": "6.0.2",
         "karma": "0.13.22",
@@ -23675,7 +23675,7 @@
     },
     "node_modules/jasmine-jquery": {
       "version": "2.1.1",
-      "resolved": "git+ssh://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
+      "resolved": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
       "integrity": "sha512-P9aZDwDEAVgAbdHG/ViapRzAUJ6zBSq/4I1lJFluIbrld6Sv6LI+HT2J4dgWqtfaCgIyDnHBHSHiJ/anter7wQ==",
       "dev": true,
       "license": "MIT"
@@ -56974,10 +56974,10 @@
       "dev": true
     },
     "jasmine-jquery": {
-      "version": "git+ssh://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
+      "version": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
       "integrity": "sha512-P9aZDwDEAVgAbdHG/ViapRzAUJ6zBSq/4I1lJFluIbrld6Sv6LI+HT2J4dgWqtfaCgIyDnHBHSHiJ/anter7wQ==",
       "dev": true,
-      "from": "jasmine-jquery@git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58"
+      "from": "jasmine-jquery@git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58"
     },
     "jest": {
       "version": "26.0.0",
diff --git a/package.json b/package.json
index 2f7b92e285..97740991aa 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "eslint-config-edx-es5": "2.0.0",
     "eslint-import-resolver-webpack": "0.8.4",
     "jasmine-core": "2.6.4",
-    "jasmine-jquery": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
+    "jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
     "jest": "26.0.0",
     "jest-enzyme": "6.0.2",
     "karma": "0.13.22",
diff --git a/pavelib/quality.py b/pavelib/quality.py
index 1a2d83a4fa..9f233c8a70 100644
--- a/pavelib/quality.py
+++ b/pavelib/quality.py
@@ -71,10 +71,7 @@ def top_python_dirs(dirname):
             dirs = os.listdir(subdir)
             top_dirs.extend(d for d in dirs if os.path.isdir(os.path.join(subdir, d)))
 
-    # sandbox-packages module causes F0001: module-not-found error when running pylint
-    # this will exclude sandbox-packages module from pylint execution
-    # TODO: upgrade the functionality to run pylint tests on sandbox-packages module too.
-    modules_to_remove = ['sandbox-packages', '__pycache__']
+    modules_to_remove = ['__pycache__']
     for module in modules_to_remove:
         if module in top_dirs:
             top_dirs.remove(module)
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 3af7d27891..1c884c0d87 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -25,10 +25,7 @@ django-storages<1.9
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==3.49.5
-
-# Newer versions need a more recent version of python-dateutil
-freezegun==0.3.12
+edx-enterprise==3.51.0
 
 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed )
 oauthlib==3.0.1
@@ -36,14 +33,8 @@ oauthlib==3.0.1
 # django-auth-toolkit==1.3.3 requires oauthlib>=3.1.0 which is pinned because of test failures
 django-oauth-toolkit<=1.3.2
 
-# Upgrading to 2.5.3 on 2020-01-03 triggered "'tzlocal' object has no attribute '_std_offset'" errors in production
-python-dateutil==2.4.0
-# matplotlib>=3.4.0 requires python-dateutil>=2.7
+# Will be updated once we update python-dateutil package
 matplotlib<3.4.0
-# pandas>0.22.0 requires python-dateutil>=2.5.0
-pandas==0.22.0
-# networkx>=2.6 requires pandas>=1.1
-networkx<2.6
 
 # tests failing for pymongo==3.11
 pymongo<3.11
@@ -65,6 +56,9 @@ edxval<2.1
 # version of py2neo will work with Neo4j 3.5.
 py2neo<2022
 
+# pylint==2.14.0 is causing test failures
+pylint==2.13.9
+
 # Sphinx requires docutils<0.18. This pin can be removed once https://github.com/sphinx-doc/sphinx/issues/9777 is closed.
 docutils<0.18
 
@@ -80,3 +74,9 @@ scipy<1.8.0
 # See issue: https://github.com/sphinx-contrib/openapi/issues/123
 mistune<2.0.0
 
+# breaking change on openedx-events==0.10.0
+openedx-events==0.9.1
+# The team that owns this package will manually bump this package rather than having it pulled in automatically.
+# This is to allow them to better control its deployment and to do it in a process that works better
+# for them.
+learner-pathway-progress==1.0.1
diff --git a/requirements/edx-sandbox/py38.in b/requirements/edx-sandbox/py38.in
index 9d90dcba97..115c8d98f4 100644
--- a/requirements/edx-sandbox/py38.in
+++ b/requirements/edx-sandbox/py38.in
@@ -11,12 +11,11 @@ pyparsing                           # Python Parsing module
 random2                             # Implementation of random module that works identically under Python 2 and 3
 scipy                               # Math, science, and engineering library
 sympy                               # Symbolic math library
+codejail-includes                   # CodeJail manages execution of untrusted code in secure sandboxes.
 
 # numpy>=1.17.0 caused failures in importing numpy in code-jail environment.
 # The issue will be investigated and fixed in https://openedx.atlassian.net/browse/BOM-2841.
 numpy>=1.16.0,<1.17.0
 
-# Install these packages from the edx-platform working tree
-# NOTE: if you change code in these packages, you MUST change the version
-# number in its setup.py or the code WILL NOT be installed during deploy.
--e common/lib/sandbox-packages
+
+
diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt
index 8fde6fc3ff..808482e7a3 100644
--- a/requirements/edx-sandbox/py38.txt
+++ b/requirements/edx-sandbox/py38.txt
@@ -4,8 +4,6 @@
 #
 #    make upgrade
 #
-common/lib/sandbox-packages
-    # via -r requirements/edx-sandbox/py38.in
 cffi==1.15.0
     # via cryptography
 chem==1.2.0
@@ -14,17 +12,17 @@ click==8.1.3
     # via
     #   -c requirements/edx-sandbox/../constraints.txt
     #   nltk
+codejail-includes==1.0.0
+    # via -r requirements/edx-sandbox/py38.in
 cryptography==37.0.2
     # via -r requirements/edx-sandbox/py38.in
 cycler==0.11.0
     # via matplotlib
-decorator==4.4.2
-    # via networkx
 joblib==1.1.0
     # via nltk
-kiwisolver==1.4.2
+kiwisolver==1.4.3
     # via matplotlib
-lxml==4.8.0
+lxml==4.9.0
     # via
     #   -r requirements/edx-sandbox/py38.in
     #   openedx-calc
@@ -38,10 +36,8 @@ matplotlib==3.3.4
     #   -r requirements/edx-sandbox/py38.in
 mpmath==1.2.1
     # via sympy
-networkx==2.5.1
-    # via
-    #   -c requirements/edx-sandbox/../constraints.txt
-    #   -r requirements/edx-sandbox/py38.in
+networkx==2.8.4
+    # via -r requirements/edx-sandbox/py38.in
 nltk==3.7
     # via
     #   -r requirements/edx-sandbox/py38.in
@@ -65,13 +61,11 @@ pyparsing==3.0.9
     #   chem
     #   matplotlib
     #   openedx-calc
-python-dateutil==2.4.0
-    # via
-    #   -c requirements/edx-sandbox/../constraints.txt
-    #   matplotlib
+python-dateutil==2.8.2
+    # via matplotlib
 random2==1.0.1
     # via -r requirements/edx-sandbox/py38.in
-regex==2022.4.24
+regex==2022.6.2
     # via nltk
 scipy==1.7.3
     # via
@@ -82,6 +76,7 @@ scipy==1.7.3
 six==1.16.0
     # via
     #   chem
+    #   codejail-includes
     #   python-dateutil
 sympy==1.10.1
     # via
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 1c88257651..aa9097138e 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -36,6 +36,7 @@ botocore==1.8.17                    # via boto3, s3transfer
 bridgekeeper                        # Used for determining permissions for courseware.
 celery                              # Asynchronous task execution library
 chem                                # A helper library for chemistry calculations
+codejail-includes                   # CodeJail manages execution of untrusted code in secure sandboxes.
 contextlib2                         # We need contextlib2.ExitStack so we can stop using contextlib.nested which doesn't exist in python 3
 crowdsourcehinter-xblock
 cryptography                        # Implementations of assorted cryptography algorithms
@@ -108,7 +109,8 @@ ipaddress                           # Ip network support for Embargo feature
 jsonfield                           # Django model field for validated JSON; used in several apps
 laboratory                          # Library for testing that code refactors/infrastructure changes produce identical results
 lxml                                # XML parser
-lti-consumer-xblock>=4.1.0
+learner-pathway-progress==1.0.1     # A plugin for lms to track learners progress in pathays
+lti-consumer-xblock>=4.1.1
 mailsnake                           # Needed for mailchimp (mailing djangoapp)
 mako                                # Primary template language used for server-side page rendering
 Markdown                            # Convert text markup to HTML; used in capa problems, forums, and course wikis
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index c86e5eb722..cdb67f4159 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -22,8 +22,6 @@
     # via -r requirements/edx/local.in
 -e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock
     # via -r requirements/edx/github.in
--e common/lib/sandbox-packages
-    # via -r requirements/edx/local.in
 -e openedx/core/lib/xblock_builtin/xblock_discussion
     # via -r requirements/edx/local.in
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive
@@ -46,6 +44,10 @@ appdirs==1.4.4
     # via fs
 asgiref==3.5.2
     # via django
+asn1crypto==1.5.1
+    # via
+    #   oscrypto
+    #   snowflake-connector-python
 async-timeout==4.0.2
     # via
     #   aiohttp
@@ -57,7 +59,7 @@ attrs==21.4.0
     #   blockstore
     #   edx-ace
     #   openedx-events
-babel==2.10.1
+babel==2.10.2
     # via
     #   -r requirements/edx/base.in
     #   enmerkar
@@ -103,16 +105,18 @@ celery==5.2.7
     #   edx-celeryutils
     #   edx-enterprise
     #   event-tracking
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via
     #   -r requirements/edx/paver.txt
     #   elasticsearch
     #   py2neo
     #   requests
+    #   snowflake-connector-python
 cffi==1.15.0
     # via
     #   cryptography
     #   pynacl
+    #   snowflake-connector-python
 chardet==4.0.0
     # via pysrt
 charset-normalizer==2.0.12
@@ -120,6 +124,7 @@ charset-normalizer==2.0.12
     #   -r requirements/edx/paver.txt
     #   aiohttp
     #   requests
+    #   snowflake-connector-python
 chem==1.2.0
     # via -r requirements/edx/base.in
 click==8.1.3
@@ -143,6 +148,8 @@ code-annotations==1.3.0
     # via
     #   edx-enterprise
     #   edx-toggles
+codejail-includes==1.0.0
+    # via -r requirements/edx/base.in
 contextlib2==21.6.0
     # via -r requirements/edx/base.in
 coreapi==2.3.3
@@ -153,15 +160,17 @@ coreschema==0.0.4
     #   drf-yasg
 crowdsourcehinter-xblock==0.6
     # via -r requirements/edx/base.in
-cryptography==37.0.2
+cryptography==36.0.2
     # via
     #   -r requirements/edx/base.in
     #   django-fernet-fields
     #   edx-enterprise
     #   jwcrypto
     #   pyjwt
+    #   pyopenssl
+    #   snowflake-connector-python
     #   social-auth-core
-cssutils==2.4.0
+cssutils==2.4.2
     # via pynliner
 ddt==1.5.0
     # via
@@ -175,6 +184,7 @@ defusedxml==0.7.1
     #   python3-openid
     #   python3-saml
     #   social-auth-core
+    #   tableauserverclient
 deprecated==1.2.13
     # via
     #   jwcrypto
@@ -236,6 +246,7 @@ django==3.2.13
     #   event-tracking
     #   help-tokens
     #   jsonfield
+    #   learner-pathway-progress
     #   lti-consumer-xblock
     #   openedx-events
     #   openedx-filters
@@ -258,7 +269,7 @@ django-config-models==2.3.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==3.12.0
+django-cors-headers==3.13.0
     # via -r requirements/edx/base.in
 django-countries==7.3.2
     # via
@@ -273,7 +284,7 @@ django-crum==0.7.9
     #   edx-rbac
     #   edx-toggles
     #   super-csv
-django-environ==0.8.1
+django-environ==0.9.0
     # via blockstore
 django-fernet-fields==0.6
     # via
@@ -311,6 +322,7 @@ django-model-utils==4.2.0
     #   edx-submissions
     #   edx-when
     #   edxval
+    #   learner-pathway-progress
     #   ora2
     #   super-csv
 django-mptt==0.13.4
@@ -319,7 +331,7 @@ django-mptt==0.13.4
     #   django-wiki
 django-multi-email-field==0.6.2
     # via edx-enterprise
-django-mysql==4.6.0
+django-mysql==4.7.0
     # via -r requirements/edx/base.in
 django-oauth-toolkit==1.3.2
     # via
@@ -339,7 +351,7 @@ django-sekizai==3.0.1
     # via
     #   -r requirements/edx/base.in
     #   django-wiki
-django-ses==3.0.1
+django-ses==3.1.0
     # via -r requirements/edx/base.in
 django-simple-history==3.0.0
     # via
@@ -361,7 +373,7 @@ django-storages==1.8
     #   edxval
 django-user-tasks==3.0.0
     # via -r requirements/edx/base.in
-django-waffle==2.4.1
+django-waffle==2.5.0
     # via
     #   -r requirements/edx/base.in
     #   blockstore
@@ -454,6 +466,7 @@ edx-django-utils==5.0.0
     #   edx-toggles
     #   edx-when
     #   event-tracking
+    #   learner-pathway-progress
     #   ora2
     #   super-csv
 edx-drf-extensions==8.0.1
@@ -467,7 +480,7 @@ edx-drf-extensions==8.0.1
     #   edx-rbac
     #   edx-when
     #   edxval
-edx-enterprise==3.49.5
+edx-enterprise==3.51.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
@@ -549,7 +562,7 @@ event-tracking==2.1.0
     #   -r requirements/edx/base.in
     #   edx-proctoring
     #   edx-search
-fastavro==1.4.12
+fastavro==1.5.1
     # via openedx-events
 frozenlist==1.3.0
     # via
@@ -587,6 +600,7 @@ idna==3.3
     # via
     #   -r requirements/edx/paver.txt
     #   requests
+    #   snowflake-connector-python
     #   yarl
 importlib-metadata==4.11.4
     # via markdown
@@ -633,15 +647,19 @@ lazy==1.4
     #   acid-xblock
     #   lti-consumer-xblock
     #   ora2
+learner-pathway-progress==1.0.1
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/base.in
 libsass==0.10.0
     # via
     #   -r requirements/edx/paver.txt
     #   ora2
 loremipsum==1.0.5
     # via ora2
-lti-consumer-xblock==4.1.0
+lti-consumer-xblock==4.1.1
     # via -r requirements/edx/base.in
-lxml==4.8.0
+lxml==4.9.0
     # via
     #   -r requirements/edx/base.in
     #   edxval
@@ -701,7 +719,7 @@ mysqlclient==2.1.0
     # via
     #   -r requirements/edx/base.in
     #   blockstore
-newrelic==7.10.0.175
+newrelic==7.12.0.176
     # via
     #   -r requirements/edx/base.in
     #   edx-django-utils
@@ -727,13 +745,17 @@ oauthlib==3.0.1
 openedx-calc==3.0.1
     # via -r requirements/edx/base.in
 openedx-events==0.9.1
-    # via -r requirements/edx/base.in
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/base.in
 openedx-filters==0.7.0
     # via
     #   -r requirements/edx/base.in
     #   lti-consumer-xblock
 ora2==4.4.0
     # via -r requirements/edx/base.in
+oscrypto==1.3.0
+    # via snowflake-connector-python
 packaging==21.3
     # via
     #   drf-yasg
@@ -789,6 +811,7 @@ pycryptodomex==3.14.1
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
+    #   snowflake-connector-python
 pygments==2.12.0
     # via
     #   -r requirements/edx/base.in
@@ -807,6 +830,7 @@ pyjwt[crypto]==2.4.0
     #   edx-proctoring
     #   edx-rest-api-client
     #   pylti1p3
+    #   snowflake-connector-python
     #   social-auth-core
 pylatexenc==2.10
     # via olxcleaner
@@ -825,6 +849,8 @@ pynacl==1.5.0
     # via edx-django-utils
 pynliner==0.8.0
     # via -r requirements/edx/base.in
+pyopenssl==22.0.0
+    # via snowflake-connector-python
 pyparsing==3.0.9
     # via
     #   chem
@@ -834,9 +860,8 @@ pysrt==1.1.2
     # via
     #   -r requirements/edx/base.in
     #   edxval
-python-dateutil==2.4.0
+python-dateutil==2.8.2
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
     #   analytics-python
     #   botocore
@@ -881,8 +906,10 @@ pytz==2022.1
     #   fs
     #   icalendar
     #   interchange
+    #   learner-pathway-progress
     #   olxcleaner
     #   ora2
+    #   snowflake-connector-python
     #   xblock
 pyuca==1.2
     # via -r requirements/edx/base.in
@@ -897,11 +924,11 @@ random2==1.0.1
     # via -r requirements/edx/base.in
 recommender-xblock==2.0.1
     # via -r requirements/edx/base.in
-redis==4.3.1
+redis==4.3.3
     # via -r requirements/edx/base.in
-regex==2022.4.24
+regex==2022.6.2
     # via nltk
-requests==2.27.1
+requests==2.28.0
     # via
     #   -r requirements/edx/paver.txt
     #   analytics-python
@@ -919,6 +946,7 @@ requests==2.27.1
     #   requests-oauthlib
     #   sailthru-client
     #   slumber
+    #   snowflake-connector-python
     #   social-auth-core
     #   tableauserverclient
 requests-oauthlib==1.3.1
@@ -962,6 +990,7 @@ six==1.16.0
     #   chem
     #   click-repl
     #   codejail
+    #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
     #   edx-auth-backends
@@ -988,11 +1017,13 @@ slumber==0.7.1
     #   edx-bulk-grades
     #   edx-enterprise
     #   edx-rest-api-client
+snowflake-connector-python==2.7.8
+    # via edx-enterprise
 social-auth-app-django==5.0.0
     # via
     #   -r requirements/edx/base.in
     #   edx-auth-backends
-social-auth-core==4.2.0
+social-auth-core==4.3.0
     # via
     #   -r requirements/edx/base.in
     #   edx-auth-backends
@@ -1027,7 +1058,7 @@ super-csv==3.0.0
     #   edx-bulk-grades
 sympy==1.10.1
     # via openedx-calc
-tableauserverclient==0.18.0
+tableauserverclient==0.19.0
     # via edx-enterprise
 testfixtures==6.18.5
     # via edx-enterprise
@@ -1063,7 +1094,7 @@ vine==5.0.0
     #   kombu
 voluptuous==0.13.1
     # via ora2
-watchdog==2.1.8
+watchdog==2.1.9
     # via -r requirements/edx/paver.txt
 wcwidth==0.2.5
     # via prompt-toolkit
diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
index 4255da5d7d..4385055d3f 100644
--- a/requirements/edx/coverage.txt
+++ b/requirements/edx/coverage.txt
@@ -6,7 +6,7 @@
 #
 chardet==4.0.0
     # via diff-cover
-coverage==6.4
+coverage==6.4.1
     # via -r requirements/edx/coverage.in
 diff-cover==6.5.0
     # via -r requirements/edx/coverage.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index d8f9de315a..9104898b01 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -22,8 +22,6 @@
     # via -r requirements/edx/testing.txt
 -e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock
     # via -r requirements/edx/testing.txt
--e common/lib/sandbox-packages
-    # via -r requirements/edx/testing.txt
 -e openedx/core/lib/xblock_builtin/xblock_discussion
     # via -r requirements/edx/testing.txt
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive
@@ -65,7 +63,12 @@ asgiref==3.5.2
     #   -r requirements/edx/testing.txt
     #   django
     #   uvicorn
-astroid==2.11.5
+asn1crypto==1.5.1
+    # via
+    #   -r requirements/edx/testing.txt
+    #   oscrypto
+    #   snowflake-connector-python
+astroid==2.11.6
     # via
     #   -r requirements/edx/testing.txt
     #   pylint
@@ -84,7 +87,7 @@ attrs==21.4.0
     #   jsonschema
     #   openedx-events
     #   pytest
-babel==2.10.1
+babel==2.10.2
     # via
     #   -r requirements/edx/testing.txt
     #   enmerkar
@@ -139,17 +142,19 @@ celery==5.2.7
     #   edx-celeryutils
     #   edx-enterprise
     #   event-tracking
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via
     #   -r requirements/edx/testing.txt
     #   elasticsearch
     #   py2neo
     #   requests
+    #   snowflake-connector-python
 cffi==1.15.0
     # via
     #   -r requirements/edx/testing.txt
     #   cryptography
     #   pynacl
+    #   snowflake-connector-python
 chardet==4.0.0
     # via
     #   -r requirements/edx/testing.txt
@@ -160,6 +165,7 @@ charset-normalizer==2.0.12
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   requests
+    #   snowflake-connector-python
 chem==1.2.0
     # via -r requirements/edx/testing.txt
 click==8.1.3
@@ -203,6 +209,8 @@ code-annotations==1.3.0
     #   edx-enterprise
     #   edx-lint
     #   edx-toggles
+codejail-includes==1.0.0
+    # via -r requirements/edx/testing.txt
 contextlib2==21.6.0
     # via -r requirements/edx/testing.txt
 coreapi==2.3.3
@@ -214,25 +222,27 @@ coreschema==0.0.4
     #   -r requirements/edx/testing.txt
     #   coreapi
     #   drf-yasg
-coverage[toml]==6.4
+coverage[toml]==6.4.1
     # via
     #   -r requirements/edx/testing.txt
     #   pytest-cov
 crowdsourcehinter-xblock==0.6
     # via -r requirements/edx/testing.txt
-cryptography==37.0.2
+cryptography==36.0.2
     # via
     #   -r requirements/edx/testing.txt
     #   django-fernet-fields
     #   edx-enterprise
     #   jwcrypto
     #   pyjwt
+    #   pyopenssl
+    #   snowflake-connector-python
     #   social-auth-core
 cssselect==1.1.0
     # via
     #   -r requirements/edx/testing.txt
     #   pyquery
-cssutils==2.4.0
+cssutils==2.4.2
     # via
     #   -r requirements/edx/testing.txt
     #   pynliner
@@ -249,6 +259,7 @@ defusedxml==0.7.1
     #   python3-openid
     #   python3-saml
     #   social-auth-core
+    #   tableauserverclient
 deprecated==1.2.13
     # via
     #   -r requirements/edx/testing.txt
@@ -322,6 +333,7 @@ django==3.2.13
     #   event-tracking
     #   help-tokens
     #   jsonfield
+    #   learner-pathway-progress
     #   lti-consumer-xblock
     #   openedx-events
     #   openedx-filters
@@ -348,7 +360,7 @@ django-config-models==2.3.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==3.12.0
+django-cors-headers==3.13.0
     # via -r requirements/edx/testing.txt
 django-countries==7.3.2
     # via
@@ -365,7 +377,7 @@ django-crum==0.7.9
     #   super-csv
 django-debug-toolbar==3.4.0
     # via -r requirements/edx/development.in
-django-environ==0.8.1
+django-environ==0.9.0
     # via
     #   -r requirements/edx/testing.txt
     #   blockstore
@@ -407,6 +419,7 @@ django-model-utils==4.2.0
     #   edx-submissions
     #   edx-when
     #   edxval
+    #   learner-pathway-progress
     #   ora2
     #   super-csv
 django-mptt==0.13.4
@@ -417,7 +430,7 @@ django-multi-email-field==0.6.2
     # via
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-django-mysql==4.6.0
+django-mysql==4.7.0
     # via -r requirements/edx/testing.txt
 django-oauth-toolkit==1.3.2
     # via
@@ -439,7 +452,7 @@ django-sekizai==3.0.1
     # via
     #   -r requirements/edx/testing.txt
     #   django-wiki
-django-ses==3.0.1
+django-ses==3.1.0
     # via -r requirements/edx/testing.txt
 django-simple-history==3.0.0
     # via
@@ -461,7 +474,7 @@ django-storages==1.8
     #   edxval
 django-user-tasks==3.0.0
     # via -r requirements/edx/testing.txt
-django-waffle==2.4.1
+django-waffle==2.5.0
     # via
     #   -r requirements/edx/testing.txt
     #   blockstore
@@ -567,6 +580,7 @@ edx-django-utils==5.0.0
     #   edx-toggles
     #   edx-when
     #   event-tracking
+    #   learner-pathway-progress
     #   ora2
     #   super-csv
 edx-drf-extensions==8.0.1
@@ -580,7 +594,7 @@ edx-drf-extensions==8.0.1
     #   edx-rbac
     #   edx-when
     #   edxval
-edx-enterprise==3.49.5
+edx-enterprise==3.51.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
@@ -588,7 +602,7 @@ edx-i18n-tools==0.9.1
     # via
     #   -r requirements/edx/testing.txt
     #   ora2
-edx-lint==5.2.2
+edx-lint==5.2.4
     # via -r requirements/edx/testing.txt
 edx-milestones==0.4.0
     # via -r requirements/edx/testing.txt
@@ -681,7 +695,7 @@ execnet==1.9.0
     #   pytest-xdist
 factory-boy==3.2.1
     # via -r requirements/edx/testing.txt
-faker==13.12.0
+faker==13.13.0
     # via
     #   -r requirements/edx/testing.txt
     #   factory-boy
@@ -689,19 +703,17 @@ fastapi==0.78.0
     # via
     #   -r requirements/edx/testing.txt
     #   pact-python
-fastavro==1.4.12
+fastavro==1.5.1
     # via
     #   -r requirements/edx/testing.txt
     #   openedx-events
-filelock==3.7.0
+filelock==3.7.1
     # via
     #   -r requirements/edx/testing.txt
     #   tox
     #   virtualenv
-freezegun==0.3.12
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/testing.txt
+freezegun==1.2.1
+    # via -r requirements/edx/testing.txt
 frozenlist==1.3.0
     # via
     #   -r requirements/edx/testing.txt
@@ -747,6 +759,7 @@ idna==3.3
     #   -r requirements/edx/testing.txt
     #   anyio
     #   requests
+    #   snowflake-connector-python
     #   yarl
 imagesize==1.3.0
     # via sphinx
@@ -756,7 +769,7 @@ importlib-metadata==4.11.4
     #   markdown
     #   pytest-randomly
     #   sphinx
-importlib-resources==5.7.1
+importlib-resources==5.8.0
     # via jsonschema
 inflection==0.5.1
     # via
@@ -813,7 +826,7 @@ jsonfield==3.1.0
     #   edx-submissions
     #   lti-consumer-xblock
     #   ora2
-jsonschema==4.5.1
+jsonschema==4.6.0
     # via sphinxcontrib-openapi
 jwcrypto==1.3.1
     # via
@@ -836,6 +849,10 @@ lazy-object-proxy==1.7.1
     # via
     #   -r requirements/edx/testing.txt
     #   astroid
+learner-pathway-progress==1.0.1
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/testing.txt
 libsass==0.10.0
     # via
     #   -r requirements/edx/testing.txt
@@ -844,9 +861,9 @@ loremipsum==1.0.5
     # via
     #   -r requirements/edx/testing.txt
     #   ora2
-lti-consumer-xblock==4.1.0
+lti-consumer-xblock==4.1.1
     # via -r requirements/edx/testing.txt
-lxml==4.8.0
+lxml==4.9.0
     # via
     #   -r requirements/edx/testing.txt
     #   edxval
@@ -921,7 +938,7 @@ multidict==6.0.2
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   yarl
-mypy==0.960
+mypy==0.961
     # via -r requirements/edx/development.in
 mypy-extensions==0.4.3
     # via mypy
@@ -929,7 +946,7 @@ mysqlclient==2.1.0
     # via
     #   -r requirements/edx/testing.txt
     #   blockstore
-newrelic==7.10.0.175
+newrelic==7.12.0.176
     # via
     #   -r requirements/edx/testing.txt
     #   edx-django-utils
@@ -956,13 +973,19 @@ oauthlib==3.0.1
 openedx-calc==3.0.1
     # via -r requirements/edx/testing.txt
 openedx-events==0.9.1
-    # via -r requirements/edx/testing.txt
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/testing.txt
 openedx-filters==0.7.0
     # via
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
 ora2==4.4.0
     # via -r requirements/edx/testing.txt
+oscrypto==1.3.0
+    # via
+    #   -r requirements/edx/testing.txt
+    #   snowflake-connector-python
 packaging==21.3
     # via
     #   -r requirements/edx/testing.txt
@@ -1062,6 +1085,7 @@ pycryptodomex==3.14.1
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
+    #   snowflake-connector-python
 pydantic==1.9.1
     # via
     #   -r requirements/edx/testing.txt
@@ -1086,6 +1110,7 @@ pyjwt[crypto]==2.4.0
     #   edx-proctoring
     #   edx-rest-api-client
     #   pylti1p3
+    #   snowflake-connector-python
     #   social-auth-core
 pylatexenc==2.10
     # via
@@ -1093,6 +1118,7 @@ pylatexenc==2.10
     #   olxcleaner
 pylint==2.13.9
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
     #   edx-lint
     #   pylint-celery
@@ -1130,6 +1156,10 @@ pynacl==1.5.0
     #   edx-django-utils
 pynliner==0.8.0
     # via -r requirements/edx/testing.txt
+pyopenssl==22.0.0
+    # via
+    #   -r requirements/edx/testing.txt
+    #   snowflake-connector-python
 pyparsing==3.0.9
     # via
     #   -r requirements/edx/testing.txt
@@ -1176,9 +1206,8 @@ pytest-randomly==3.12.0
     # via -r requirements/edx/testing.txt
 pytest-xdist[psutil]==2.5.0
     # via -r requirements/edx/testing.txt
-python-dateutil==2.4.0
+python-dateutil==2.8.2
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
     #   analytics-python
     #   botocore
@@ -1229,8 +1258,10 @@ pytz==2022.1
     #   fs
     #   icalendar
     #   interchange
+    #   learner-pathway-progress
     #   olxcleaner
     #   ora2
+    #   snowflake-connector-python
     #   xblock
 pyuca==1.2
     # via -r requirements/edx/testing.txt
@@ -1248,13 +1279,13 @@ random2==1.0.1
     # via -r requirements/edx/testing.txt
 recommender-xblock==2.0.1
     # via -r requirements/edx/testing.txt
-redis==4.3.1
+redis==4.3.3
     # via -r requirements/edx/testing.txt
-regex==2022.4.24
+regex==2022.6.2
     # via
     #   -r requirements/edx/testing.txt
     #   nltk
-requests==2.27.1
+requests==2.28.0
     # via
     #   -r requirements/edx/testing.txt
     #   analytics-python
@@ -1273,6 +1304,7 @@ requests==2.27.1
     #   requests-oauthlib
     #   sailthru-client
     #   slumber
+    #   snowflake-connector-python
     #   social-auth-core
     #   sphinx
     #   tableauserverclient
@@ -1334,6 +1366,7 @@ six==1.16.0
     #   chem
     #   click-repl
     #   codejail
+    #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
     #   edx-auth-backends
@@ -1345,7 +1378,6 @@ six==1.16.0
     #   edx-rbac
     #   edx-sphinx-theme
     #   event-tracking
-    #   freezegun
     #   fs
     #   fs-s3fs
     #   html5lib
@@ -1375,11 +1407,15 @@ sniffio==1.2.0
     #   anyio
 snowballstemmer==2.2.0
     # via sphinx
+snowflake-connector-python==2.7.8
+    # via
+    #   -r requirements/edx/testing.txt
+    #   edx-enterprise
 social-auth-app-django==5.0.0
     # via
     #   -r requirements/edx/testing.txt
     #   edx-auth-backends
-social-auth-core==4.2.0
+social-auth-core==4.3.0
     # via
     #   -r requirements/edx/testing.txt
     #   edx-auth-backends
@@ -1394,7 +1430,7 @@ soupsieve==2.3.2.post1
     # via
     #   -r requirements/edx/testing.txt
     #   beautifulsoup4
-sphinx==5.0.0
+sphinx==5.0.1
     # via
     #   edx-sphinx-theme
     #   sphinxcontrib-httpdomain
@@ -1442,7 +1478,7 @@ sympy==1.10.1
     # via
     #   -r requirements/edx/testing.txt
     #   openedx-calc
-tableauserverclient==0.18.0
+tableauserverclient==0.19.0
     # via
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
@@ -1533,7 +1569,7 @@ voluptuous==0.13.1
     #   ora2
 vulture==2.4
     # via -r requirements/edx/development.in
-watchdog==2.1.8
+watchdog==2.1.9
     # via -r requirements/edx/testing.txt
 wcwidth==0.2.5
     # via
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 7e064b98e1..343f512d48 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -6,9 +6,9 @@
 #
 alabaster==0.7.12
     # via sphinx
-babel==2.10.1
+babel==2.10.2
     # via sphinx
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via requests
 charset-normalizer==2.0.12
     # via requests
@@ -54,7 +54,7 @@ pytz==2022.1
     # via babel
 pyyaml==6.0
     # via code-annotations
-requests==2.27.1
+requests==2.28.0
     # via sphinx
 six==1.16.0
     # via edx-sphinx-theme
@@ -62,7 +62,7 @@ smmap==5.0.0
     # via gitdb
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==5.0.0
+sphinx==5.0.1
     # via
     #   -r requirements/edx/doc.in
     #   edx-sphinx-theme
diff --git a/requirements/edx/github.in b/requirements/edx/github.in
index 36ba3a4e02..49923d76ec 100644
--- a/requirements/edx/github.in
+++ b/requirements/edx/github.in
@@ -63,7 +63,7 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752
 git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12
 
 # Our libraries:
--e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1
+-e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1  # Note: Blockstore 1.2.2 is failing.
 -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3
 -e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive
diff --git a/requirements/edx/local.in b/requirements/edx/local.in
index e68bbadf11..eb0165c473 100644
--- a/requirements/edx/local.in
+++ b/requirements/edx/local.in
@@ -1,7 +1,6 @@
 # Python libraries to install that are local to the edx-platform repo
 -e .
 -e common/lib/capa
--e common/lib/sandbox-packages
 -e common/lib/xmodule
 
 -e openedx/core/lib/xblock_builtin/xblock_discussion
diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt
index a6c888df66..87e86afebd 100644
--- a/requirements/edx/paver.txt
+++ b/requirements/edx/paver.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via requests
 charset-normalizer==2.0.12
     # via requests
@@ -35,7 +35,7 @@ pymongo==3.10.1
     #   edx-opaque-keys
 python-memcached==1.59
     # via -r requirements/edx/paver.in
-requests==2.27.1
+requests==2.28.0
     # via -r requirements/edx/paver.in
 six==1.16.0
     # via
@@ -48,7 +48,7 @@ stevedore==3.5.0
     #   edx-opaque-keys
 urllib3==1.26.9
     # via requests
-watchdog==2.1.8
+watchdog==2.1.9
     # via -r requirements/edx/paver.in
 wrapt==1.14.1
     # via -r requirements/edx/paver.in
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 390da4feb0..01e9bb2b9f 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -22,8 +22,6 @@
     # via -r requirements/edx/base.txt
 -e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock
     # via -r requirements/edx/base.txt
--e common/lib/sandbox-packages
-    # via -r requirements/edx/base.txt
 -e openedx/core/lib/xblock_builtin/xblock_discussion
     # via -r requirements/edx/base.txt
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive
@@ -61,7 +59,12 @@ asgiref==3.5.2
     #   -r requirements/edx/base.txt
     #   django
     #   uvicorn
-astroid==2.11.5
+asn1crypto==1.5.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   oscrypto
+    #   snowflake-connector-python
+astroid==2.11.6
     # via
     #   pylint
     #   pylint-celery
@@ -79,7 +82,7 @@ attrs==21.4.0
     #   openedx-events
     #   outcome
     #   pytest
-babel==2.10.1
+babel==2.10.2
     # via
     #   -r requirements/edx/base.txt
     #   enmerkar
@@ -134,17 +137,19 @@ celery==5.2.7
     #   edx-celeryutils
     #   edx-enterprise
     #   event-tracking
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via
     #   -r requirements/edx/base.txt
     #   elasticsearch
     #   py2neo
     #   requests
+    #   snowflake-connector-python
 cffi==1.15.0
     # via
     #   -r requirements/edx/base.txt
     #   cryptography
     #   pynacl
+    #   snowflake-connector-python
 chardet==4.0.0
     # via
     #   -r requirements/edx/base.txt
@@ -156,6 +161,7 @@ charset-normalizer==2.0.12
     #   -r requirements/edx/base.txt
     #   aiohttp
     #   requests
+    #   snowflake-connector-python
 chem==1.2.0
     # via -r requirements/edx/base.txt
 click==8.1.3
@@ -195,6 +201,8 @@ code-annotations==1.3.0
     #   edx-enterprise
     #   edx-lint
     #   edx-toggles
+codejail-includes==1.0.0
+    # via -r requirements/edx/base.txt
 contextlib2==21.6.0
     # via -r requirements/edx/base.txt
 coreapi==2.3.3
@@ -206,25 +214,27 @@ coreschema==0.0.4
     #   -r requirements/edx/base.txt
     #   coreapi
     #   drf-yasg
-coverage[toml]==6.4
+coverage[toml]==6.4.1
     # via
     #   -r requirements/edx/coverage.txt
     #   pytest-cov
 crowdsourcehinter-xblock==0.6
     # via -r requirements/edx/base.txt
-cryptography==37.0.2
+cryptography==36.0.2
     # via
     #   -r requirements/edx/base.txt
     #   django-fernet-fields
     #   edx-enterprise
     #   jwcrypto
     #   pyjwt
+    #   pyopenssl
+    #   snowflake-connector-python
     #   social-auth-core
 cssselect==1.1.0
     # via
     #   -r requirements/edx/testing.in
     #   pyquery
-cssutils==2.4.0
+cssutils==2.4.2
     # via
     #   -r requirements/edx/base.txt
     #   pynliner
@@ -242,6 +252,7 @@ defusedxml==0.7.1
     #   python3-openid
     #   python3-saml
     #   social-auth-core
+    #   tableauserverclient
 deprecated==1.2.13
     # via
     #   -r requirements/edx/base.txt
@@ -309,6 +320,7 @@ distlib==0.3.4
     #   event-tracking
     #   help-tokens
     #   jsonfield
+    #   learner-pathway-progress
     #   lti-consumer-xblock
     #   openedx-events
     #   openedx-filters
@@ -335,7 +347,7 @@ django-config-models==2.3.0
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==3.12.0
+django-cors-headers==3.13.0
     # via -r requirements/edx/base.txt
 django-countries==7.3.2
     # via
@@ -350,7 +362,7 @@ django-crum==0.7.9
     #   edx-rbac
     #   edx-toggles
     #   super-csv
-django-environ==0.8.1
+django-environ==0.9.0
     # via
     #   -r requirements/edx/base.txt
     #   blockstore
@@ -392,6 +404,7 @@ django-model-utils==4.2.0
     #   edx-submissions
     #   edx-when
     #   edxval
+    #   learner-pathway-progress
     #   ora2
     #   super-csv
 django-mptt==0.13.4
@@ -402,7 +415,7 @@ django-multi-email-field==0.6.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-mysql==4.6.0
+django-mysql==4.7.0
     # via -r requirements/edx/base.txt
 django-oauth-toolkit==1.3.2
     # via
@@ -424,7 +437,7 @@ django-sekizai==3.0.1
     # via
     #   -r requirements/edx/base.txt
     #   django-wiki
-django-ses==3.0.1
+django-ses==3.1.0
     # via -r requirements/edx/base.txt
 django-simple-history==3.0.0
     # via
@@ -446,7 +459,7 @@ django-storages==1.8
     #   edxval
 django-user-tasks==3.0.0
     # via -r requirements/edx/base.txt
-django-waffle==2.4.1
+django-waffle==2.5.0
     # via
     #   -r requirements/edx/base.txt
     #   blockstore
@@ -550,6 +563,7 @@ edx-django-utils==5.0.0
     #   edx-toggles
     #   edx-when
     #   event-tracking
+    #   learner-pathway-progress
     #   ora2
     #   super-csv
 edx-drf-extensions==8.0.1
@@ -563,7 +577,7 @@ edx-drf-extensions==8.0.1
     #   edx-rbac
     #   edx-when
     #   edxval
-edx-enterprise==3.49.5
+edx-enterprise==3.51.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -572,7 +586,7 @@ edx-i18n-tools==0.9.1
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
     #   ora2
-edx-lint==5.2.2
+edx-lint==5.2.4
     # via -r requirements/edx/testing.in
 edx-milestones==0.4.0
     # via -r requirements/edx/base.txt
@@ -661,22 +675,20 @@ execnet==1.9.0
     # via pytest-xdist
 factory-boy==3.2.1
     # via -r requirements/edx/testing.in
-faker==13.12.0
+faker==13.13.0
     # via factory-boy
 fastapi==0.78.0
     # via pact-python
-fastavro==1.4.12
+fastavro==1.5.1
     # via
     #   -r requirements/edx/base.txt
     #   openedx-events
-filelock==3.7.0
+filelock==3.7.1
     # via
     #   tox
     #   virtualenv
-freezegun==0.3.12
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/testing.in
+freezegun==1.2.1
+    # via -r requirements/edx/testing.in
 frozenlist==1.3.0
     # via
     #   -r requirements/edx/base.txt
@@ -720,6 +732,7 @@ idna==3.3
     #   -r requirements/edx/base.txt
     #   anyio
     #   requests
+    #   snowflake-connector-python
     #   yarl
 importlib-metadata==4.11.4
     # via
@@ -798,6 +811,10 @@ lazy==1.4
     #   ora2
 lazy-object-proxy==1.7.1
     # via astroid
+learner-pathway-progress==1.0.1
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/base.txt
 libsass==0.10.0
     # via
     #   -r requirements/edx/base.txt
@@ -806,9 +823,9 @@ loremipsum==1.0.5
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-lti-consumer-xblock==4.1.0
+lti-consumer-xblock==4.1.1
     # via -r requirements/edx/base.txt
-lxml==4.8.0
+lxml==4.9.0
     # via
     #   -r requirements/edx/base.txt
     #   edxval
@@ -880,7 +897,7 @@ mysqlclient==2.1.0
     # via
     #   -r requirements/edx/base.txt
     #   blockstore
-newrelic==7.10.0.175
+newrelic==7.12.0.176
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -907,13 +924,19 @@ oauthlib==3.0.1
 openedx-calc==3.0.1
     # via -r requirements/edx/base.txt
 openedx-events==0.9.1
-    # via -r requirements/edx/base.txt
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   -r requirements/edx/base.txt
 openedx-filters==0.7.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
 ora2==4.4.0
     # via -r requirements/edx/base.txt
+oscrypto==1.3.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   snowflake-connector-python
 packaging==21.3
     # via
     #   -r requirements/edx/base.txt
@@ -1005,6 +1028,7 @@ pycryptodomex==3.14.1
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
+    #   snowflake-connector-python
 pydantic==1.9.1
     # via fastapi
 pygments==2.12.0
@@ -1027,6 +1051,7 @@ pyjwt[crypto]==2.4.0
     #   edx-proctoring
     #   edx-rest-api-client
     #   pylti1p3
+    #   snowflake-connector-python
     #   social-auth-core
 pylatexenc==2.10
     # via
@@ -1034,6 +1059,7 @@ pylatexenc==2.10
     #   olxcleaner
 pylint==2.13.9
     # via
+    #   -c requirements/edx/../constraints.txt
     #   edx-lint
     #   pylint-celery
     #   pylint-django
@@ -1065,6 +1091,10 @@ pynacl==1.5.0
     #   edx-django-utils
 pynliner==0.8.0
     # via -r requirements/edx/base.txt
+pyopenssl==22.0.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   snowflake-connector-python
 pyparsing==3.0.9
     # via
     #   -r requirements/edx/base.txt
@@ -1107,9 +1137,8 @@ pytest-randomly==3.12.0
     # via -r requirements/edx/testing.in
 pytest-xdist[psutil]==2.5.0
     # via -r requirements/edx/testing.in
-python-dateutil==2.4.0
+python-dateutil==2.8.2
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   analytics-python
     #   botocore
@@ -1160,8 +1189,10 @@ pytz==2022.1
     #   fs
     #   icalendar
     #   interchange
+    #   learner-pathway-progress
     #   olxcleaner
     #   ora2
+    #   snowflake-connector-python
     #   xblock
 pyuca==1.2
     # via -r requirements/edx/base.txt
@@ -1176,13 +1207,13 @@ random2==1.0.1
     # via -r requirements/edx/base.txt
 recommender-xblock==2.0.1
     # via -r requirements/edx/base.txt
-redis==4.3.1
+redis==4.3.3
     # via -r requirements/edx/base.txt
-regex==2022.4.24
+regex==2022.6.2
     # via
     #   -r requirements/edx/base.txt
     #   nltk
-requests==2.27.1
+requests==2.28.0
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
@@ -1201,6 +1232,7 @@ requests==2.27.1
     #   requests-oauthlib
     #   sailthru-client
     #   slumber
+    #   snowflake-connector-python
     #   social-auth-core
     #   tableauserverclient
 requests-oauthlib==1.3.1
@@ -1261,6 +1293,7 @@ six==1.16.0
     #   chem
     #   click-repl
     #   codejail
+    #   codejail-includes
     #   crowdsourcehinter-xblock
     #   edx-ace
     #   edx-auth-backends
@@ -1271,7 +1304,6 @@ six==1.16.0
     #   edx-milestones
     #   edx-rbac
     #   event-tracking
-    #   freezegun
     #   fs
     #   fs-s3fs
     #   html5lib
@@ -1296,11 +1328,15 @@ slumber==0.7.1
     #   edx-rest-api-client
 sniffio==1.2.0
     # via anyio
+snowflake-connector-python==2.7.8
+    # via
+    #   -r requirements/edx/base.txt
+    #   edx-enterprise
 social-auth-app-django==5.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
-social-auth-core==4.2.0
+social-auth-core==4.3.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
@@ -1340,7 +1376,7 @@ sympy==1.10.1
     # via
     #   -r requirements/edx/base.txt
     #   openedx-calc
-tableauserverclient==0.18.0
+tableauserverclient==0.19.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1418,7 +1454,7 @@ voluptuous==0.13.1
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-watchdog==2.1.8
+watchdog==2.1.9
     # via -r requirements/edx/base.txt
 wcwidth==0.2.5
     # via
diff --git a/scripts/verify-dunder-init.sh b/scripts/verify-dunder-init.sh
index c6cf3134bb..9c9fbb130a 100755
--- a/scripts/verify-dunder-init.sh
+++ b/scripts/verify-dunder-init.sh
@@ -38,7 +38,7 @@ exclude+='|^common/test/data/?.*$'
 #  * common/lib/xmodule -> EXCLUDE from check.
 #  * common/lib/xmodule/xmodule/modulestore -> INCLUDE in check.
 exclude+='|^common/lib$'
-exclude+='|^common/lib/(capa|sandbox-packages|xmodule)$'
+exclude+='|^common/lib/(capa|xmodule)$'
 
 # Docs, scripts.
 exclude+='|^docs/.*$'
diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt
index 464507e0f8..11a89b5f64 100644
--- a/scripts/xblock/requirements.txt
+++ b/scripts/xblock/requirements.txt
@@ -4,13 +4,13 @@
 #
 #    make upgrade
 #
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via requests
 charset-normalizer==2.0.12
     # via requests
 idna==3.3
     # via requests
-requests==2.27.1
+requests==2.28.0
     # via -r scripts/xblock/requirements.in
 urllib3==1.26.9
     # via requests
diff --git a/setup.py b/setup.py
index ef1d2fc033..6b0a4cf7b2 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,6 @@ setup(
         "openedx.course_tab": [
             "ccx = lms.djangoapps.ccx.plugins:CcxCourseTab",
             "courseware = lms.djangoapps.courseware.tabs:CoursewareTab",
-            "course_info = lms.djangoapps.courseware.tabs:CourseInfoTab",
             "dates = lms.djangoapps.courseware.tabs:DatesTab",
             "discussion = lms.djangoapps.discussion.plugins:DiscussionTab",
             "edxnotes = lms.djangoapps.edxnotes.plugins:EdxNotesTab",
@@ -135,7 +134,7 @@ setup(
             'lib = openedx.core.djangoapps.content_libraries.library_context:LibraryContextImpl',
         ],
         'openedx.dynamic_partition_generator': [
-            'enrollment_track = common.lib.xmodule.xmodule.partitions.enrollment_track_partition_generator:create_enrollment_track_partition',  # lint-amnesty, pylint: disable=line-too-long
+            'enrollment_track = xmodule.partitions.enrollment_track_partition_generator:create_enrollment_track_partition',  # lint-amnesty, pylint: disable=line-too-long
             'content_type_gating = openedx.features.content_type_gating.partitions:create_content_gating_partition'
         ],
     }
diff --git a/tox.ini b/tox.ini
index 63cbf6c4ef..0bcc2ae0bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,8 +39,6 @@ passenv =
     LMS_CFG
     REVISION_CFG
     MOZ_HEADLESS
-    NODE_PATH
-    NODE_VIRTUAL_ENV
     NO_PREREQ_INSTALL
     NO_PYTHON_UNINSTALL
     NPM_CONFIG_PREFIX