From 85a592d593a89c1211dfc5742f67695d2e88b800 Mon Sep 17 00:00:00 2001
From: lws49 <e0970244@u.nus.edu>
Date: Tue, 26 May 2026 09:25:29 +0800
Subject: [PATCH 1/3] feat(invitations): add external ID to invite flow and
 redesign result dialog

- add ext_id to CourseUser and UserInvitation with unique-per-course index
- accept ext_id in bulk CSV and individual invite form; upsert for existing
  records (enrolled users and pending invitations)
- conflicts (duplicate email or ext_id) surface in Failed with reasons
---
 .../course/user_invitations_controller.rb     |  16 +-
 .../course/unique_external_id_concern.rb      |  12 +-
 app/models/user.rb                            |   2 +-
 .../parse_invitation_concern.rb               |  12 +-
 .../process_invitation_concern.rb             |  46 +-
 ...essments_score_summary_download_service.rb |   2 +-
 .../course/user_invitation_service.rb         |  29 +-
 .../_invitation_result_data.json.jbuilder     |  44 +-
 .../user_invitations/index.json.jbuilder      |   1 +
 .../bundles/course/enrol-requests/store.ts    |   1 +
 .../misc/InvitationResultDialog.tsx           | 398 ++++++++++-----
 .../__test__/InvitationResultDialog.test.tsx  | 439 ++++++++++++++++
 .../tables/InvitationResultExistingTable.tsx  | 157 ++++++
 .../tables/InvitationResultFailedTable.tsx    | 163 ++++++
 .../InvitationResultInvitationsTable.tsx      | 152 ------
 .../tables/InvitationResultPrimaryTable.tsx   | 113 +++++
 .../tables/InvitationResultUsersTable.tsx     | 190 -------
 .../tables/UserInvitationsTable.tsx           |  10 +-
 .../InvitationResultExistingTable.test.tsx    | 188 +++++++
 .../InvitationResultFailedTable.test.tsx      | 228 +++++++++
 .../InvitationResultPrimaryTable.test.tsx     | 112 +++++
 .../InvitationsIndex/__test__/index.test.tsx  |  80 +++
 .../pages/InviteUsersFileUpload/index.tsx     |   2 +-
 .../bundles/course/user-invitations/store.ts  |   1 +
 client/app/types/course/courseUsers.ts        |   1 +
 client/app/types/course/userInvitations.ts    |  35 +-
 client/locales/en.json                        |  52 +-
 client/locales/ko.json                        |  42 +-
 client/locales/zh.json                        |  42 +-
 config/locales/en/errors.yml                  |   1 +
 config/locales/ko/errors.yml                  |   1 +
 config/locales/zh/csv.yml                     |   8 +-
 config/locales/zh/errors.yml                  |   1 +
 .../user_invitations_controller_spec.rb       |  30 ++
 spec/models/course_user_spec.rb               |  25 +-
 spec/models/user_spec.rb                      |  14 +
 .../course/user_invitation_service_spec.rb    | 474 ++++++++++++++----
 37 files changed, 2462 insertions(+), 662 deletions(-)
 create mode 100644 client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/InvitationResultFailedTable.tsx
 delete mode 100644 client/app/bundles/course/user-invitations/components/tables/InvitationResultInvitationsTable.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/InvitationResultPrimaryTable.tsx
 delete mode 100644 client/app/bundles/course/user-invitations/components/tables/InvitationResultUsersTable.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultFailedTable.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultPrimaryTable.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/pages/InvitationsIndex/__test__/index.test.tsx

diff --git a/app/controllers/course/user_invitations_controller.rb b/app/controllers/course/user_invitations_controller.rb
index 4e1e99bf2ff..0ce9d15e9a9 100644
--- a/app/controllers/course/user_invitations_controller.rb
+++ b/app/controllers/course/user_invitations_controller.rb
@@ -218,12 +218,16 @@ def invalid_invitations
 
   # Returns the invitation response based on file or entry invitation.
   def parse_invitation_result(new_invitations, existing_invitations, new_course_users,
-                              existing_course_users, duplicate_users)
-    render_to_string(partial: 'invitation_result_data', locals: { new_invitations: new_invitations,
-                                                                  existing_invitations: existing_invitations,
-                                                                  new_course_users: new_course_users,
-                                                                  existing_course_users: existing_course_users,
-                                                                  duplicate_users: duplicate_users })
+                              existing_course_users, failed_users,
+                              updated_invitations, updated_course_users)
+    render_to_string(partial: 'invitation_result_data',
+                     locals: { new_invitations: new_invitations,
+                               existing_invitations: existing_invitations,
+                               new_course_users: new_course_users,
+                               existing_course_users: existing_course_users,
+                               failed_users: failed_users,
+                               updated_invitations: updated_invitations,
+                               updated_course_users: updated_course_users })
   end
 
   # Enables or disables registration codes in the given course.
diff --git a/app/models/concerns/course/unique_external_id_concern.rb b/app/models/concerns/course/unique_external_id_concern.rb
index c06993a7649..7d271a39069 100644
--- a/app/models/concerns/course/unique_external_id_concern.rb
+++ b/app/models/concerns/course/unique_external_id_concern.rb
@@ -33,14 +33,14 @@ def validate_unique_external_id_within_course
   end
 
   def external_id_taken_by_invitation?
-    query = Course::UserInvitation.unconfirmed.where(course_id: course_id, external_id: external_id)
-    query = query.where.not(id: id) if is_a?(Course::UserInvitation)
-    query.exists?
+    scope = Course::UserInvitation.unconfirmed.where(course_id: course_id, external_id: external_id)
+    scope = scope.where.not(id: id) if is_a?(Course::UserInvitation)
+    scope.exists?
   end
 
   def external_id_taken_by_course_user?
-    query = CourseUser.where(course_id: course_id, external_id: external_id)
-    query = query.where.not(id: id) if is_a?(CourseUser)
-    query.exists?
+    scope = CourseUser.where(course_id: course_id, external_id: external_id)
+    scope = scope.where.not(id: id) if is_a?(CourseUser)
+    scope.exists?
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 85923635741..75aae3fc495 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -129,7 +129,7 @@ def build_course_user_from_invitation(invitation)
                        phantom: invitation.phantom,
                        timeline_algorithm: invitation.timeline_algorithm ||
                           invitation.course&.default_timeline_algorithm,
-                       external_id: invitation.external_id,
+                       external_id: invitation.external_id.presence,
                        creator: self,
                        updater: self)
   end
diff --git a/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb b/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
index d65bf61ec92..ecc094b8e91 100644
--- a/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
+++ b/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
@@ -50,20 +50,20 @@ def partition_unique_users(users)
     seen_emails = Set.new
     seen_external_ids = Set.new
     unique_users = []
-    duplicate_users = []
+    failed_users = []
     users.each do |user|
       ext_id = user[:external_id].presence
       if seen_emails.include?(user[:email])
-        duplicate_users.push(user.merge(reason: :duplicate_email_in_file))
+        failed_users.push(user.merge(reason: :duplicate_email_in_file))
       elsif ext_id && seen_external_ids.include?(ext_id)
-        duplicate_users.push(user.merge(reason: :duplicate_external_id_in_file))
+        failed_users.push(user.merge(reason: :duplicate_external_id_in_file))
       else
         seen_emails.add(user[:email])
         seen_external_ids.add(ext_id) if ext_id
         unique_users << user
       end
     end
-    [unique_users, duplicate_users]
+    [unique_users, failed_users]
   end
 
   # Change all invitees' roles to :student if inviter is a teaching_assistant.
@@ -151,6 +151,10 @@ def strip_row(row)
   def parse_file_row(row)
     return nil if row[1].blank?
 
+    if !@current_course.show_personalized_timeline_features? && row.length > 5
+      raise I18n.t('errors.course.user_invitations.timeline_template_mismatch')
+    end
+
     row[0] = row[1] if row[0].blank?
     role = parse_file_role(row[2])
     phantom = parse_file_phantom(row[3])
diff --git a/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb b/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
index a93b6831135..f256d240e8a 100644
--- a/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
+++ b/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
@@ -20,7 +20,7 @@ module Course::UserInvitationService::ProcessInvitationConcern
   # @return
   #   [Array<(Array<Course::UserInvitation>, Array<Course::UserInvitation>, Array<CourseUser>, Array<CourseUser>)>]
   #   A tuple containing the users newly invited, already invited, newly registered and already registered respectively.
-  #   Conflicts are accumulated into +@duplicate_users+ as a side effect.
+  #   Conflicts are accumulated into +@failed_users+ as a side effect.
   def process_invitations(users)
     @taken_external_ids = load_existing_external_ids
     augment_user_objects(users)
@@ -67,7 +67,7 @@ def add_existing_users(users)
     new_course_users = []
     users.each do |user|
       if (course_user = all_course_users[user[:user].id])
-        existing_course_users << course_user
+        handle_existing_course_user(user, course_user, existing_course_users)
       else
         enroll_new_user(user, user[:external_id].presence, new_course_users)
       end
@@ -75,9 +75,25 @@ def add_existing_users(users)
     [new_course_users, existing_course_users]
   end
 
+  def handle_existing_course_user(user, course_user, existing_course_users)
+    csv_ext_id = user[:external_id].presence
+    current_ext_id = course_user.external_id.presence
+
+    if csv_ext_id.nil? || csv_ext_id == current_ext_id
+      existing_course_users << course_user
+    elsif @taken_external_ids.include?(csv_ext_id)
+      @failed_users.push(user.merge(reason: :external_id_taken))
+    else
+      @taken_external_ids.delete(current_ext_id) if current_ext_id
+      @taken_external_ids.add(csv_ext_id)
+      course_user.external_id = csv_ext_id
+      @updated_course_users << { record: course_user, previous_external_id: current_ext_id }
+    end
+  end
+
   def enroll_new_user(user, ext_id, new_course_users)
     if ext_id && @taken_external_ids.include?(ext_id)
-      @duplicate_users.push(user.merge(reason: :external_id_taken))
+      @failed_users.push(user.merge(reason: :external_id_taken))
     else
       @taken_external_ids.add(ext_id) if ext_id
       new_course_users << build_course_user(user)
@@ -88,7 +104,7 @@ def enroll_new_user(user, ext_id, new_course_users)
   def build_course_user(user)
     @current_course.course_users.build(user: user[:user], name: user[:name],
                                        role: user[:role], phantom: user[:phantom],
-                                       timeline_algorithm: @current_course.default_timeline_algorithm,
+                                       timeline_algorithm: user[:timeline_algorithm],
                                        external_id: user[:external_id],
                                        creator: @current_user, updater: @current_user)
   end
@@ -129,7 +145,7 @@ def invite_new_users(users)
     users.each do |user|
       invitation = all_invitations[user[:email]]
       if invitation
-        existing_invitations << invitation
+        handle_existing_invitation(user, invitation, existing_invitations)
       else
         add_to_new_invitations(user, user[:external_id].presence, new_invitations)
       end
@@ -137,9 +153,27 @@ def invite_new_users(users)
     [new_invitations, existing_invitations]
   end
 
+  def handle_existing_invitation(user, invitation, existing_invitations)
+    csv_ext_id = user[:external_id].presence
+    current_ext_id = invitation.external_id.presence
+
+    # Non-retryable invitations are surfaced as existing invitations, not errors —
+    # the request succeeded; the prior delivery failure is informational.
+    if csv_ext_id.nil? || csv_ext_id == current_ext_id || invitation.is_retryable == false
+      existing_invitations << invitation
+    elsif @taken_external_ids.include?(csv_ext_id)
+      @failed_users.push(user.merge(reason: :external_id_taken))
+    else
+      @taken_external_ids.delete(current_ext_id) if current_ext_id
+      @taken_external_ids.add(csv_ext_id)
+      invitation.external_id = csv_ext_id
+      @updated_invitations << { record: invitation, previous_external_id: current_ext_id }
+    end
+  end
+
   def add_to_new_invitations(user, ext_id, new_invitations)
     if ext_id && @taken_external_ids.include?(ext_id)
-      @duplicate_users.push(user.merge(reason: :external_id_taken))
+      @failed_users.push(user.merge(reason: :external_id_taken))
     else
       @taken_external_ids.add(ext_id) if ext_id
       new_invitations << build_invitation(user)
diff --git a/app/services/course/statistics/assessments_score_summary_download_service.rb b/app/services/course/statistics/assessments_score_summary_download_service.rb
index f3375bbf6d0..88e98756c6a 100644
--- a/app/services/course/statistics/assessments_score_summary_download_service.rb
+++ b/app/services/course/statistics/assessments_score_summary_download_service.rb
@@ -75,7 +75,7 @@ def download_score_summary(csv)
     # content
     @all_students.each do |student|
       csv << [student.name, student.user.email, student.phantom? ? 'phantom' : 'normal',
-              *(@include_external_id ? [student.external_id || ''] : []),
+              *(@include_external_id ? [student.external_id.presence || ''] : []),
               *@assessments.flat_map { |a| @submission_grade_hash[[student.id, a.id]] || '' }]
     end
   end
diff --git a/app/services/course/user_invitation_service.rb b/app/services/course/user_invitation_service.rb
index eb77da78879..b7b39e4ddbc 100644
--- a/app/services/course/user_invitation_service.rb
+++ b/app/services/course/user_invitation_service.rb
@@ -24,28 +24,37 @@ def initialize(current_course_user, current_user, current_course)
   # because Rails does not handle duplicate nested attribute uniqueness constraints.
   #
   # @param [Array<Hash>|File|TempFile] users Invites the given users.
-  # @return [Array<Integer>|nil] An array containing the the size of new_invitations, existing_invitations,
-  #   new_course_users and existing_course_users, duplicate_users respectively if success. nil when fail.
+  # @return [Array<Integer>|nil] An array containing the size of new_invitations, existing_invitations,
+  #   new_course_users, existing_course_users, failed_users, updated_invitations, updated_course_users
+  #   respectively if success. nil when fail.
   # @raise [CSV::MalformedCSVError] When the file provided is invalid.
   def invite(users)
     new_invitations = nil
     existing_invitations = nil
     new_course_users = nil
     existing_course_users = nil
-    duplicate_users = nil
+    failed_users = nil
+    updated_invitations = nil
+    updated_course_users = nil
 
     success = Course.transaction do
       new_invitations, existing_invitations,
-      new_course_users, existing_course_users, duplicate_users = invite_users(users)
+      new_course_users, existing_course_users,
+      failed_users, updated_invitations, updated_course_users = invite_users(users)
+      raise ActiveRecord::Rollback unless updated_invitations.all? { |u| u[:record].save }
+      raise ActiveRecord::Rollback unless updated_course_users.all? { |u| u[:record].save }
       raise ActiveRecord::Rollback unless new_invitations.all?(&:save)
       raise ActiveRecord::Rollback unless new_course_users.all?(&:save)
 
       true
     end
 
-    send_registered_emails(new_course_users) if success
-    send_invitation_emails(new_invitations) if success
-    success ? [new_invitations, existing_invitations, new_course_users, existing_course_users, duplicate_users] : nil
+    return unless success
+
+    send_registered_emails(new_course_users)
+    send_invitation_emails(new_invitations)
+    [new_invitations, existing_invitations, new_course_users, existing_course_users,
+     failed_users, updated_invitations, updated_course_users]
   end
 
   # Resends invitation emails to CourseUsers to the given course.
@@ -76,7 +85,9 @@ def resend_invitation(invitations)
   # @raise [CSV::MalformedCSVError] When the file provided is invalid.
   def invite_users(users)
     unique_users, parse_duplicates = parse_invitations(users)
-    @duplicate_users = parse_duplicates
-    process_invitations(unique_users) + [@duplicate_users]
+    @failed_users = parse_duplicates
+    @updated_invitations = []
+    @updated_course_users = []
+    process_invitations(unique_users) + [@failed_users, @updated_invitations, @updated_course_users]
   end
 end
diff --git a/app/views/course/user_invitations/_invitation_result_data.json.jbuilder b/app/views/course/user_invitations/_invitation_result_data.json.jbuilder
index 421b05dc99d..19c26c655f2 100644
--- a/app/views/course/user_invitations/_invitation_result_data.json.jbuilder
+++ b/app/views/course/user_invitations/_invitation_result_data.json.jbuilder
@@ -8,6 +8,7 @@ json.newInvitations new_invitations.each do |invitation|
   json.role invitation.role
   json.phantom invitation.phantom
   json.sentAt invitation.sent_at
+  json.timelineAlgorithm invitation.timeline_algorithm
 end
 
 json.existingInvitations existing_invitations.each do |invitation|
@@ -18,6 +19,8 @@ json.existingInvitations existing_invitations.each do |invitation|
   json.role invitation.role
   json.phantom invitation.phantom
   json.sentAt invitation.sent_at
+  json.isRetryable invitation.is_retryable
+  json.timelineAlgorithm invitation.timeline_algorithm
 end
 
 json.newCourseUsers new_course_users.each do |course_user|
@@ -27,6 +30,7 @@ json.newCourseUsers new_course_users.each do |course_user|
   json.externalId course_user.external_id
   json.role course_user.role
   json.phantom course_user.phantom?
+  json.timelineAlgorithm course_user.timeline_algorithm
 end
 
 json.existingCourseUsers existing_course_users.each do |course_user|
@@ -36,14 +40,40 @@ json.existingCourseUsers existing_course_users.each do |course_user|
   json.externalId course_user.external_id
   json.role course_user.role
   json.phantom course_user.phantom?
+  json.timelineAlgorithm course_user.timeline_algorithm
 end
 
-json.duplicateUsers duplicate_users.each do |duplicate_user, index|
+json.failedUsers failed_users.each.with_index do |failed_user, index|
   json.id index
-  json.name duplicate_user[:name]
-  json.email duplicate_user[:email]
-  json.externalId duplicate_user[:external_id]
-  json.role duplicate_user[:role]
-  json.phantom duplicate_user[:phantom]
-  json.reason duplicate_user[:reason]
+  json.name failed_user[:name]
+  json.email failed_user[:email]
+  json.externalId failed_user[:external_id]
+  json.role failed_user[:role]
+  json.phantom failed_user[:phantom]
+  json.reason failed_user[:reason]
+  json.timelineAlgorithm failed_user[:timeline_algorithm]
+end
+
+json.updatedInvitations updated_invitations.each do |item|
+  inv = item[:record]
+  json.id            inv.id
+  json.name          inv.name
+  json.email         inv.email
+  json.externalId    inv.external_id
+  json.previousExternalId item[:previous_external_id]
+  json.role          inv.role
+  json.phantom       inv.phantom
+  json.timelineAlgorithm inv.timeline_algorithm
+end
+
+json.updatedCourseUsers updated_course_users.each do |item|
+  cu = item[:record]
+  json.id             cu.id if cu.id
+  json.name           cu.name.strip
+  json.email          cu.user.email
+  json.externalId     cu.external_id
+  json.previousExternalId item[:previous_external_id]
+  json.role           cu.role
+  json.phantom        cu.phantom?
+  json.timelineAlgorithm cu.timeline_algorithm
 end
diff --git a/app/views/course/user_invitations/index.json.jbuilder b/app/views/course/user_invitations/index.json.jbuilder
index f62c23a563c..17ea9e6b4cb 100644
--- a/app/views/course/user_invitations/index.json.jbuilder
+++ b/app/views/course/user_invitations/index.json.jbuilder
@@ -8,4 +8,5 @@ end
 json.manageCourseUsersData do
   json.partial! 'course/users/tabs_data', current_course: current_course
   json.defaultTimelineAlgorithm current_course.default_timeline_algorithm
+  json.showPersonalizedTimelineFeatures current_course.show_personalized_timeline_features
 end
diff --git a/client/app/bundles/course/enrol-requests/store.ts b/client/app/bundles/course/enrol-requests/store.ts
index c27fd35db95..d1fa07dbdb1 100644
--- a/client/app/bundles/course/enrol-requests/store.ts
+++ b/client/app/bundles/course/enrol-requests/store.ts
@@ -32,6 +32,7 @@ const initialState: EnrolRequestsState = {
     requestsCount: 0,
     invitationsCount: 0,
     defaultTimelineAlgorithm: 'fixed',
+    showPersonalizedTimelineFeatures: false,
   },
 };
 
diff --git a/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx b/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx
index 8c6260c4434..7b7b4510f1a 100644
--- a/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx
+++ b/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx
@@ -1,5 +1,6 @@
 import { FC } from 'react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { defineMessages } from 'react-intl';
+import ErrorOutline from '@mui/icons-material/ErrorOutline';
 import HelpIcon from '@mui/icons-material/Help';
 import {
   Button,
@@ -10,30 +11,31 @@ import {
   Tooltip,
   Typography,
 } from '@mui/material';
-import { InvitationResult } from 'types/course/userInvitations';
+import { CourseUserData } from 'types/course/courseUsers';
+import {
+  FailedInvitationRowData,
+  InvitationListData,
+  InvitationResult,
+  InvitationSuccessRow,
+  InvitationUpdatedItem,
+} from 'types/course/userInvitations';
+
+import { useAppSelector } from 'lib/hooks/store';
+import useTranslation from 'lib/hooks/useTranslation';
 
-import InvitationResultInvitationsTable from '../tables/InvitationResultInvitationsTable';
-import InvitationResultUsersTable from '../tables/InvitationResultUsersTable';
+import { getManageCourseUsersSharedData } from '../../selectors';
+import InvitationResultExistingTable, {
+  ExistingRow,
+} from '../tables/InvitationResultExistingTable';
+import InvitationResultFailedTable from '../tables/InvitationResultFailedTable';
+import InvitationResultPrimaryTable from '../tables/InvitationResultPrimaryTable';
 
-interface Props extends WrappedComponentProps {
+interface Props {
   open: boolean;
   handleClose: () => void;
   invitationResult: InvitationResult;
 }
 
-const styles = {
-  icon: {
-    fontSize: '16px',
-    marginRight: '4px',
-  },
-  dialogStyle: {
-    top: 40,
-    '& .MuiDialog-paper': {
-      overflowY: 'hidden',
-    },
-  },
-};
-
 const translations = defineMessages({
   header: {
     id: 'course.userInvitations.InvitationResultDialog.header',
@@ -43,67 +45,147 @@ const translations = defineMessages({
     id: 'course.userInvitations.InvitationResultDialog.close',
     defaultMessage: 'Close',
   },
-  body: {
-    id: 'course.userInvitations.InvitationResultDialog.body',
+  summary: {
+    id: 'course.userInvitations.InvitationResultDialog.summary',
     defaultMessage:
-      '{newInvitationsCount, plural, =0 {No new users were} one {# new user has been} other {# new users have been}} invited to Coursemology. ' +
-      '{newCourseUsersCount, plural, =0 {No user with Coursemology account has been} one {# new user with existing Coursemology account has been} other {# new users with existing Coursemology accounts have been}} added to this course.',
+      '{newInvitations} new {newInvitations, plural, one {invitation} other {invitations}} sent, {newEnrollments} directly enrolled, {alreadyInCourse} already in course.',
+  },
+  summaryFailed: {
+    id: 'course.userInvitations.InvitationResultDialog.summaryFailed',
+    defaultMessage: '{count} failed.',
+  },
+  actionableTitle: {
+    id: 'course.userInvitations.InvitationResultDialog.actionableTitle',
+    defaultMessage: 'Failed ({count})',
   },
-  duplicateInfo: {
-    id: 'course.userInvitations.InvitationResultDialog.duplicateInfo',
+  failedRowsSubtitle: {
+    id: 'course.userInvitations.InvitationResultDialog.failedRowsSubtitle',
     defaultMessage:
-      'Duplicate users were found in the invitation. Only the first instance of each user will be invited.',
+      '{count} {count, plural, one {row} other {rows}} highlighted in red could not be sent',
   },
-  duplicateUsers: {
-    id: 'course.userInvitations.InvitationResultDialog.duplicateUsers',
-    defaultMessage: 'Duplicate Users ({count})',
+  newInvitations: {
+    id: 'course.userInvitations.InvitationResultDialog.newInvitations',
+    defaultMessage: 'New Invitations ({count})',
   },
-  existingCourseUsersInfo: {
-    id: 'course.userInvitations.InvitationResultDialog.existingCourseUsersInfo',
+  newCourseUsers: {
+    id: 'course.userInvitations.InvitationResultDialog.newCourseUsers',
+    defaultMessage: 'New Course Users ({count})',
+  },
+  existingInvitations: {
+    id: 'course.userInvitations.InvitationResultDialog.existingInvitations',
+    defaultMessage: 'Existing Invitations ({count})',
+  },
+  existingInvitationsInfo: {
+    id: 'course.userInvitations.InvitationResultDialog.existingInvitationsInfo',
     defaultMessage:
-      'Existing course users with this email were found in the invitation. They were not invited.',
+      'These users already have a pending invitation. They were not re-invited.',
   },
   existingCourseUsers: {
     id: 'course.userInvitations.InvitationResultDialog.existingCourseUsers',
     defaultMessage: 'Existing Course Users ({count})',
   },
-  existingInvitationsInfo: {
-    id: 'course.userInvitations.InvitationResultDialog.existingInvitationsInfo',
+  existingCourseUsersInfo: {
+    id: 'course.userInvitations.InvitationResultDialog.existingCourseUsersInfo',
     defaultMessage:
-      'Existing invitations for these users with this email already exist. They were not invited.',
+      'These users are already enrolled in this course. They were not re-enrolled.',
   },
-  existingInvitations: {
-    id: 'course.userInvitations.InvitationResultDialog.existingInvitations',
-    defaultMessage: 'Existing Invitations ({count})',
+  externalIdUpdatedInfo: {
+    id: 'course.userInvitations.InvitationResultDialog.externalIdUpdatedInfo',
+    defaultMessage: 'External IDs were updated where specified.',
   },
-  newCourseUsers: {
-    id: 'course.userInvitations.InvitationResultDialog.newCourseUsers',
-    defaultMessage: 'New Course Users ({count})',
-  },
-  newInvitations: {
-    id: 'course.userInvitations.InvitationResultDialog.newInvitations',
-    defaultMessage: 'New Invitations ({count})',
+  updatedSubtitle: {
+    id: 'course.userInvitations.InvitationResultDialog.updatedSubtitle',
+    defaultMessage: '{count} updated · shown first',
   },
 });
 
-const InvitationResultDialog: FC<Props> = (props) => {
-  const { open, handleClose, invitationResult, intl } = props;
+const toSuccessRow = (
+  item: InvitationListData | CourseUserData,
+  prefix: string,
+): InvitationSuccessRow => ({
+  id: `${prefix}-${item.id}`,
+  name: item.name,
+  email: item.email,
+  externalId: item.externalId ?? null,
+  role: item.role ?? '',
+  phantom: item.phantom ?? false,
+  timelineAlgorithm: item.timelineAlgorithm,
+});
+
+const toUpdatedExistingRow = (item: InvitationUpdatedItem): ExistingRow => ({
+  id: item.id,
+  name: item.name,
+  email: item.email,
+  externalId: item.externalId,
+  previousExternalId: item.previousExternalId,
+  role: item.role,
+  phantom: item.phantom,
+  timelineAlgorithm: item.timelineAlgorithm,
+});
+
+const InvitationResultDialog: FC<Props> = ({
+  open,
+  handleClose,
+  invitationResult,
+}) => {
+  const { t } = useTranslation();
+  const { showPersonalizedTimelineFeatures } = useAppSelector(
+    getManageCourseUsersSharedData,
+  );
+
+  if (!open) return null;
+
   const {
-    duplicateUsers,
-    existingCourseUsers,
-    existingInvitations,
-    newCourseUsers,
-    newInvitations,
+    newInvitations = [],
+    newCourseUsers = [],
+    existingInvitations = [],
+    existingCourseUsers = [],
+    failedUsers = [],
+    updatedInvitations = [],
+    updatedCourseUsers = [],
   } = invitationResult;
 
-  if (!open) {
-    return null;
-  }
+  const newInvitationRows = newInvitations.map((i) => toSuccessRow(i, 'inv'));
+  const newCourseUserRows = newCourseUsers.map((u) => toSuccessRow(u, 'cu'));
+
+  const failedInvitations = existingInvitations.filter(
+    (i) => i.isRetryable === false,
+  );
+  const normalExistingInvitations = existingInvitations.filter(
+    (i) => i.isRetryable !== false,
+  );
+
+  const failedToSendRows: FailedInvitationRowData[] = failedInvitations.map(
+    (inv) => ({
+      id: inv.id,
+      name: inv.name,
+      email: inv.email,
+      externalId: inv.externalId ?? undefined,
+      role: inv.role,
+      phantom: inv.phantom,
+      reason: 'failed_to_send' as const,
+      timelineAlgorithm: inv.timelineAlgorithm,
+    }),
+  );
+
+  const allFailedUsers: FailedInvitationRowData[] = [
+    ...failedToSendRows,
+    ...failedUsers,
+  ];
+
+  const existingInvitationRows: ExistingRow[] = [
+    ...normalExistingInvitations,
+    ...updatedInvitations.map(toUpdatedExistingRow),
+  ];
+  const existingCourseUserRows: ExistingRow[] = [
+    ...existingCourseUsers,
+    ...updatedCourseUsers.map(toUpdatedExistingRow),
+  ];
+
+  const needsAttentionCount = failedUsers.length + failedInvitations.length;
 
   const handleDialogClose = (_event: object, reason: string): void => {
-    if (reason !== 'backdropClick') {
-      handleClose();
-    }
+    if (reason !== 'backdropClick') handleClose();
   };
 
   return (
@@ -113,113 +195,153 @@ const InvitationResultDialog: FC<Props> = (props) => {
       maxWidth="lg"
       onClose={handleDialogClose}
       open={open}
-      sx={styles.dialogStyle}
+      sx={{ top: 40, '& .MuiDialog-paper': { overflowY: 'auto' } }}
     >
-      <DialogTitle>{intl.formatMessage(translations.header)}</DialogTitle>
+      <DialogTitle>{t(translations.header)}</DialogTitle>
       <DialogContent>
         <Typography gutterBottom variant="body2">
-          {intl.formatMessage(translations.body, {
-            newInvitationsCount: newInvitations?.length ?? 0,
-            newCourseUsersCount: newCourseUsers?.length ?? 0,
+          {needsAttentionCount > 0 &&
+            `${t(translations.summaryFailed, { count: needsAttentionCount })} `}
+          {t(translations.summary, {
+            newInvitations: newInvitations.length,
+            newEnrollments: newCourseUsers.length,
+            alreadyInCourse:
+              existingInvitationRows.length + existingCourseUserRows.length,
           })}
         </Typography>
-        {duplicateUsers && duplicateUsers.length > 0 && (
-          <div className="duplicates">
-            <InvitationResultUsersTable
-              title={
-                <Typography variant="h6">
-                  <Tooltip
-                    title={intl.formatMessage(translations.duplicateInfo)}
-                  >
-                    <HelpIcon style={styles.icon} />
-                  </Tooltip>
-                  {intl.formatMessage(translations.duplicateUsers, {
-                    count: duplicateUsers.length,
-                  })}
-                </Typography>
+
+        {needsAttentionCount > 0 && (
+          <section style={{ marginTop: 24 }}>
+            <Typography variant="h6">
+              <ErrorOutline
+                color="error"
+                sx={{ verticalAlign: 'middle', mr: 0.5 }}
+              />
+              {t(translations.actionableTitle, {
+                count: needsAttentionCount,
+              })}
+            </Typography>
+            {failedInvitations.length > 0 && (
+              <Typography color="error" variant="caption">
+                {t(translations.failedRowsSubtitle, {
+                  count: failedInvitations.length,
+                })}
+              </Typography>
+            )}
+            <InvitationResultFailedTable
+              showPersonalizedTimelineFeatures={
+                showPersonalizedTimelineFeatures
               }
-              users={duplicateUsers}
+              users={allFailedUsers}
             />
-          </div>
+          </section>
         )}
-        {existingInvitations && existingInvitations.length > 0 && (
-          <div className="existingInvitations">
-            <InvitationResultInvitationsTable
-              invitations={existingInvitations}
-              title={
-                <Typography variant="h6">
-                  <Tooltip
-                    title={intl.formatMessage(
-                      translations.existingInvitationsInfo,
-                    )}
-                  >
-                    <HelpIcon style={styles.icon} />
-                  </Tooltip>
-                  {intl.formatMessage(translations.existingInvitations, {
-                    count: existingInvitations.length,
-                  })}
-                </Typography>
+
+        {newInvitationRows.length > 0 && (
+          <section style={{ marginTop: 24 }}>
+            <Typography variant="h6">
+              {t(translations.newInvitations, {
+                count: newInvitationRows.length,
+              })}
+            </Typography>
+            <InvitationResultPrimaryTable
+              rows={newInvitationRows}
+              showPersonalizedTimelineFeatures={
+                showPersonalizedTimelineFeatures
               }
             />
-          </div>
+          </section>
         )}
-        {existingCourseUsers && existingCourseUsers.length > 0 && (
-          <div className="existingCourseUsers">
-            <InvitationResultUsersTable
-              title={
-                <Typography variant="h6">
-                  <Tooltip
-                    title={intl.formatMessage(
-                      translations.existingCourseUsersInfo,
-                    )}
-                  >
-                    <HelpIcon style={styles.icon} />
-                  </Tooltip>
-                  {intl.formatMessage(translations.existingCourseUsers, {
-                    count: existingCourseUsers.length,
-                  })}
-                </Typography>
+
+        {newCourseUserRows.length > 0 && (
+          <section style={{ marginTop: 24 }}>
+            <Typography variant="h6">
+              {t(translations.newCourseUsers, {
+                count: newCourseUserRows.length,
+              })}
+            </Typography>
+            <InvitationResultPrimaryTable
+              rows={newCourseUserRows}
+              showPersonalizedTimelineFeatures={
+                showPersonalizedTimelineFeatures
               }
-              users={existingCourseUsers}
             />
-          </div>
+          </section>
         )}
-        {newInvitations && newInvitations.length > 0 && (
-          <div className="newInvitations">
-            <InvitationResultInvitationsTable
-              invitations={newInvitations}
-              title={
-                <Typography variant="h6">
-                  {intl.formatMessage(translations.newInvitations, {
-                    count: newInvitations.length,
-                  })}
-                </Typography>
+
+        {existingInvitationRows.length > 0 && (
+          <section style={{ marginTop: 24 }}>
+            <Typography variant="h6">
+              <Tooltip
+                title={[
+                  t(translations.existingInvitationsInfo),
+                  ...(updatedInvitations.length > 0
+                    ? [t(translations.externalIdUpdatedInfo)]
+                    : []),
+                ].join(' ')}
+              >
+                <HelpIcon sx={{ fontSize: 16, mr: 0.5 }} />
+              </Tooltip>
+              {t(translations.existingInvitations, {
+                count: existingInvitationRows.length,
+              })}
+            </Typography>
+            {updatedInvitations.length > 0 && (
+              <Typography color="primary" variant="caption">
+                {t(translations.updatedSubtitle, {
+                  count: updatedInvitations.length,
+                })}
+              </Typography>
+            )}
+            <InvitationResultExistingTable
+              rows={existingInvitationRows}
+              showPersonalizedTimelineFeatures={
+                showPersonalizedTimelineFeatures
               }
             />
-          </div>
+          </section>
         )}
-        {newCourseUsers && newCourseUsers.length > 0 && (
-          <div className="newCourseUsers">
-            <InvitationResultUsersTable
-              title={
-                <Typography variant="h6">
-                  {intl.formatMessage(translations.newCourseUsers, {
-                    count: newCourseUsers.length,
-                  })}
-                </Typography>
+
+        {existingCourseUserRows.length > 0 && (
+          <section style={{ marginTop: 24 }}>
+            <Typography variant="h6">
+              <Tooltip
+                title={[
+                  t(translations.existingCourseUsersInfo),
+                  ...(updatedCourseUsers.length > 0
+                    ? [t(translations.externalIdUpdatedInfo)]
+                    : []),
+                ].join(' ')}
+              >
+                <HelpIcon sx={{ fontSize: 16, mr: 0.5 }} />
+              </Tooltip>
+              {t(translations.existingCourseUsers, {
+                count: existingCourseUserRows.length,
+              })}
+            </Typography>
+            {updatedCourseUsers.length > 0 && (
+              <Typography color="primary" variant="caption">
+                {t(translations.updatedSubtitle, {
+                  count: updatedCourseUsers.length,
+                })}
+              </Typography>
+            )}
+            <InvitationResultExistingTable
+              rows={existingCourseUserRows}
+              showPersonalizedTimelineFeatures={
+                showPersonalizedTimelineFeatures
               }
-              users={newCourseUsers}
             />
-          </div>
+          </section>
         )}
       </DialogContent>
       <DialogActions>
         <Button color="secondary" onClick={handleClose}>
-          {intl.formatMessage(translations.close)}
+          {t(translations.close)}
         </Button>
       </DialogActions>
     </Dialog>
   );
 };
 
-export default injectIntl(InvitationResultDialog);
+export default InvitationResultDialog;
diff --git a/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx b/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx
new file mode 100644
index 00000000000..2c460cf1a25
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx
@@ -0,0 +1,439 @@
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+import { CourseUserData } from 'types/course/courseUsers';
+import {
+  FailedInvitationRowData,
+  InvitationListData,
+  InvitationResult,
+  InvitationUpdatedItem,
+} from 'types/course/userInvitations';
+
+import InvitationResultDialog from '../InvitationResultDialog';
+
+const CAROL_EMAIL = 'carol@example.com';
+
+const carolDuplicateUser: FailedInvitationRowData = {
+  id: 3,
+  name: 'Carol',
+  email: CAROL_EMAIL,
+  role: 'student',
+  reason: 'duplicate_email_in_file',
+};
+
+const baseInvitation: InvitationListData = {
+  id: 1,
+  name: 'Alice',
+  email: 'alice@example.com',
+  externalId: null,
+  role: 'student',
+  phantom: false,
+  invitationKey: 'abc',
+  confirmed: false,
+  sentAt: null,
+  confirmedAt: null,
+  isRetryable: true,
+};
+
+const failedInvitation: InvitationListData = {
+  ...baseInvitation,
+  id: 99,
+  name: 'FailedUser',
+  email: 'failed@example.com',
+  isRetryable: false,
+};
+
+const baseCourseUser = {
+  id: 2,
+  name: 'Bob',
+  email: 'bob@example.com',
+  externalId: null,
+  role: 'student',
+  phantom: false,
+  level: 0,
+  exp: 0,
+  canReadStatistics: false,
+} as CourseUserData;
+
+const noop = (): void => {};
+
+const renderDialog = (result: InvitationResult): void => {
+  render(
+    <InvitationResultDialog
+      handleClose={noop}
+      invitationResult={result}
+      open
+    />,
+  );
+};
+
+describe('InvitationResultDialog', () => {
+  // Lifecycle
+  it('renders nothing when closed', async () => {
+    render(
+      <InvitationResultDialog
+        handleClose={noop}
+        invitationResult={{}}
+        open={false}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+  });
+
+  it('hides all optional sections when data is empty', async () => {
+    renderDialog({});
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/Failed/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/New Invitations/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/New Course Users/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Existing Invitations/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Existing Course Users/)).not.toBeInTheDocument();
+  });
+
+  // Summary line
+  it('shows summary text with correct counts', async () => {
+    renderDialog({
+      newInvitations: [baseInvitation],
+      newCourseUsers: [baseCourseUser],
+      existingInvitations: [{ ...baseInvitation, id: 3 }],
+      existingCourseUsers: [{ ...baseCourseUser, id: 4 }],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText(
+        /1 new invitation sent, 1 directly enrolled, 2 already in course/,
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('prepends failed count to summary when failures present', async () => {
+    renderDialog({ failedUsers: [carolDuplicateUser] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText(/1 failed\./)).toBeInTheDocument();
+  });
+
+  it('does not prepend failed count to summary when count is zero', async () => {
+    renderDialog({ newInvitations: [baseInvitation] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/failed\./)).not.toBeInTheDocument();
+  });
+
+  // Failed section
+  it('shows Failed section when failedUsers is non-empty', async () => {
+    renderDialog({ failedUsers: [carolDuplicateUser] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Failed (1)')).toBeInTheDocument();
+    expect(screen.getByText('Carol')).toBeInTheDocument();
+  });
+
+  it('renders Failed before New Invitations in DOM', async () => {
+    renderDialog({
+      newInvitations: [baseInvitation],
+      failedUsers: [carolDuplicateUser],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    const headings = screen
+      .getAllByRole('heading')
+      .map((h) => h.textContent ?? '');
+    const needsIdx = headings.findIndex((h) => h.includes('Failed'));
+    const newInvIdx = headings.findIndex((h) => h.includes('New Invitations'));
+    expect(needsIdx).toBeGreaterThanOrEqual(0);
+    expect(newInvIdx).toBeGreaterThanOrEqual(0);
+    expect(needsIdx).toBeLessThan(newInvIdx);
+  });
+
+  it('shows failed invitation in Failed, not Existing Invitations', async () => {
+    renderDialog({ existingInvitations: [failedInvitation] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Failed (1)')).toBeInTheDocument();
+    expect(screen.getByText('FailedUser')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'Failed to send invitation email, please try again - if failures persist, contact us for assistance',
+      ),
+    ).toBeInTheDocument();
+    expect(screen.queryByText(/Existing Invitations/)).not.toBeInTheDocument();
+  });
+
+  it('shows failed invitation with non-null externalId in Failed, not Existing Invitations', async () => {
+    const failedWithExtId: InvitationListData = {
+      ...baseInvitation,
+      id: 100,
+      name: 'FailedWithExtId',
+      email: 'failedext@example.com',
+      externalId: 'old-id',
+      isRetryable: false,
+    };
+    renderDialog({ existingInvitations: [failedWithExtId] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Failed (1)')).toBeInTheDocument();
+    expect(screen.getByText('FailedWithExtId')).toBeInTheDocument();
+    expect(screen.queryByText(/Existing Invitations/)).not.toBeInTheDocument();
+  });
+
+  it('keeps retryable existing invitation in Existing Invitations section', async () => {
+    renderDialog({
+      existingInvitations: [{ ...baseInvitation, id: 7, name: 'Retryable' }],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Invitations (1)')).toBeInTheDocument();
+    expect(screen.getByText('Retryable')).toBeInTheDocument();
+    expect(screen.queryByText(/Failed/)).not.toBeInTheDocument();
+  });
+
+  it('does not count failed invitations in alreadyInCourse summary', async () => {
+    renderDialog({
+      existingInvitations: [failedInvitation],
+      existingCourseUsers: [baseCourseUser],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText(
+        /0 new invitations sent, 0 directly enrolled, 1 already in course/,
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('shows failedRowsSubtitle when failed_to_send rows exist', async () => {
+    renderDialog({ existingInvitations: [failedInvitation] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText('1 row highlighted in red could not be sent'),
+    ).toBeInTheDocument();
+  });
+
+  it('does not show failedRowsSubtitle when only duplicate users exist', async () => {
+    renderDialog({ failedUsers: [carolDuplicateUser] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/highlighted in red/)).not.toBeInTheDocument();
+  });
+
+  it('shows failedRowsSubtitle with failed_to_send count only when mixed failures', async () => {
+    renderDialog({
+      existingInvitations: [failedInvitation],
+      failedUsers: [carolDuplicateUser],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Failed (2)')).toBeInTheDocument();
+    expect(
+      screen.getByText('1 row highlighted in red could not be sent'),
+    ).toBeInTheDocument();
+  });
+
+  // New Invitations section
+  it('shows New Invitations section when newInvitations is non-empty', async () => {
+    renderDialog({ newInvitations: [baseInvitation] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('New Invitations (1)')).toBeInTheDocument();
+    expect(screen.getByText('Alice')).toBeInTheDocument();
+  });
+
+  it('hides New Invitations section when empty', async () => {
+    renderDialog({ newInvitations: [] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/New Invitations/)).not.toBeInTheDocument();
+  });
+
+  // New Course Users section
+  it('shows New Course Users section when non-empty', async () => {
+    renderDialog({ newCourseUsers: [baseCourseUser] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('New Course Users (1)')).toBeInTheDocument();
+    expect(screen.getByText('Bob')).toBeInTheDocument();
+  });
+
+  it('hides New Course Users section when empty', async () => {
+    renderDialog({ newCourseUsers: [] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/New Course Users/)).not.toBeInTheDocument();
+  });
+
+  // Existing Invitations section
+  it('shows Existing Invitations section with name visible', async () => {
+    renderDialog({
+      existingInvitations: [{ ...baseInvitation, id: 5, name: 'Charlie' }],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Invitations (1)')).toBeInTheDocument();
+    expect(screen.getByText('Charlie')).toBeInTheDocument();
+  });
+
+  it('hides Existing Invitations section when both existingInvitations and updatedInvitations are empty', async () => {
+    renderDialog({ newInvitations: [baseInvitation] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/Existing Invitations/)).not.toBeInTheDocument();
+  });
+
+  it('shows updatedSubtitle in Existing Invitations when updatedInvitations is non-empty', async () => {
+    const updatedItem: InvitationUpdatedItem = {
+      id: 10,
+      name: 'Carol',
+      email: CAROL_EMAIL,
+      externalId: 'EXT001',
+      previousExternalId: null,
+      role: 'student',
+      phantom: false,
+    };
+    renderDialog({ updatedInvitations: [updatedItem] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Invitations (1)')).toBeInTheDocument();
+    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+  });
+
+  it('does not show updatedSubtitle when updatedInvitations is empty', async () => {
+    renderDialog({
+      existingInvitations: [{ ...baseInvitation, id: 5, name: 'Charlie' }],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/updated · shown first/)).not.toBeInTheDocument();
+  });
+
+  it('shows combined count, updated rows before normal rows, and correct alreadyInCourse when both existingInvitations and updatedInvitations are present', async () => {
+    const updatedItem: InvitationUpdatedItem = {
+      id: 10,
+      name: 'UpdatedAlice',
+      email: 'updated@example.com',
+      externalId: 'NEW001',
+      previousExternalId: 'OLD001',
+      role: 'student',
+      phantom: false,
+    };
+    renderDialog({
+      existingInvitations: [
+        { ...baseInvitation, id: 5, name: 'NormalCharlie' },
+      ],
+      updatedInvitations: [updatedItem],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Invitations (2)')).toBeInTheDocument();
+    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /0 new invitations sent, 0 directly enrolled, 2 already in course/,
+      ),
+    ).toBeInTheDocument();
+    const normalRow = screen.getByText('NormalCharlie');
+    const updatedRow = screen.getByText('UpdatedAlice');
+    expect(
+      // eslint-disable-next-line no-bitwise
+      normalRow.compareDocumentPosition(updatedRow) &
+        Node.DOCUMENT_POSITION_PRECEDING,
+    ).toBeTruthy();
+  });
+
+  // Existing Course Users section
+  it('shows Existing Course Users section with name visible', async () => {
+    renderDialog({
+      existingCourseUsers: [{ ...baseCourseUser, id: 6, name: 'Diana' }],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Course Users (1)')).toBeInTheDocument();
+    expect(screen.getByText('Diana')).toBeInTheDocument();
+  });
+
+  it('hides Existing Course Users section when empty', async () => {
+    renderDialog({ newInvitations: [baseInvitation] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText(/Existing Course Users/)).not.toBeInTheDocument();
+  });
+
+  it('shows updatedSubtitle for Existing Course Users when updatedCourseUsers is non-empty', async () => {
+    const updatedUser = {
+      id: 20,
+      name: 'Dana',
+      email: 'dana@example.com',
+      externalId: 'CU001',
+      previousExternalId: 'CU000',
+      role: 'student',
+      phantom: false,
+    };
+    renderDialog({ updatedCourseUsers: [updatedUser] });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Course Users (1)')).toBeInTheDocument();
+    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+  });
+
+  it('shows combined count, updated rows before normal rows, and correct alreadyInCourse when both existingCourseUsers and updatedCourseUsers are present', async () => {
+    const updatedUser = {
+      id: 20,
+      name: 'UpdatedDana',
+      email: 'updated-dana@example.com',
+      externalId: 'CU001',
+      previousExternalId: 'CU000',
+      role: 'student',
+      phantom: false,
+    };
+    renderDialog({
+      existingCourseUsers: [{ ...baseCourseUser, id: 6, name: 'NormalEve' }],
+      updatedCourseUsers: [updatedUser],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Existing Course Users (2)')).toBeInTheDocument();
+    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /0 new invitations sent, 0 directly enrolled, 2 already in course/,
+      ),
+    ).toBeInTheDocument();
+    const normalRow = screen.getByText('NormalEve');
+    const updatedRow = screen.getByText('UpdatedDana');
+    expect(
+      // eslint-disable-next-line no-bitwise
+      normalRow.compareDocumentPosition(updatedRow) &
+        Node.DOCUMENT_POSITION_PRECEDING,
+    ).toBeTruthy();
+  });
+
+  describe('Personalized Timeline column (showPersonalizedTimelineFeatures)', () => {
+    const storeWithTimelines = {
+      invitations: {
+        invitations: { ids: [], entities: {}, byId: {} },
+        permissions: {
+          canManageCourseUsers: false,
+          canManageEnrolRequests: false,
+          canManageReferenceTimelines: false,
+          canManagePersonalTimes: false,
+          canRegisterWithCode: false,
+        },
+        manageCourseUsersData: {
+          requestsCount: 0,
+          invitationsCount: 0,
+          defaultTimelineAlgorithm: 'fixed' as const,
+          showPersonalizedTimelineFeatures: true,
+        },
+        courseRegistrationKey: '',
+      },
+    };
+
+    it('shows Personalized Timeline column in new invitations table when feature is on', async () => {
+      render(
+        <InvitationResultDialog
+          handleClose={noop}
+          invitationResult={{
+            newInvitations: [{ ...baseInvitation, timelineAlgorithm: 'otot' }],
+          }}
+          open
+        />,
+        { state: storeWithTimelines },
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('Otot')).toBeInTheDocument();
+    });
+
+    it('hides Personalized Timeline column when feature is off', async () => {
+      render(
+        <InvitationResultDialog
+          handleClose={noop}
+          invitationResult={{
+            newInvitations: [{ ...baseInvitation, timelineAlgorithm: 'otot' }],
+          }}
+          open
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(
+        screen.queryByText('Personalized Timeline'),
+      ).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx b/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx
new file mode 100644
index 00000000000..d93dd09f951
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx
@@ -0,0 +1,157 @@
+import { FC, ReactNode } from 'react';
+import { defineMessages } from 'react-intl';
+import { Tooltip } from '@mui/material';
+import { TimelineAlgorithm } from 'types/course/personalTimes';
+
+import { ColumnTemplate } from 'lib/components/table';
+import Table from 'lib/components/table/Table';
+import {
+  DEFAULT_TABLE_ROWS_PER_PAGE,
+  TIMELINE_ALGORITHMS,
+} from 'lib/constants/sharedConstants';
+import useTranslation from 'lib/hooks/useTranslation';
+import roleTranslations from 'lib/translations/course/users/roles';
+import tableTranslations from 'lib/translations/table';
+
+const translations = defineMessages({
+  yes: {
+    id: 'course.userInvitations.InvitationResultExistingTable.yes',
+    defaultMessage: 'Yes',
+  },
+  no: {
+    id: 'course.userInvitations.InvitationResultExistingTable.no',
+    defaultMessage: 'No',
+  },
+  previouslyLabel: {
+    id: 'course.userInvitations.InvitationResultExistingTable.previouslyLabel',
+    defaultMessage: 'Previously: {value}',
+  },
+});
+
+export interface ExistingRow {
+  id: number;
+  name: string;
+  email: string;
+  externalId?: string | null;
+  role?: string;
+  phantom?: boolean;
+  previousExternalId?: string | null;
+  timelineAlgorithm?: TimelineAlgorithm;
+}
+
+interface Props {
+  rows: ExistingRow[];
+  showPersonalizedTimelineFeatures?: boolean;
+}
+
+const InvitationResultExistingTable: FC<Props> = ({
+  rows,
+  showPersonalizedTimelineFeatures,
+}) => {
+  const { t } = useTranslation();
+
+  if (rows.length === 0) return null;
+
+  // Updated rows (ext_id changed) first so admins notice them above unchanged existing rows
+  const orderedRows = [
+    ...rows.filter((r) => r.previousExternalId !== undefined),
+    ...rows.filter((r) => r.previousExternalId === undefined),
+  ];
+
+  const showExternalId = rows.some(
+    (r) => r.externalId != null || r.previousExternalId !== undefined,
+  );
+
+  const columns: ColumnTemplate<ExistingRow>[] = [
+    {
+      of: 'name',
+      title: t(tableTranslations.name),
+      sortable: false,
+      cell: (row) => row.name,
+      csvDownloadable: true,
+    },
+    {
+      of: 'email',
+      title: t(tableTranslations.email),
+      sortable: false,
+      cell: (row) => row.email,
+      csvDownloadable: true,
+    },
+    ...(showExternalId
+      ? ([
+          {
+            of: 'externalId',
+            title: t(tableTranslations.externalId),
+            sortable: false,
+            cell: (row): ReactNode => {
+              if (row.previousExternalId === undefined)
+                return row.externalId ?? '';
+              const previousLabel = t(translations.previouslyLabel, {
+                value: row.previousExternalId ?? '—',
+              });
+              return (
+                <Tooltip title={previousLabel}>
+                  <strong style={{ cursor: 'default' }}>
+                    {row.externalId}
+                  </strong>
+                </Tooltip>
+              );
+            },
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<ExistingRow>[])
+      : []),
+    {
+      of: 'role',
+      title: t(tableTranslations.role),
+      sortable: false,
+      cell: (row): ReactNode => {
+        if (!row.role) return '';
+        const desc =
+          roleTranslations[row.role as keyof typeof roleTranslations];
+        return desc ? t(desc) : row.role;
+      },
+      csvDownloadable: true,
+    },
+    {
+      of: 'phantom',
+      title: t(tableTranslations.phantom),
+      sortable: false,
+      cell: (row) => (row.phantom ? t(translations.yes) : t(translations.no)),
+      csvDownloadable: true,
+    },
+    ...(showPersonalizedTimelineFeatures
+      ? ([
+          {
+            of: 'timelineAlgorithm',
+            title: t(tableTranslations.personalizedTimeline),
+            sortable: false,
+            cell: (row): ReactNode =>
+              TIMELINE_ALGORITHMS.find(
+                (tl) => tl.value === row.timelineAlgorithm,
+              )?.label ?? '-',
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<ExistingRow>[])
+      : []),
+  ];
+
+  return (
+    <Table
+      columns={columns}
+      data={orderedRows}
+      getRowClassName={(row) =>
+        row.previousExternalId !== undefined ? 'bg-[#e3f2fd]' : ''
+      }
+      getRowEqualityData={(row) => row}
+      getRowId={(row) => String(row.id)}
+      pagination={{
+        rowsPerPage: [DEFAULT_TABLE_ROWS_PER_PAGE],
+        showAllRows: true,
+      }}
+      toolbar={{ show: false }}
+    />
+  );
+};
+
+export default InvitationResultExistingTable;
diff --git a/client/app/bundles/course/user-invitations/components/tables/InvitationResultFailedTable.tsx b/client/app/bundles/course/user-invitations/components/tables/InvitationResultFailedTable.tsx
new file mode 100644
index 00000000000..83ba8eae886
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/InvitationResultFailedTable.tsx
@@ -0,0 +1,163 @@
+import { FC, memo, ReactNode } from 'react';
+import { defineMessages } from 'react-intl';
+import equal from 'fast-deep-equal';
+import {
+  FailedInvitationRowData,
+  InvitationFailureReason,
+} from 'types/course/userInvitations';
+
+import { ColumnTemplate } from 'lib/components/table';
+import Table from 'lib/components/table/Table';
+import { TIMELINE_ALGORITHMS } from 'lib/constants/sharedConstants';
+import useTranslation from 'lib/hooks/useTranslation';
+import roleTranslations from 'lib/translations/course/users/roles';
+import tableTranslations from 'lib/translations/table';
+
+const translations = defineMessages({
+  duplicateEmailInFile: {
+    id: 'course.userInvitations.InvitationResultFailedTable.duplicateEmailInFile',
+    defaultMessage: 'Duplicate email in uploaded CSV',
+  },
+  duplicateExternalIdInFile: {
+    id: 'course.userInvitations.InvitationResultFailedTable.duplicateExternalIdInFile',
+    defaultMessage: 'Duplicate external ID in uploaded CSV',
+  },
+  externalIdTaken: {
+    id: 'course.userInvitations.InvitationResultFailedTable.externalIdTaken',
+    defaultMessage: 'External ID is taken by another course member',
+  },
+  failedToSend: {
+    id: 'course.userInvitations.InvitationResultFailedTable.failedToSend',
+    defaultMessage:
+      'Failed to send invitation email, please try again - if failures persist, contact us for assistance',
+  },
+  yes: {
+    id: 'course.userInvitations.InvitationResultFailedTable.yes',
+    defaultMessage: 'Yes',
+  },
+  no: {
+    id: 'course.userInvitations.InvitationResultFailedTable.no',
+    defaultMessage: 'No',
+  },
+});
+
+interface Props {
+  users: FailedInvitationRowData[];
+  showPersonalizedTimelineFeatures?: boolean;
+}
+
+const REASON_MAP: Record<InvitationFailureReason, keyof typeof translations> = {
+  duplicate_email_in_file: 'duplicateEmailInFile',
+  duplicate_external_id_in_file: 'duplicateExternalIdInFile',
+  external_id_taken: 'externalIdTaken',
+  failed_to_send: 'failedToSend',
+};
+
+const InvitationResultFailedTable: FC<Props> = ({
+  users,
+  showPersonalizedTimelineFeatures,
+}) => {
+  const { t } = useTranslation();
+
+  if (users.length === 0) return null;
+
+  const showExternalId = users.some((u) => u.externalId != null);
+
+  const columns: ColumnTemplate<FailedInvitationRowData>[] = [
+    {
+      of: 'name',
+      title: t(tableTranslations.name),
+      sortable: false,
+      searchable: true,
+      cell: (row) => row.name,
+      csvDownloadable: true,
+    },
+    {
+      of: 'email',
+      title: t(tableTranslations.email),
+      sortable: false,
+      searchable: true,
+      cell: (row) => row.email,
+      csvDownloadable: true,
+    },
+    ...(showExternalId
+      ? ([
+          {
+            of: 'externalId',
+            title: t(tableTranslations.externalId),
+            sortable: false,
+            searchable: false,
+            cell: (row) => row.externalId ?? '',
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<FailedInvitationRowData>[])
+      : []),
+    {
+      of: 'role',
+      title: t(tableTranslations.role),
+      sortable: false,
+      searchable: false,
+      cell: (row): ReactNode => {
+        if (!row.role) return '';
+        const desc =
+          roleTranslations[row.role as keyof typeof roleTranslations];
+        return desc ? t(desc) : row.role;
+      },
+      csvDownloadable: true,
+    },
+    {
+      of: 'phantom',
+      title: t(tableTranslations.phantom),
+      sortable: false,
+      searchable: false,
+      cell: (row) => (row.phantom ? t(translations.yes) : t(translations.no)),
+      csvDownloadable: true,
+    },
+    ...(showPersonalizedTimelineFeatures
+      ? ([
+          {
+            of: 'timelineAlgorithm',
+            title: t(tableTranslations.personalizedTimeline),
+            sortable: false,
+            searchable: false,
+            cell: (row): ReactNode =>
+              TIMELINE_ALGORITHMS.find(
+                (tl) => tl.value === row.timelineAlgorithm,
+              )?.label ?? '-',
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<FailedInvitationRowData>[])
+      : []),
+    {
+      of: 'reason',
+      title: t(tableTranslations.reason),
+      sortable: false,
+      searchable: false,
+      cell: (row): ReactNode => {
+        return t(translations[REASON_MAP[row.reason]]);
+      },
+      csvDownloadable: true,
+    },
+  ];
+
+  return (
+    <Table
+      columns={columns}
+      data={users}
+      getRowClassName={(row) =>
+        row.reason === 'failed_to_send' ? 'bg-[#ffebee]' : ''
+      }
+      getRowEqualityData={(row) => row}
+      getRowId={(row) => String(row.id)}
+      toolbar={{ show: false }}
+    />
+  );
+};
+
+export default memo(
+  InvitationResultFailedTable,
+  (prev, next) =>
+    equal(prev.users, next.users) &&
+    prev.showPersonalizedTimelineFeatures ===
+      next.showPersonalizedTimelineFeatures,
+);
diff --git a/client/app/bundles/course/user-invitations/components/tables/InvitationResultInvitationsTable.tsx b/client/app/bundles/course/user-invitations/components/tables/InvitationResultInvitationsTable.tsx
deleted file mode 100644
index fb70f544196..00000000000
--- a/client/app/bundles/course/user-invitations/components/tables/InvitationResultInvitationsTable.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import { FC, memo } from 'react';
-import { Typography } from '@mui/material';
-import equal from 'fast-deep-equal';
-import { TableColumns, TableOptions } from 'types/components/DataTable';
-import { InvitationListData } from 'types/course/userInvitations';
-
-import DataTable from 'lib/components/core/layouts/DataTable';
-import { DEFAULT_TABLE_ROWS_PER_PAGE } from 'lib/constants/sharedConstants';
-import useTranslation from 'lib/hooks/useTranslation';
-import roleTranslations from 'lib/translations/course/users/roles';
-import tableTranslations from 'lib/translations/table';
-
-interface Props {
-  title: JSX.Element;
-  invitations: InvitationListData[];
-}
-
-const InvitationResultInvitationsTable: FC<Props> = (props) => {
-  const { title, invitations } = props;
-  const { t } = useTranslation();
-
-  if (invitations && invitations.length === 0) return null;
-
-  const showExternalId = invitations.some((i) => i.externalId != null);
-
-  const options: TableOptions = {
-    download: true,
-    filter: false,
-    pagination: true,
-    print: false,
-    rowsPerPage: DEFAULT_TABLE_ROWS_PER_PAGE,
-    rowsPerPageOptions: [DEFAULT_TABLE_ROWS_PER_PAGE],
-    search: false,
-    selectableRows: 'none',
-    setTableProps: (): object => {
-      return { size: 'small' };
-    },
-    setRowProps: (_row, dataIndex, _rowIndex): Record<string, unknown> => {
-      return {
-        key: `invitation_result_invitation_${invitations[dataIndex].id}`,
-        invitationid: `invitation_result_invitation_${invitations[dataIndex].id}`,
-        className: `invitation_result_invitation invitation_result_invitation_${invitations[dataIndex].id}`,
-      };
-    },
-    viewColumns: false,
-  };
-
-  const columns: TableColumns[] = [
-    {
-      name: 'id',
-      label: t(tableTranslations.id),
-      options: {
-        display: false,
-        filter: false,
-        sort: false,
-      },
-    },
-    {
-      name: 'name',
-      label: t(tableTranslations.name),
-      options: {
-        alignCenter: false,
-        sort: false,
-      },
-    },
-    {
-      name: 'email',
-      label: t(tableTranslations.email),
-      options: {
-        alignCenter: false,
-        sort: false,
-      },
-    },
-    ...(showExternalId
-      ? [
-          {
-            name: 'externalId',
-            label: t(tableTranslations.externalId),
-            options: {
-              alignCenter: true,
-              sort: false,
-            },
-          },
-        ]
-      : []),
-    {
-      name: 'phantom',
-      label: t(tableTranslations.phantom),
-      options: {
-        sort: false,
-        customBodyRenderLite: (dataIndex): JSX.Element => {
-          const invitation = invitations[dataIndex];
-          return (
-            <Typography
-              key={`phantom-${invitation.id}`}
-              className="invitation_result_invitation_phantom"
-              variant="body2"
-            >
-              {invitation.phantom ? 'Yes' : 'No'}
-            </Typography>
-          );
-        },
-      },
-    },
-    {
-      name: 'role',
-      label: t(tableTranslations.role),
-      options: {
-        alignCenter: false,
-        sort: false,
-        customBodyRenderLite: (dataIndex): JSX.Element => {
-          const invitation = invitations[dataIndex];
-          return (
-            <Typography
-              key={`role-${invitation.id}`}
-              className="invitation_result_invitation_role"
-              variant="body2"
-            >
-              {t(roleTranslations[invitation.role])}
-            </Typography>
-          );
-        },
-      },
-    },
-    {
-      name: 'sentAt',
-      label: t(tableTranslations.invitationSentAt),
-      options: {
-        alignCenter: false,
-        sort: false,
-      },
-    },
-  ];
-
-  return (
-    <DataTable
-      columns={columns}
-      data={invitations}
-      includeRowNumber
-      options={options}
-      title={title}
-      withMargin
-    />
-  );
-};
-
-export default memo(
-  InvitationResultInvitationsTable,
-  (prevProps, nextProps) => {
-    return equal(prevProps.invitations, nextProps.invitations);
-  },
-);
diff --git a/client/app/bundles/course/user-invitations/components/tables/InvitationResultPrimaryTable.tsx b/client/app/bundles/course/user-invitations/components/tables/InvitationResultPrimaryTable.tsx
new file mode 100644
index 00000000000..e1ec0e89acd
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/InvitationResultPrimaryTable.tsx
@@ -0,0 +1,113 @@
+import { FC, ReactNode } from 'react';
+import { defineMessages } from 'react-intl';
+import { InvitationSuccessRow } from 'types/course/userInvitations';
+
+import { ColumnTemplate } from 'lib/components/table';
+import Table from 'lib/components/table/Table';
+import {
+  DEFAULT_TABLE_ROWS_PER_PAGE,
+  TIMELINE_ALGORITHMS,
+} from 'lib/constants/sharedConstants';
+import useTranslation from 'lib/hooks/useTranslation';
+import roleTranslations from 'lib/translations/course/users/roles';
+import tableTranslations from 'lib/translations/table';
+
+const translations = defineMessages({
+  yes: {
+    id: 'course.userInvitations.InvitationResultPrimaryTable.yes',
+    defaultMessage: 'Yes',
+  },
+  no: {
+    id: 'course.userInvitations.InvitationResultPrimaryTable.no',
+    defaultMessage: 'No',
+  },
+});
+
+interface Props {
+  rows: InvitationSuccessRow[];
+  showPersonalizedTimelineFeatures?: boolean;
+}
+
+const InvitationResultPrimaryTable: FC<Props> = ({
+  rows,
+  showPersonalizedTimelineFeatures,
+}) => {
+  const { t } = useTranslation();
+  const showExternalId = rows.some((r) => r.externalId != null);
+
+  const columns: ColumnTemplate<InvitationSuccessRow>[] = [
+    {
+      of: 'name',
+      title: t(tableTranslations.name),
+      sortable: false,
+      cell: (row) => row.name,
+      csvDownloadable: true,
+    },
+    {
+      of: 'email',
+      title: t(tableTranslations.email),
+      sortable: false,
+      cell: (row) => row.email,
+      csvDownloadable: true,
+    },
+    ...(showExternalId
+      ? ([
+          {
+            of: 'externalId',
+            title: t(tableTranslations.externalId),
+            sortable: false,
+            cell: (row) => row.externalId ?? '',
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<InvitationSuccessRow>[])
+      : []),
+    {
+      of: 'role',
+      title: t(tableTranslations.role),
+      sortable: false,
+      cell: (row): ReactNode => {
+        const desc =
+          roleTranslations[row.role as keyof typeof roleTranslations];
+        return desc ? t(desc) : row.role;
+      },
+      csvDownloadable: true,
+    },
+    {
+      of: 'phantom',
+      title: t(tableTranslations.phantom),
+      sortable: false,
+      cell: (row) => (row.phantom ? t(translations.yes) : t(translations.no)),
+      csvDownloadable: true,
+    },
+    ...(showPersonalizedTimelineFeatures
+      ? ([
+          {
+            of: 'timelineAlgorithm',
+            title: t(tableTranslations.personalizedTimeline),
+            sortable: false,
+            cell: (row): ReactNode =>
+              TIMELINE_ALGORITHMS.find(
+                (tl) => tl.value === row.timelineAlgorithm,
+              )?.label ?? '-',
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<InvitationSuccessRow>[])
+      : []),
+  ];
+
+  return (
+    <Table
+      columns={columns}
+      data={rows}
+      getRowEqualityData={(row) => row}
+      getRowId={(row) => row.id}
+      pagination={{
+        rowsPerPage: [DEFAULT_TABLE_ROWS_PER_PAGE],
+        showAllRows: false,
+      }}
+      toolbar={{ show: false }}
+    />
+  );
+};
+
+export default InvitationResultPrimaryTable;
diff --git a/client/app/bundles/course/user-invitations/components/tables/InvitationResultUsersTable.tsx b/client/app/bundles/course/user-invitations/components/tables/InvitationResultUsersTable.tsx
deleted file mode 100644
index c8b0728fd6c..00000000000
--- a/client/app/bundles/course/user-invitations/components/tables/InvitationResultUsersTable.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import { FC, memo } from 'react';
-import { defineMessages } from 'react-intl';
-import { Typography } from '@mui/material';
-import equal from 'fast-deep-equal';
-import { TableColumns, TableOptions } from 'types/components/DataTable';
-import { CourseUserListData } from 'types/course/courseUsers';
-import { DuplicateReason } from 'types/course/userInvitations';
-
-import DataTable from 'lib/components/core/layouts/DataTable';
-import useTranslation from 'lib/hooks/useTranslation';
-import roleTranslations from 'lib/translations/course/users/roles';
-import tableTranslations from 'lib/translations/table';
-
-const translations = defineMessages({
-  duplicateEmailInFile: {
-    id: 'course.userInvitations.InvitationResultUsersTable.duplicateEmailInFile',
-    defaultMessage: 'Duplicate email in upload',
-  },
-  duplicateExternalIdInFile: {
-    id: 'course.userInvitations.InvitationResultUsersTable.duplicateExternalIdInFile',
-    defaultMessage: 'Duplicate external ID in upload',
-  },
-  externalIdTaken: {
-    id: 'course.userInvitations.InvitationResultUsersTable.externalIdTaken',
-    defaultMessage: 'External ID is already assigned to another course member',
-  },
-});
-
-interface Props {
-  title: JSX.Element;
-  users: Array<CourseUserListData & { reason?: DuplicateReason }>;
-}
-
-const InvitationResultUsersTable: FC<Props> = (props) => {
-  const { title, users } = props;
-  const { t } = useTranslation();
-
-  if (users && users.length === 0) return null;
-
-  const showExternalId = users.some((u) => u.externalId != null);
-  const showReason = users.some((u) => u.reason != null);
-
-  const options: TableOptions = {
-    download: true,
-    filter: false,
-    pagination: false,
-    print: false,
-    search: false,
-    selectableRows: 'none',
-    setTableProps: (): object => {
-      return { size: 'small' };
-    },
-    setRowProps: (_row, dataIndex, _rowIndex): Record<string, unknown> => {
-      return {
-        key: `invitation_result_user_${users[dataIndex].id}`,
-        userid: `invitation_result_user_${users[dataIndex].id}`,
-        className: `invitation_result_user invitation_result_user_${users[dataIndex].id}`,
-      };
-    },
-    viewColumns: false,
-  };
-
-  const columns: TableColumns[] = [
-    {
-      name: 'id',
-      label: t(tableTranslations.id),
-      options: {
-        display: false,
-        filter: false,
-        sort: false,
-      },
-    },
-    {
-      name: 'name',
-      label: t(tableTranslations.name),
-      options: {
-        alignCenter: false,
-        sort: false,
-      },
-    },
-    {
-      name: 'email',
-      label: t(tableTranslations.email),
-      options: {
-        alignCenter: false,
-        sort: false,
-      },
-    },
-    ...(showExternalId
-      ? [
-          {
-            name: 'externalId',
-            label: t(tableTranslations.externalId),
-            options: {
-              alignCenter: true,
-              sort: false,
-            },
-          },
-        ]
-      : []),
-    ...(showReason
-      ? [
-          {
-            name: 'reason',
-            label: t(tableTranslations.reason),
-            options: {
-              alignCenter: false,
-              sort: false,
-              customBodyRenderLite: (dataIndex: number): JSX.Element => {
-                const user = users[dataIndex];
-                const reasonText =
-                  {
-                    duplicate_email_in_file: t(
-                      translations.duplicateEmailInFile,
-                    ),
-                    duplicate_external_id_in_file: t(
-                      translations.duplicateExternalIdInFile,
-                    ),
-                    external_id_taken: t(translations.externalIdTaken),
-                  }[user.reason ?? ''] ?? '';
-                return (
-                  <Typography
-                    key={`reason-${user.id}`}
-                    className="invitation_result_user_reason"
-                    variant="body2"
-                  >
-                    {reasonText}
-                  </Typography>
-                );
-              },
-            },
-          },
-        ]
-      : []),
-    {
-      name: 'phantom',
-      label: t(tableTranslations.phantom),
-      options: {
-        sort: false,
-        customBodyRenderLite: (dataIndex): JSX.Element => {
-          const user = users[dataIndex];
-          return (
-            <Typography
-              key={`phantom-${user.id}`}
-              className="invitation_result_user_phantom"
-              variant="body2"
-            >
-              {user.phantom ? 'Yes' : 'No'}
-            </Typography>
-          );
-        },
-      },
-    },
-    {
-      name: 'role',
-      label: t(tableTranslations.role),
-      options: {
-        alignCenter: false,
-        sort: false,
-        customBodyRenderLite: (dataIndex): JSX.Element => {
-          const user = users[dataIndex];
-          return (
-            <Typography
-              key={`role-${user.id}`}
-              className="invitation_result_user_role"
-              variant="body2"
-            >
-              {t(roleTranslations[user.role])}
-            </Typography>
-          );
-        },
-      },
-    },
-  ];
-
-  return (
-    <DataTable
-      columns={columns}
-      data={users}
-      includeRowNumber
-      options={options}
-      title={title}
-      withMargin
-    />
-  );
-};
-
-export default memo(InvitationResultUsersTable, (prevProps, nextProps) => {
-  return equal(prevProps.users, nextProps.users);
-});
diff --git a/client/app/bundles/course/user-invitations/components/tables/UserInvitationsTable.tsx b/client/app/bundles/course/user-invitations/components/tables/UserInvitationsTable.tsx
index 86d2f9f69f2..c24b976f1f8 100644
--- a/client/app/bundles/course/user-invitations/components/tables/UserInvitationsTable.tsx
+++ b/client/app/bundles/course/user-invitations/components/tables/UserInvitationsTable.tsx
@@ -6,7 +6,6 @@ import {
   InvitationStatus,
 } from 'types/course/userInvitations';
 
-import { getManageCourseUserPermissions } from 'course/users/selectors';
 import Note from 'lib/components/core/Note';
 import GhostIcon from 'lib/components/icons/GhostIcon';
 import { ColumnTemplate } from 'lib/components/table';
@@ -18,6 +17,7 @@ import { formatMiniDateTime } from 'lib/moment';
 import roleTranslations from 'lib/translations/course/users/roles';
 import tableTranslations from 'lib/translations/table';
 
+import { getManageCourseUsersSharedData } from '../../selectors';
 import translations from '../../translations';
 import InvitationActionButtons from '../buttons/InvitationActionButtons';
 import ResendAllInvitationsButton from '../buttons/ResendAllInvitationsButton';
@@ -140,7 +140,9 @@ const UserInvitationsTable: FC<Props> = (props) => {
   );
 
   const { t } = useTranslation();
-  const permissions = useAppSelector(getManageCourseUserPermissions);
+  const { showPersonalizedTimelineFeatures } = useAppSelector(
+    getManageCourseUsersSharedData,
+  );
 
   const columns: ColumnTemplate<InvitationRowData>[] = [
     {
@@ -169,7 +171,7 @@ const UserInvitationsTable: FC<Props> = (props) => {
             title: t(tableTranslations.externalId),
             sortable: false,
             searchable: false,
-            cell: (datum) => datum.externalId ?? null,
+            cell: (datum) => datum.externalId ?? '',
           } satisfies ColumnTemplate<InvitationRowData>,
         ]
       : []),
@@ -186,7 +188,7 @@ const UserInvitationsTable: FC<Props> = (props) => {
         TIMELINE_ALGORITHMS.find(
           (timeline) => timeline.value === datum.timelineAlgorithm,
         )?.label ?? '-',
-      unless: !permissions.canManagePersonalTimes,
+      unless: !showPersonalizedTimelineFeatures,
     },
     {
       id: 'status',
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx
new file mode 100644
index 00000000000..c3a9545e6f7
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx
@@ -0,0 +1,188 @@
+import userEvent from '@testing-library/user-event';
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+
+import InvitationResultExistingTable from '../InvitationResultExistingTable';
+
+const baseRow = {
+  id: 1,
+  name: 'Alice Tan',
+  email: 'alice@example.com',
+  externalId: 'aliceExt',
+  role: 'student',
+  phantom: false,
+};
+
+describe('InvitationResultExistingTable', () => {
+  it('renders nothing when rows is empty', async () => {
+    render(<InvitationResultExistingTable rows={[]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
+  });
+
+  it('shows Name, Email, Ext ID, Role, Phantom columns', async () => {
+    render(<InvitationResultExistingTable rows={[baseRow]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
+    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
+    expect(screen.getByText('aliceExt')).toBeInTheDocument();
+    expect(screen.getByText('Student')).toBeInTheDocument();
+    expect(screen.getByText('No')).toBeInTheDocument();
+  });
+
+  it('hides Ext ID column when no rows have externalId', async () => {
+    render(
+      <InvitationResultExistingTable
+        rows={[{ ...baseRow, externalId: null }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText('External ID')).not.toBeInTheDocument();
+    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
+    expect(screen.getByText('Student')).toBeInTheDocument();
+  });
+
+  it('localizes role via roleTranslations', async () => {
+    render(
+      <InvitationResultExistingTable
+        rows={[{ ...baseRow, role: 'teaching_assistant' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Teaching Assistant')).toBeInTheDocument();
+  });
+
+  it('renders Yes for phantom user', async () => {
+    render(
+      <InvitationResultExistingTable rows={[{ ...baseRow, phantom: true }]} />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Yes')).toBeInTheDocument();
+  });
+
+  describe('updated row rendering', () => {
+    it('renders bold externalId with tooltip "Previously: —" when previousExternalId is null', async () => {
+      render(
+        <InvitationResultExistingTable
+          rows={[{ ...baseRow, externalId: 'newId', previousExternalId: null }]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      const cell = screen.getByText('newId');
+      expect(cell.tagName).toBe('STRONG');
+      await userEvent.hover(cell);
+      expect(await screen.findByText('Previously: —')).toBeInTheDocument();
+    });
+
+    it('renders bold externalId with tooltip "Previously: oldId" when previousExternalId is a string', async () => {
+      render(
+        <InvitationResultExistingTable
+          rows={[
+            { ...baseRow, externalId: 'newId', previousExternalId: 'oldId' },
+          ]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      const cell = screen.getByText('newId');
+      expect(cell.tagName).toBe('STRONG');
+      await userEvent.hover(cell);
+      expect(await screen.findByText('Previously: oldId')).toBeInTheDocument();
+    });
+
+    it('does not bold externalId for rows without previousExternalId', async () => {
+      render(<InvitationResultExistingTable rows={[baseRow]} />);
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      const cell = screen.getByText('aliceExt');
+      expect(cell.tagName).not.toBe('STRONG');
+    });
+
+    it('renders updated rows before non-updated rows', async () => {
+      render(
+        <InvitationResultExistingTable
+          rows={[
+            { ...baseRow, id: 2, name: 'Normal Bob' },
+            {
+              ...baseRow,
+              id: 1,
+              name: 'Updated Alice',
+              externalId: 'newId',
+              previousExternalId: 'oldId',
+            },
+          ]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      const normalCell = screen.getByText('Normal Bob');
+      const updatedCell = screen.getByText('Updated Alice');
+      expect(
+        // eslint-disable-next-line no-bitwise
+        normalCell.compareDocumentPosition(updatedCell) &
+          Node.DOCUMENT_POSITION_PRECEDING,
+      ).toBeTruthy();
+    });
+
+    it('applies highlight class to updated rows', async () => {
+      const { container } = render(
+        <InvitationResultExistingTable
+          rows={[
+            { ...baseRow, externalId: 'newId', previousExternalId: 'oldId' },
+          ]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      const highlighted = Array.from(container.querySelectorAll('tr')).find(
+        (tr) => tr.className.includes('bg-[#e3f2fd]'),
+      );
+      expect(highlighted).toBeDefined();
+    });
+
+    it('does not apply highlight class to non-updated rows', async () => {
+      const { container } = render(
+        <InvitationResultExistingTable rows={[baseRow]} />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      const highlighted = Array.from(container.querySelectorAll('tr')).find(
+        (tr) => tr.className.includes('bg-[#e3f2fd]'),
+      );
+      expect(highlighted).toBeUndefined();
+    });
+  });
+
+  describe('Personalized Timeline column', () => {
+    it('shows column header and algorithm label when showPersonalizedTimelineFeatures is true', async () => {
+      render(
+        <InvitationResultExistingTable
+          rows={[{ ...baseRow, timelineAlgorithm: 'fomo' }]}
+          showPersonalizedTimelineFeatures
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('Fomo')).toBeInTheDocument();
+    });
+
+    it('hides column when showPersonalizedTimelineFeatures is false', async () => {
+      render(
+        <InvitationResultExistingTable
+          rows={[{ ...baseRow, timelineAlgorithm: 'fomo' }]}
+          showPersonalizedTimelineFeatures={false}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(
+        screen.queryByText('Personalized Timeline'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('shows dash when timelineAlgorithm is undefined', async () => {
+      render(
+        <InvitationResultExistingTable
+          rows={[baseRow]}
+          showPersonalizedTimelineFeatures
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('-')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultFailedTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultFailedTable.test.tsx
new file mode 100644
index 00000000000..f28d3f31393
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultFailedTable.test.tsx
@@ -0,0 +1,228 @@
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+import { FailedInvitationRowData } from 'types/course/userInvitations';
+
+import InvitationResultFailedTable from '../InvitationResultFailedTable';
+
+const baseUser: FailedInvitationRowData = {
+  id: 1,
+  name: 'Alice',
+  email: 'alice@example.com',
+  role: 'student',
+  reason: 'failed_to_send',
+};
+
+describe('InvitationResultFailedTable', () => {
+  it('renders nothing when users is empty', async () => {
+    render(<InvitationResultFailedTable users={[]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
+  });
+
+  it('renders name and email for each row', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[{ ...baseUser, reason: 'duplicate_email_in_file' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Alice')).toBeInTheDocument();
+    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
+  });
+
+  it('renders reason label for duplicate_email_in_file', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[{ ...baseUser, reason: 'duplicate_email_in_file' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText('Duplicate email in uploaded CSV'),
+    ).toBeInTheDocument();
+  });
+
+  it('renders reason label for external_id_taken', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[{ ...baseUser, reason: 'external_id_taken' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText('External ID is taken by another course member'),
+    ).toBeInTheDocument();
+  });
+
+  it('renders reason label for duplicate_external_id_in_file', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[{ ...baseUser, reason: 'duplicate_external_id_in_file' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText('Duplicate external ID in uploaded CSV'),
+    ).toBeInTheDocument();
+  });
+
+  it('renders reason label for failed_to_send', async () => {
+    render(<InvitationResultFailedTable users={[baseUser]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.getByText(
+        'Failed to send invitation email, please try again - if failures persist, contact us for assistance',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('shows Role and Phantom columns', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[
+          { ...baseUser, phantom: false, reason: 'duplicate_email_in_file' },
+        ]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Student')).toBeInTheDocument();
+    expect(screen.getByText('No')).toBeInTheDocument();
+  });
+
+  it('renders Yes for phantom user', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[
+          { ...baseUser, phantom: true, reason: 'duplicate_email_in_file' },
+        ]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Yes')).toBeInTheDocument();
+  });
+
+  it('shows External ID column when any user has a non-null externalId', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[
+          { ...baseUser, externalId: 'ext123', reason: 'external_id_taken' },
+        ]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('External ID')).toBeInTheDocument();
+    expect(screen.getByText('ext123')).toBeInTheDocument();
+  });
+
+  it('renders empty cell for null externalId when column is shown by another row', async () => {
+    render(
+      <InvitationResultFailedTable
+        users={[
+          { ...baseUser, externalId: 'ext123', reason: 'external_id_taken' },
+          {
+            ...baseUser,
+            id: 2,
+            name: 'Bob',
+            externalId: null,
+            reason: 'duplicate_email_in_file',
+          },
+        ]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('External ID')).toBeInTheDocument();
+    expect(screen.getByText('ext123')).toBeInTheDocument();
+    expect(screen.getByText('Bob')).toBeInTheDocument();
+  });
+
+  it('hides External ID column when all users have no externalId', async () => {
+    render(<InvitationResultFailedTable users={[baseUser]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText('External ID')).not.toBeInTheDocument();
+  });
+
+  it('applies red highlight class to the failed_to_send row', async () => {
+    const { container } = render(
+      <InvitationResultFailedTable
+        users={[
+          baseUser,
+          {
+            ...baseUser,
+            id: 2,
+            name: 'Bob',
+            reason: 'duplicate_email_in_file',
+          },
+        ]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    const rows = Array.from(container.querySelectorAll('tr'));
+    const aliceRow = rows.find((tr) => tr.textContent?.includes('Alice'));
+    const bobRow = rows.find((tr) => tr.textContent?.includes('Bob'));
+    expect(aliceRow?.className).toContain('bg-[#ffebee]');
+    expect(bobRow?.className).not.toContain('bg-[#ffebee]');
+  });
+
+  it('does not apply red highlight class to non-failed_to_send rows', async () => {
+    const { container } = render(
+      <InvitationResultFailedTable
+        users={[{ ...baseUser, reason: 'duplicate_email_in_file' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    const highlighted = Array.from(container.querySelectorAll('tr')).find(
+      (tr) => tr.className.includes('bg-[#ffebee]'),
+    );
+    expect(highlighted).toBeUndefined();
+  });
+
+  describe('Personalized Timeline column', () => {
+    it('shows column header and algorithm label when showPersonalizedTimelineFeatures is true', async () => {
+      render(
+        <InvitationResultFailedTable
+          showPersonalizedTimelineFeatures
+          users={[
+            {
+              ...baseUser,
+              timelineAlgorithm: 'stragglers',
+              reason: 'duplicate_email_in_file',
+            },
+          ]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('Stragglers')).toBeInTheDocument();
+    });
+
+    it('hides column when showPersonalizedTimelineFeatures is false', async () => {
+      render(
+        <InvitationResultFailedTable
+          showPersonalizedTimelineFeatures={false}
+          users={[
+            {
+              ...baseUser,
+              timelineAlgorithm: 'stragglers',
+              reason: 'duplicate_email_in_file',
+            },
+          ]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(
+        screen.queryByText('Personalized Timeline'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('shows dash when timelineAlgorithm is undefined', async () => {
+      render(
+        <InvitationResultFailedTable
+          showPersonalizedTimelineFeatures
+          users={[{ ...baseUser, reason: 'duplicate_email_in_file' }]}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('-')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultPrimaryTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultPrimaryTable.test.tsx
new file mode 100644
index 00000000000..f20af531f1f
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultPrimaryTable.test.tsx
@@ -0,0 +1,112 @@
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+
+import InvitationResultPrimaryTable from '../InvitationResultPrimaryTable';
+
+const baseRow = {
+  id: 'inv-1',
+  name: 'Alice',
+  email: 'alice@example.com',
+  externalId: null,
+  role: 'student',
+  phantom: false,
+};
+
+describe('InvitationResultPrimaryTable', () => {
+  it('renders Name, Email, Role, and Phantom columns', async () => {
+    render(<InvitationResultPrimaryTable rows={[baseRow]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Alice')).toBeInTheDocument();
+    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
+    expect(screen.getByText('Student')).toBeInTheDocument();
+    expect(screen.getByText('No')).toBeInTheDocument();
+  });
+
+  it('renders Yes for phantom user', async () => {
+    render(
+      <InvitationResultPrimaryTable rows={[{ ...baseRow, phantom: true }]} />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Yes')).toBeInTheDocument();
+  });
+
+  it('localizes role via roleTranslations', async () => {
+    render(
+      <InvitationResultPrimaryTable
+        rows={[{ ...baseRow, role: 'teaching_assistant' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Teaching Assistant')).toBeInTheDocument();
+  });
+
+  it('shows External ID column when any row has a non-null externalId', async () => {
+    render(
+      <InvitationResultPrimaryTable
+        rows={[{ ...baseRow, externalId: 'ext123' }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('External ID')).toBeInTheDocument();
+    expect(screen.getByText('ext123')).toBeInTheDocument();
+  });
+
+  it('hides External ID column when all rows have null externalId', async () => {
+    render(<InvitationResultPrimaryTable rows={[baseRow]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.queryByText('External ID')).not.toBeInTheDocument();
+  });
+
+  it('renders empty cell for null externalId when column is shown by another row', async () => {
+    render(
+      <InvitationResultPrimaryTable
+        rows={[
+          { ...baseRow, id: 'inv-1', externalId: 'ext123' },
+          { ...baseRow, id: 'inv-2', name: 'Bob', externalId: null },
+        ]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('External ID')).toBeInTheDocument();
+    expect(screen.getByText('ext123')).toBeInTheDocument();
+    expect(screen.getByText('Bob')).toBeInTheDocument();
+  });
+
+  describe('Personalized Timeline column', () => {
+    it('shows column header and algorithm label when showPersonalizedTimelineFeatures is true', async () => {
+      render(
+        <InvitationResultPrimaryTable
+          rows={[{ ...baseRow, timelineAlgorithm: 'otot' }]}
+          showPersonalizedTimelineFeatures
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('Otot')).toBeInTheDocument();
+    });
+
+    it('hides column when showPersonalizedTimelineFeatures is false', async () => {
+      render(
+        <InvitationResultPrimaryTable
+          rows={[{ ...baseRow, timelineAlgorithm: 'otot' }]}
+          showPersonalizedTimelineFeatures={false}
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(
+        screen.queryByText('Personalized Timeline'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('shows dash when timelineAlgorithm is undefined', async () => {
+      render(
+        <InvitationResultPrimaryTable
+          rows={[baseRow]}
+          showPersonalizedTimelineFeatures
+        />,
+      );
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+      expect(screen.getByText('-')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/pages/InvitationsIndex/__test__/index.test.tsx b/client/app/bundles/course/user-invitations/pages/InvitationsIndex/__test__/index.test.tsx
new file mode 100644
index 00000000000..5b601ebf4a6
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/pages/InvitationsIndex/__test__/index.test.tsx
@@ -0,0 +1,80 @@
+import { createMockAdapter } from 'mocks/axiosMock';
+import { render, waitFor } from 'test-utils';
+
+import CourseAPI from 'api/course';
+
+import InvitationsIndex from '../index';
+
+const mock = createMockAdapter(CourseAPI.userInvitations.client);
+
+const STUB_INVITATION = {
+  id: 1,
+  name: 'Test User',
+  email: 'test@example.com',
+  externalId: null,
+  role: 'student',
+  phantom: false,
+  timelineAlgorithm: 'fixed',
+  invitationKey: 'ABC123',
+  confirmed: false,
+  sentAt: '2024-01-01T00:00:00Z',
+  confirmedAt: null,
+  isRetryable: true,
+};
+
+const BASE_PERMISSIONS = {
+  canManageCourseUsers: true,
+  canManageEnrolRequests: true,
+  canManageReferenceTimelines: false,
+  canManagePersonalTimes: false,
+  canRegisterWithCode: false,
+};
+
+const BASE_MANAGE_COURSE_USERS_DATA = {
+  requestsCount: 0,
+  invitationsCount: 0,
+  defaultTimelineAlgorithm: 'fixed',
+  showPersonalizedTimelineFeatures: false,
+};
+
+const mockIndexResponse = (
+  showPersonalizedTimelineFeatures: boolean,
+): object => ({
+  invitations: [STUB_INVITATION],
+  permissions: {
+    ...BASE_PERMISSIONS,
+    canManagePersonalTimes: showPersonalizedTimelineFeatures,
+  },
+  manageCourseUsersData: {
+    ...BASE_MANAGE_COURSE_USERS_DATA,
+    showPersonalizedTimelineFeatures,
+  },
+});
+
+describe('<InvitationsIndex />', () => {
+  it('shows the Personalized Timeline column when showPersonalizedTimelineFeatures is true', async () => {
+    mock
+      .onGet(`/courses/${global.courseId}/user_invitations`)
+      .reply(200, mockIndexResponse(true));
+
+    const page = render(<InvitationsIndex />);
+
+    // Column only appears once invitations load. state.users is NOT pre-populated —
+    // the column must come from state.invitations (the correct store).
+    await waitFor(() => {
+      expect(page.queryByText('Personalized Timeline')).not.toBeNull();
+    });
+  });
+
+  it('hides the Personalized Timeline column when showPersonalizedTimelineFeatures is false', async () => {
+    mock
+      .onGet(`/courses/${global.courseId}/user_invitations`)
+      .reply(200, mockIndexResponse(false));
+
+    const page = render(<InvitationsIndex />);
+
+    await waitFor(() => {
+      expect(page.queryByText('Personalized Timeline')).toBeNull();
+    });
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
index 2f5914f61d2..563bca9d858 100644
--- a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
+++ b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
@@ -60,7 +60,7 @@ const translations = defineMessages({
   fileUploadInfoExternalId: {
     id: 'course.userInvitations.InviteUsersFileUpload.fileUploadInfoExternalId',
     defaultMessage:
-      'External ID is an optional field for linking a user to an external system. If provided, it must be unique within the course - duplicate external IDs will be skipped.',
+      'External ID is optional. If provided, it overwrites any existing external ID for the user and must be unique within the course.',
   },
   exampleHeader: {
     id: 'course.userInvitations.InviteUsersFileUpload.exampleHeader',
diff --git a/client/app/bundles/course/user-invitations/store.ts b/client/app/bundles/course/user-invitations/store.ts
index a69fe95561e..514a2698dc4 100644
--- a/client/app/bundles/course/user-invitations/store.ts
+++ b/client/app/bundles/course/user-invitations/store.ts
@@ -45,6 +45,7 @@ const initialState: InvitationsState = {
     requestsCount: 0,
     invitationsCount: 0,
     defaultTimelineAlgorithm: 'fixed',
+    showPersonalizedTimelineFeatures: false,
   },
   courseRegistrationKey: '',
 };
diff --git a/client/app/types/course/courseUsers.ts b/client/app/types/course/courseUsers.ts
index 9affb2d7bf7..e316e098155 100644
--- a/client/app/types/course/courseUsers.ts
+++ b/client/app/types/course/courseUsers.ts
@@ -134,6 +134,7 @@ export interface ManageCourseUsersSharedData {
   requestsCount: number;
   invitationsCount: number;
   defaultTimelineAlgorithm: TimelineAlgorithm;
+  showPersonalizedTimelineFeatures?: boolean;
 }
 
 export interface LearningRateRecordsData {
diff --git a/client/app/types/course/userInvitations.ts b/client/app/types/course/userInvitations.ts
index e67607eada9..956d0488fa7 100644
--- a/client/app/types/course/userInvitations.ts
+++ b/client/app/types/course/userInvitations.ts
@@ -11,21 +11,46 @@ export interface InvitationFileEntity {
   file?: Blob;
 }
 
-export type DuplicateReason =
+export type InvitationFailureReason =
   | 'duplicate_email_in_file'
   | 'duplicate_external_id_in_file'
-  | 'external_id_taken';
+  | 'external_id_taken'
+  | 'failed_to_send';
 
-export interface DuplicateUserData extends CourseUserListData {
-  reason?: DuplicateReason;
+export interface FailedInvitationRowData extends CourseUserListData {
+  reason: InvitationFailureReason;
+  timelineAlgorithm?: TimelineAlgorithm;
 }
 
 export interface InvitationResult {
-  duplicateUsers?: DuplicateUserData[];
+  failedUsers?: FailedInvitationRowData[];
   existingCourseUsers?: CourseUserData[];
   existingInvitations?: InvitationListData[];
   newCourseUsers?: CourseUserData[];
   newInvitations?: InvitationListData[];
+  updatedCourseUsers?: InvitationUpdatedItem[];
+  updatedInvitations?: InvitationUpdatedItem[];
+}
+
+export interface InvitationSuccessRow {
+  id: string;
+  name: string;
+  email: string;
+  externalId: string | null;
+  role: string;
+  phantom: boolean;
+  timelineAlgorithm?: TimelineAlgorithm;
+}
+
+export interface InvitationUpdatedItem {
+  id: number;
+  name: string;
+  email: string;
+  externalId: string | null;
+  previousExternalId: string | null;
+  role: string;
+  phantom: boolean;
+  timelineAlgorithm?: TimelineAlgorithm;
 }
 
 export interface IndividualInvites {
diff --git a/client/locales/en.json b/client/locales/en.json
index 5d98aba0d47..8921ac2ea6d 100644
--- a/client/locales/en.json
+++ b/client/locales/en.json
@@ -6994,13 +6994,16 @@
     "defaultMessage": "Existing Course Users ({count})"
   },
   "course.userInvitations.InvitationResultDialog.existingCourseUsersInfo": {
-    "defaultMessage": "Existing course users with this email were found in the invitation. They were not invited."
+    "defaultMessage": "These users are already enrolled in this course. They were not re-enrolled."
+  },
+  "course.userInvitations.InvitationResultDialog.externalIdUpdatedInfo": {
+    "defaultMessage": "External IDs were updated where specified."
   },
   "course.userInvitations.InvitationResultDialog.existingInvitations": {
     "defaultMessage": "Existing Invitations ({count})"
   },
   "course.userInvitations.InvitationResultDialog.existingInvitationsInfo": {
-    "defaultMessage": "Existing invitations for these users with this email already exist. They were not invited."
+    "defaultMessage": "These users already have a pending invitation. They were not re-invited."
   },
   "course.userInvitations.InvitationResultDialog.header": {
     "defaultMessage": "Invitation Summary"
@@ -7011,17 +7014,44 @@
   "course.userInvitations.InvitationResultDialog.newInvitations": {
     "defaultMessage": "New Invitations ({count})"
   },
-  "course.userInvitations.InvitationResultUsersTable.duplicateEmailInFile": {
-    "defaultMessage": "Duplicate email in upload"
+  "course.userInvitations.InvitationResultDialog.actionableTitle": {
+    "defaultMessage": "Failed ({count})"
+  },
+  "course.userInvitations.InvitationResultDialog.failedInvitations": {
+    "defaultMessage": "Failed to Send ({count})"
+  },
+  "course.userInvitations.InvitationResultDialog.failedInvitationsInfo": {
+    "defaultMessage": "Error occurred when sending invitation email, please try again."
+  },
+  "course.userInvitations.InvitationResultDialog.updatedSubtitle": {
+    "defaultMessage": "{count} updated · shown first"
+  },
+  "course.userInvitations.InvitationResultDialog.summary": {
+    "defaultMessage": "{newInvitations} new {newInvitations, plural, one {invitation} other {invitations}} sent, {newEnrollments} directly enrolled, {alreadyInCourse} already in course."
+  },
+  "course.userInvitations.InvitationResultDialog.summaryFailed": {
+    "defaultMessage": "{count} failed."
   },
-  "course.userInvitations.InvitationResultUsersTable.duplicateExternalIdInFile": {
-    "defaultMessage": "Duplicate external ID in upload"
+  "course.userInvitations.InvitationResultFailedTable.duplicateEmailInFile": {
+    "defaultMessage": "Duplicate email in uploaded CSV"
   },
-  "course.userInvitations.InvitationResultUsersTable.externalIdTaken": {
-    "defaultMessage": "External ID is already assigned to another course member"
+  "course.userInvitations.InvitationResultFailedTable.duplicateExternalIdInFile": {
+    "defaultMessage": "Duplicate external ID in uploaded CSV"
   },
-  "course.userInvitations.InvitationResultUsersTable.externalIdTakenEnrolled": {
-    "defaultMessage": "Already a course member — external ID could not be applied (already assigned to another member)"
+  "course.userInvitations.InvitationResultFailedTable.externalIdTaken": {
+    "defaultMessage": "External ID is taken by another course member"
+  },
+  "course.userInvitations.InvitationResultFailedTable.failedToSend": {
+    "defaultMessage": "Failed to send invitation email, please try again - if failures persist, contact us for assistance"
+  },
+  "course.userInvitations.InvitationResultSkippedTable.no": {
+    "defaultMessage": "No"
+  },
+  "course.userInvitations.InvitationResultSkippedTable.previouslyLabel": {
+    "defaultMessage": "Previously: {value}"
+  },
+  "course.userInvitations.InvitationResultSkippedTable.yes": {
+    "defaultMessage": "Yes"
   },
   "course.userInvitations.InvitationsBarChart.accepted": {
     "defaultMessage": "Accepted Invitations"
@@ -7066,7 +7096,7 @@
     "defaultMessage": "Each invitation must use a unique email address within the course. Duplicate emails will be skipped."
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfoExternalId": {
-    "defaultMessage": "External ID is an optional field for linking a user to an external system. If provided, it must be unique within the course - duplicate external IDs will be skipped."
+    "defaultMessage": "External ID is optional. If provided, it overwrites any existing external ID for the user and must be unique within the course."
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfo": {
     "defaultMessage": "Upload a .csv file with the following format:"
diff --git a/client/locales/ko.json b/client/locales/ko.json
index 34196262f2a..b80694eff9b 100644
--- a/client/locales/ko.json
+++ b/client/locales/ko.json
@@ -6981,13 +6981,16 @@
     "defaultMessage": "기존 과정 사용자 ({count})"
   },
   "course.userInvitations.InvitationResultDialog.existingCourseUsersInfo": {
-    "defaultMessage": "초대에서 이 이메일의 기존 과정 사용자가 발견되었습니다. 초대되지 않았습니다."
+    "defaultMessage": "이 사용자들은 이미 과정에 등록되어 있습니다. 재등록되지 않습니다."
+  },
+  "course.userInvitations.InvitationResultDialog.externalIdUpdatedInfo": {
+    "defaultMessage": "외부 ID가 지정된 경우 업데이트되었습니다."
   },
   "course.userInvitations.InvitationResultDialog.existingInvitations": {
     "defaultMessage": "기존 초대장 ({count})"
   },
   "course.userInvitations.InvitationResultDialog.existingInvitationsInfo": {
-    "defaultMessage": "이 이메일의 기존 초대장이 이미 존재합니다. 초대되지 않았습니다."
+    "defaultMessage": "이 사용자들은 이미 대기 중인 초대장이 있습니다. 재초대되지 않습니다."
   },
   "course.userInvitations.InvitationResultDialog.header": {
     "defaultMessage": "초대 요약"
@@ -6998,17 +7001,38 @@
   "course.userInvitations.InvitationResultDialog.newInvitations": {
     "defaultMessage": "새 초대장 ({count})"
   },
-  "course.userInvitations.InvitationResultUsersTable.duplicateEmailInFile": {
+  "course.userInvitations.InvitationResultDialog.actionableTitle": {
+    "defaultMessage": "실패 ({count})"
+  },
+  "course.userInvitations.InvitationResultDialog.failedInvitations": {
+    "defaultMessage": "전송 실패 ({count})"
+  },
+  "course.userInvitations.InvitationResultDialog.failedInvitationsInfo": {
+    "defaultMessage": "초대 이메일 전송 중 오류가 발생했습니다. 다시 시도해 주세요."
+  },
+  "course.userInvitations.InvitationResultDialog.summaryFailed": {
+    "defaultMessage": "{count}건이 실패했습니다."
+  },
+  "course.userInvitations.InvitationResultDialog.updatedSubtitle": {
+    "defaultMessage": "{count}개 업데이트됨 · 먼저 표시"
+  },
+  "course.userInvitations.InvitationResultFailedTable.duplicateEmailInFile": {
     "defaultMessage": "업로드 파일에 중복된 이메일 주소가 있습니다"
   },
-  "course.userInvitations.InvitationResultUsersTable.duplicateExternalIdInFile": {
+  "course.userInvitations.InvitationResultFailedTable.duplicateExternalIdInFile": {
     "defaultMessage": "업로드 파일에 중복된 외부 ID가 있습니다"
   },
-  "course.userInvitations.InvitationResultUsersTable.externalIdTaken": {
-    "defaultMessage": "해당 외부 ID는 이미 다른 강의 구성원에게 할당되어 있습니다"
+  "course.userInvitations.InvitationResultFailedTable.externalIdTaken": {
+    "defaultMessage": "해당 외부 ID는 이미 다른 과정 구성원에게 할당되어 있습니다"
+  },
+  "course.userInvitations.InvitationResultFailedTable.failedToSend": {
+    "defaultMessage": "초대 이메일 전송에 실패했습니다. 다시 시도해 주세요 - 문제가 지속되면 저희에게 문의해 주세요"
+  },
+  "course.userInvitations.InvitationResultFailedTable.externalIdTakenEnrolled": {
+    "defaultMessage": "이미 과정 구성원입니다 — 외부 ID를 적용할 수 없습니다(이미 다른 구성원에게 할당됨)"
   },
-  "course.userInvitations.InvitationResultUsersTable.externalIdTakenEnrolled": {
-    "defaultMessage": "이미 강의 구성원입니다 — 외부 ID를 적용할 수 없습니다(해당 ID가 이미 다른 구성원에게 할당되어 있습니다)"
+  "course.userInvitations.InvitationResultSkippedTable.previouslyLabel": {
+    "defaultMessage": "이전 값: {value}"
   },
   "course.userInvitations.InvitationsBarChart.accepted": {
     "defaultMessage": "수락된 초대"
@@ -7056,7 +7080,7 @@
     "defaultMessage": "각 초대는 과정 내에서 고유한 이메일 주소를 사용해야 합니다. 중복된 이메일은 건너뜁니다."
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfoExternalId": {
-    "defaultMessage": "외부 ID는 사용자를 외부 시스템과 연결하기 위한 선택적 필드입니다. 입력된 경우 과정 내에서 고유해야 하며, 중복된 외부 ID는 건너뜁니다."
+    "defaultMessage": "외부 ID는 선택 사항입니다. 입력된 경우 해당 사용자의 기존 외부 ID를 덮어쓰며, 과정 내에서 고유해야 합니다."
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfo": {
     "defaultMessage": "다음 형식으로 .csv 파일을 업로드하세요:"
diff --git a/client/locales/zh.json b/client/locales/zh.json
index 37a3aff0227..9d7e72e6a7e 100644
--- a/client/locales/zh.json
+++ b/client/locales/zh.json
@@ -6975,13 +6975,16 @@
     "defaultMessage": "现有课程用户（{count}）"
   },
   "course.userInvitations.InvitationResultDialog.existingCourseUsersInfo": {
-    "defaultMessage": "在邀请中找到了此邮箱对应的现有课程用户。他们不会收到邮件。"
+    "defaultMessage": "这些用户已在课程中注册。他们未被重新注册。"
+  },
+  "course.userInvitations.InvitationResultDialog.externalIdUpdatedInfo": {
+    "defaultMessage": "如有指定，外部ID已更新。"
   },
   "course.userInvitations.InvitationResultDialog.existingInvitations": {
     "defaultMessage": "现有邀请（{count}）"
   },
   "course.userInvitations.InvitationResultDialog.existingInvitationsInfo": {
-    "defaultMessage": "对于使用此邮箱的用户的邀请已存在。他们不会再次收到邮件。"
+    "defaultMessage": "这些用户已有待处理的邀请。他们未被重新邀请。"
   },
   "course.userInvitations.InvitationResultDialog.header": {
     "defaultMessage": "邀请摘要"
@@ -6992,17 +6995,38 @@
   "course.userInvitations.InvitationResultDialog.newInvitations": {
     "defaultMessage": "新邀请（{count}）"
   },
-  "course.userInvitations.InvitationResultUsersTable.duplicateEmailInFile": {
-    "defaultMessage": "上传文件中存在重复的电子邮箱"
+  "course.userInvitations.InvitationResultDialog.actionableTitle": {
+    "defaultMessage": "失败（{count}）"
+  },
+  "course.userInvitations.InvitationResultDialog.failedInvitations": {
+    "defaultMessage": "发送失败（{count}）"
+  },
+  "course.userInvitations.InvitationResultDialog.failedInvitationsInfo": {
+    "defaultMessage": "发送邀请邮件时出错，请重试。"
+  },
+  "course.userInvitations.InvitationResultDialog.summaryFailed": {
+    "defaultMessage": "{count} 个失败。"
   },
-  "course.userInvitations.InvitationResultUsersTable.duplicateExternalIdInFile": {
+  "course.userInvitations.InvitationResultDialog.updatedSubtitle": {
+    "defaultMessage": "{count} 条已更新 · 优先显示"
+  },
+  "course.userInvitations.InvitationResultFailedTable.duplicateEmailInFile": {
+    "defaultMessage": "上传文件中存在重复的电子邮件地址"
+  },
+  "course.userInvitations.InvitationResultFailedTable.duplicateExternalIdInFile": {
     "defaultMessage": "上传文件中存在重复的外部编号"
   },
-  "course.userInvitations.InvitationResultUsersTable.externalIdTaken": {
+  "course.userInvitations.InvitationResultFailedTable.externalIdTaken": {
     "defaultMessage": "该外部编号已分配给另一名课程成员"
   },
-  "course.userInvitations.InvitationResultUsersTable.externalIdTakenEnrolled": {
-    "defaultMessage": "已是课程成员 — 无法应用外部编号（该编号已分配给另一名成员）"
+  "course.userInvitations.InvitationResultFailedTable.failedToSend": {
+    "defaultMessage": "邀请邮件发送失败，请重试 - 如问题持续发生，请联系我们获取帮助"
+  },
+  "course.userInvitations.InvitationResultFailedTable.externalIdTakenEnrolled": {
+    "defaultMessage": "已是课程成员 — 外部编号未能应用（已分配给另一名成员"
+  },
+  "course.userInvitations.InvitationResultSkippedTable.previouslyLabel": {
+    "defaultMessage": "之前的值：{value}"
   },
   "course.userInvitations.InvitationsBarChart.accepted": {
     "defaultMessage": "已接受邀请"
@@ -7050,7 +7074,7 @@
     "defaultMessage": "每个邀请必须使用课程内唯一的电子邮件地址。重复的电子邮件将被跳过。"
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfoExternalId": {
-    "defaultMessage": "外部编号是将用户与外部系统关联的可选字段。若提供，则必须在课程内唯一——重复的外部编号将被跳过。"
+    "defaultMessage": "外部编号为可选项。如填写，将取代该用户现有的外部编号，且不得与本课程内其他用户重复。"
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfo": {
     "defaultMessage": "上传具有以下格式的 .csv 文件："
diff --git a/config/locales/en/errors.yml b/config/locales/en/errors.yml
index 63cf8c05085..35b92605ec0 100644
--- a/config/locales/en/errors.yml
+++ b/config/locales/en/errors.yml
@@ -20,6 +20,7 @@ en:
         invalid_email: '%{email} could not be processed: invalid email: %{message}.'
         duplicate_external_id: '%{email} could not be processed: external ID "%{external_id}" is already taken.'
         other_error: '%{email} could not be processed: %{message}.'
+        timeline_template_mismatch: 'more than 5 columns detected. This course does not use Personalized Timelines. Please re-upload using the 5-column template (Name, Email, Role, Phantom, External ID).'
       user_registrations:
         invalid_code: 'You have entered an invalid invitation code.'
         code_taken: >
diff --git a/config/locales/ko/errors.yml b/config/locales/ko/errors.yml
index 42508712db4..9ad4bc2f498 100644
--- a/config/locales/ko/errors.yml
+++ b/config/locales/ko/errors.yml
@@ -20,6 +20,7 @@ ko:
         invalid_email: '%{email}을(를) 처리할 수 없습니다: 유효하지 않은 이메일: %{message}.'
         duplicate_external_id: '%{email}을(를) 처리할 수 없습니다: 외부 ID "%{external_id}"는 이미 사용 중입니다.'
         other_error: '%{email}을(를) 처리할 수 없습니다: %{message}.'
+        timeline_template_mismatch: '5개를 초과하는 열이 감지되었습니다. 이 강좌는 개인화된 일정 기능을 사용하지 않습니다. 5열 템플릿(이름, 이메일, 역할, 팬텀, 외부 ID)을 사용하여 다시 업로드해 주십시오.'
       user_registrations:
         invalid_code: '잘못된 초대 코드를 입력하셨습니다.'
         code_taken: >
diff --git a/config/locales/zh/csv.yml b/config/locales/zh/csv.yml
index 262bdadf441..0e86f4e740b 100644
--- a/config/locales/zh/csv.yml
+++ b/config/locales/zh/csv.yml
@@ -4,8 +4,8 @@ zh:
     assessment_submissions:
       headers:
         name: '姓名'
-        email: 'Email'
-        role: '身份变更'
+        email: '电子邮箱'
+        role: '角色'
         user_type: '用户类型'
         status: '状态'
         question_title: '问题标题'
@@ -52,7 +52,7 @@ zh:
         updated_at: '上一次更新时间戳'
         course_user_id: '课程用户ID'
         name: '姓名'
-        role: '身份变更'
+        role: '角色'
       values:
         unknown_question_type: '未知问题类型'
 
@@ -61,5 +61,5 @@ zh:
       headers:
         name: '用户名'
         type: '学生类型'
-        email: 'Email'
+        email: '电子邮箱'
         external_id: '外部编号'
diff --git a/config/locales/zh/errors.yml b/config/locales/zh/errors.yml
index 5284d4a5e54..eae926e15b9 100644
--- a/config/locales/zh/errors.yml
+++ b/config/locales/zh/errors.yml
@@ -20,6 +20,7 @@ zh:
         invalid_email: '%{email}无法处理：邮箱无效：%{message}。'
         duplicate_external_id: '%{email}无法处理：外部编号"%{external_id}"已被使用。'
         other_error: '%{email}无法处理：%{message}。'
+        timeline_template_mismatch: '检测到超过 5 列。本课程未使用个性化时间线。请使用 5 列模板重新上传（姓名、电子邮箱、角色、虚拟用户、外部编号）。'
       user_registrations:
         invalid_code: '你输入了一个无效的邀请码。'
         code_taken: >
diff --git a/spec/controllers/course/user_invitations_controller_spec.rb b/spec/controllers/course/user_invitations_controller_spec.rb
index 34a4f7274f6..d9e95a38de3 100644
--- a/spec/controllers/course/user_invitations_controller_spec.rb
+++ b/spec/controllers/course/user_invitations_controller_spec.rb
@@ -70,6 +70,36 @@ def replace_with_erroneous_course
         end
       end
 
+      context 'when inviting a user who already has a non-retryable (failed) invitation' do
+        render_views
+
+        let!(:course_manager) { create(:course_manager, course: course, user: user) }
+        let!(:failed_invitation) do
+          create(:course_user_invitation, course: course, is_retryable: false)
+        end
+        let(:invite_params) do
+          invitation = { name: failed_invitation.name, email: failed_invitation.email }
+          invitations = { generate(:nested_attribute_new_id) => invitation }
+          { invitations_attributes: invitations }
+        end
+        subject { post :create, as: :json, params: { course_id: course, course: invite_params } }
+
+        it 'returns success' do
+          subject
+          expect(response).to have_http_status(:ok)
+        end
+
+        it 'includes isRetryable in existingInvitations of the result' do
+          subject
+          body = JSON.parse(response.body)
+          raw_result = body['invitationResult']
+          result = raw_result.is_a?(String) ? JSON.parse(raw_result) : raw_result
+          existing = result['existingInvitations']
+          expect(existing.length).to eq(1)
+          expect(existing.first['isRetryable']).to be(false)
+        end
+      end
+
       context 'when a student visits the page' do
         let!(:course_student) { create(:course_student, course: course, user: user) }
         it { expect { subject }.to raise_exception(CanCan::AccessDenied) }
diff --git a/spec/models/course_user_spec.rb b/spec/models/course_user_spec.rb
index 1f61ae995ed..366583d87a2 100644
--- a/spec/models/course_user_spec.rb
+++ b/spec/models/course_user_spec.rb
@@ -97,10 +97,33 @@
       context 'when a pending invitation in the same course has the same external_id' do
         let!(:invitation) { create(:course_user_invitation, course: course, external_id: 'pending-id') }
 
-        it 'is invalid' do
+        it 'is invalid for a new record' do
           student = build(:course_student, course: course, external_id: 'pending-id')
           expect(student).not_to be_valid
         end
+
+        it 'is invalid when updating an existing course user to match the pending invitation ext id' do
+          student = create(:course_student, course: course, external_id: nil)
+          expect(student.update(external_id: 'pending-id')).to be(false)
+          expect(student.errors[:external_id]).
+            to include(I18n.t('activerecord.errors.models.course_user.attributes.external_id.taken'))
+        end
+
+        it 'is invalid even when the course user DB id happens to equal the pending invitation DB id' do
+          # Regression guard: validate_unique_external_id_within_course mistakenly applied
+          # where.not(id: self.id) to the invitations query as well as the course_user query,
+          # rather than just the course_user query ("don't compare me against myself").
+          # So if a pending invitation claimed the same external_id, the check would
+          # accidentally exclude it and incorrectly allow the external_id through.
+          # This test ensures that collision is still caught when the IDs happen to match.
+          student = create(:course_student, course: course, external_id: nil)
+          allow(student).to receive(:id).and_return(invitation.id)
+
+          student.external_id = 'pending-id'
+          expect(student).not_to be_valid
+          expect(student.errors[:external_id]).
+            to include(I18n.t('activerecord.errors.models.course_user.attributes.external_id.taken'))
+        end
       end
 
       context 'when only a confirmed invitation in the same course has the same external_id' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2a360ec368d..b7109e39b9d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -193,6 +193,20 @@
       end
     end
 
+    describe '#build_course_user_from_invitation' do
+      let(:course) { create(:course) }
+      let(:user) { create(:user) }
+
+      context 'when invitation has a blank external_id' do
+        let(:invitation) { build(:course_user_invitation, course: course, external_id: '') }
+
+        it 'sets external_id to nil on the built CourseUser' do
+          user.build_course_user_from_invitation(invitation)
+          expect(user.course_users.last.external_id).to be_nil
+        end
+      end
+    end
+
     describe '#send_reset_password_instructions' do
       subject { create(:user) }
 
diff --git a/spec/services/course/user_invitation_service_spec.rb b/spec/services/course/user_invitation_service_spec.rb
index 16b500261f8..90d868965f6 100644
--- a/spec/services/course/user_invitation_service_spec.rb
+++ b/spec/services/course/user_invitation_service_spec.rb
@@ -91,7 +91,7 @@ def invite
 
       context 'when a list of invitation form attributes are provided' do
         it 'registers everyone' do
-          expect(invite.map(&:size)).to eq([new_users.size, 0, existing_users.size, 0, 0])
+          expect(invite.map(&:size)).to eq([new_users.size, 0, existing_users.size, 0, 0, 0, 0])
           verify_users
         end
 
@@ -107,7 +107,7 @@ def invite
         it 'accepts a CSV file with a header' do
           expect(subject.invite(temp_csv_from_attributes(user_attributes.map do |attributes|
             OpenStruct.new(attributes)
-          end)).map(&:size)).to eq([new_users.size, 0, existing_users.size, 0, 0])
+          end)).map(&:size)).to eq([new_users.size, 0, existing_users.size, 0, 0, 0, 0])
 
           verify_users
         end
@@ -133,7 +133,7 @@ def invite
 
         it 'succeeds' do
           expect(invite.map(&:size)).to eq([new_users.size - users_invited.size, users_invited.size,
-                                            existing_users.size - users_in_course.size, users_in_course.size, 0])
+                                            existing_users.size - users_in_course.size, users_in_course.size, 0, 0, 0])
         end
 
         with_active_job_queue_adapter(:test) do
@@ -150,12 +150,12 @@ def invite
         end
 
         it 'processes duplicate users only once' do
-          expect(invite.map(&:size)).to eq([new_user_attributes.size - 1, 0, existing_user_attributes.size, 0, 1])
+          expect(invite.map(&:size)).to eq([new_user_attributes.size - 1, 0, existing_user_attributes.size, 0, 1, 0, 0])
         end
 
         it 'tags the duplicate user with a duplicate_email reason' do
-          _new_invitations, _existing_invitations, _new_course_users, _existing_course_users, duplicate_users = invite
-          expect(duplicate_users.first[:reason]).to eq(:duplicate_email_in_file)
+          _new_invitations, _existing_invitations, _new_course_users, _existing_course_users, failed_users = invite
+          expect(failed_users.first[:reason]).to eq(:duplicate_email_in_file)
         end
 
         with_active_job_queue_adapter(:test) do
@@ -179,16 +179,16 @@ def invite
         it 'processes only the first and treats the second as a duplicate' do
           result = subject.invite(form_attributes)
           expect(result).not_to be_nil
-          new_invitations, _existing_invitations, _new_course_users, _existing_course_users, duplicate_users = result
+          new_invitations, _existing_invitations, _new_course_users, _existing_course_users, failed_users = result
           expect(new_invitations.size).to eq(1)
-          expect(duplicate_users.size).to eq(1)
-          expect(duplicate_users.first[:external_id]).to eq('shared-id')
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:external_id]).to eq('shared-id')
         end
 
         it 'tags the duplicate user with a duplicate_external_id reason' do
           result = subject.invite(form_attributes)
-          _new_invitations, _existing_invitations, _new_course_users, _existing_course_users, duplicate_users = result
-          expect(duplicate_users.first[:reason]).to eq(:duplicate_external_id_in_file)
+          _new_invitations, _existing_invitations, _new_course_users, _existing_course_users, failed_users = result
+          expect(failed_users.first[:reason]).to eq(:duplicate_external_id_in_file)
         end
       end
 
@@ -206,11 +206,11 @@ def invite
           expect(result).not_to be_nil
         end
 
-        it 'puts the conflicting row in duplicate_users with :external_id_taken reason' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.size).to eq(1)
-          expect(duplicate_users.first[:reason]).to eq(:external_id_taken)
-          expect(duplicate_users.first[:external_id]).to eq('taken-id')
+        it 'puts the conflicting row in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
+          expect(failed_users.first[:external_id]).to eq('taken-id')
         end
 
         it 'does not create a new invitation' do
@@ -233,10 +233,10 @@ def invite
           expect(result).not_to be_nil
         end
 
-        it 'puts the conflicting row in duplicate_users with :external_id_taken reason' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.size).to eq(1)
-          expect(duplicate_users.first[:reason]).to eq(:external_id_taken)
+        it 'puts the conflicting row in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
         end
       end
 
@@ -260,9 +260,22 @@ def csv_with_external_id_and_timeline(entries)
           )
           result = subject.invite(csv)
           expect(result).not_to be_nil
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.size).to eq(1)
-          expect(duplicate_users.first[:reason]).to eq(:external_id_taken)
+          _, _, _, _, failed_users = result
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
+          csv.close!
+        end
+      end
+
+      context 'when a 6-column CSV (timeline template) is uploaded to a non-timeline course' do
+        before { course.update!(show_personalized_timeline_features: false) }
+
+        it 'raises CSV::MalformedCSVError to prevent timeline values being stored as external IDs' do
+          csv = Tempfile.new(File.basename(__FILE__, '.*')).tap do |file|
+            file.write(CSV.generate { |c| c << ['Alice', generate(:email), 'student', 'false', 'otot', 'EXT001'] })
+            file.rewind
+          end
+          expect { subject.invite(csv) }.to raise_error(CSV::MalformedCSVError)
           csv.close!
         end
       end
@@ -288,14 +301,14 @@ def csv_with_external_id_no_timeline(entries)
           )
           result = subject.invite(csv)
           expect(result).not_to be_nil
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.size).to eq(1)
-          expect(duplicate_users.first[:reason]).to eq(:external_id_taken)
+          _, _, _, _, failed_users = result
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
           csv.close!
         end
       end
 
-      context 'when re-inviting a pending invitation with a new external_id' do
+      context 'when re-inviting a pending invitation with a new external_id (current nil, CSV value free)' do
         let!(:pending_invitation) do
           create(:course_user_invitation, course: course,
                                           email: 'pending@example.com', external_id: nil)
@@ -307,23 +320,61 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'does not update the pending invitation external_id' do
+        it 'updates the pending invitation external_id' do
           result
-          expect(pending_invitation.reload.external_id).to be_nil
+          expect(pending_invitation.reload.external_id).to eq('new-id')
         end
 
-        it 'puts the user in existing_invitations' do
-          _, existing_invitations, = result
-          expect(existing_invitations).to include(pending_invitation)
+        it 'puts the user in updated_invitations' do
+          updated_invitations = result[5]
+          expect(updated_invitations.map { |u| u[:record] }).to include(pending_invitation)
         end
 
-        it 'does not create duplicate_users entry' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users).to be_empty
+        it 'captures nil as previous_external_id' do
+          updated_invitations = result[5]
+          entry = updated_invitations.find { |u| u[:record] == pending_invitation }
+          expect(entry[:previous_external_id]).to be_nil
+        end
+
+        it 'does not create failed_users entry' do
+          _, _, _, _, failed_users = result
+          expect(failed_users).to be_empty
         end
       end
 
-      context 'when an existing course user is re-invited with a new external_id' do
+      context 'when re-inviting a failed invitation (is_retryable: false) with a new external_id' do
+        let!(:failed_invitation) do
+          create(:course_user_invitation, course: course,
+                                          email: 'failed@example.com',
+                                          external_id: 'old-id',
+                                          is_retryable: false)
+        end
+        let(:invitation_attributes) do
+          { '0' => { name: 'Failed User', email: 'failed@example.com', role: :student,
+                     phantom: false, timeline_algorithm: :fixed, external_id: 'new-id' } }
+        end
+        subject(:result) { invitation_service.invite(invitation_attributes) }
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+
+        it 'does not update the external_id' do
+          result
+          expect(failed_invitation.reload.external_id).to eq('old-id')
+        end
+
+        it 'puts the invitation in existing_invitations, not updated_invitations' do
+          existing_invitations = result[1]
+          updated_invitations = result[5]
+          expect(existing_invitations).to include(failed_invitation)
+          expect(updated_invitations.map { |u| u[:record] }).not_to include(failed_invitation)
+        end
+
+        it 'does not create a failed_users entry' do
+          _, _, _, _, failed_users = result
+          expect(failed_users).to be_empty
+        end
+      end
+
+      context 'when an existing course user is re-invited with a new external_id (current nil, CSV value free)' do
         let!(:enrolled_user) { create(:user) }
         let!(:course_user_record) { create(:course_student, course: course, user: enrolled_user, external_id: nil) }
         let(:invitation_attributes) do
@@ -333,19 +384,25 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'does not update the course_user external_id' do
+        it 'updates the course_user external_id' do
           result
-          expect(course_user_record.reload.external_id).to be_nil
+          expect(course_user_record.reload.external_id).to eq('new-id')
         end
 
-        it 'puts the user in existing_course_users' do
-          _, _, _, existing_course_users, = result
-          expect(existing_course_users).to include(course_user_record)
+        it 'puts the user in updated_course_users' do
+          updated_course_users = result[6]
+          expect(updated_course_users.map { |u| u[:record] }).to include(course_user_record)
         end
 
-        it 'produces no duplicate_users entry' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users).to be_empty
+        it 'captures nil as previous_external_id' do
+          updated_course_users = result[6]
+          entry = updated_course_users.find { |u| u[:record] == course_user_record }
+          expect(entry[:previous_external_id]).to be_nil
+        end
+
+        it 'produces no failed_users entry' do
+          _, _, _, _, failed_users = result
+          expect(failed_users).to be_empty
         end
       end
 
@@ -364,20 +421,15 @@ def csv_with_external_id_no_timeline(entries)
           expect(result).not_to be_nil
         end
 
-        it 'puts the user in existing_course_users' do
-          _, _, _, existing_course_users, = result
-          expect(existing_course_users).to include(course_user_record)
+        it 'puts the user in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.map { |u| u[:reason] }).to include(:external_id_taken)
         end
 
         it 'does not update the course_user external_id' do
           result
           expect(course_user_record.reload.external_id).to be_nil
         end
-
-        it 'does not create a duplicate_users entry' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users).to be_empty
-        end
       end
 
       context 'when a new user is invited but the external_id matches an existing course user' do
@@ -394,9 +446,9 @@ def csv_with_external_id_no_timeline(entries)
           expect(result).not_to be_nil
         end
 
-        it 'puts the row in duplicate_users with :external_id_taken reason' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.first[:reason]).to eq(:external_id_taken)
+        it 'puts the row in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
         end
 
         it 'does not enroll the user' do
@@ -415,9 +467,9 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'puts the row in duplicate_users with :external_id_taken reason' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.first[:reason]).to eq(:external_id_taken)
+        it 'puts the row in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
         end
 
         it 'does not enroll the user' do
@@ -437,23 +489,18 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'puts the user in existing_course_users' do
-          _, _, _, existing_course_users, = result
-          expect(existing_course_users).to include(course_user_record)
+        it 'puts the user in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.map { |u| u[:reason] }).to include(:external_id_taken)
         end
 
         it 'does not update the course_user external_id' do
           result
           expect(course_user_record.reload.external_id).to be_nil
         end
-
-        it 'does not create a duplicate_users entry' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users).to be_empty
-        end
       end
 
-      context 'when re-inviting a pending invitation whose new external_id is already taken' do
+      context 'when re-inviting a pending invitation whose CSV ext_id is taken by another member' do
         let!(:other_user) { create(:course_student, course: course, external_id: 'taken-id') }
         let!(:pending_invitation) do
           create(:course_user_invitation, course: course,
@@ -466,23 +513,52 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'puts the user in existing_invitations' do
-          _, existing_invitations, = result
-          expect(existing_invitations).to include(pending_invitation)
+        it 'puts the user in failed_users with :external_id_taken reason' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.map { |u| u[:reason] }).to include(:external_id_taken)
         end
 
         it 'does not update the pending invitation external_id' do
           result
           expect(pending_invitation.reload.external_id).to eq('old-id')
         end
+      end
+
+      context 'when re-inviting a pending invitation with a non-nil ext_id and CSV provides a free different value' do
+        let!(:pending_invitation) do
+          create(:course_user_invitation, course: course,
+                                          email: 'pending@example.com', name: 'Pending User', external_id: 'old-id')
+        end
+        let(:invitation_attributes) do
+          { '0' => { name: 'Pending User', email: 'pending@example.com', role: :student,
+                     phantom: false, timeline_algorithm: :fixed, external_id: 'new-id' } }
+        end
+        subject(:result) { invitation_service.invite(invitation_attributes) }
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+
+        it 'updates the pending invitation external_id' do
+          result
+          expect(pending_invitation.reload.external_id).to eq('new-id')
+        end
+
+        it 'puts the user in updated_invitations' do
+          updated_invitations = result[5]
+          expect(updated_invitations.map { |u| u[:record] }).to include(pending_invitation)
+        end
+
+        it 'captures the previous ext_id' do
+          updated_invitations = result[5]
+          entry = updated_invitations.find { |u| u[:record] == pending_invitation }
+          expect(entry[:previous_external_id]).to eq('old-id')
+        end
 
-        it 'does not create a duplicate_users entry' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users).to be_empty
+        it 'does not create failed_users entry' do
+          _, _, _, _, failed_users = result
+          expect(failed_users).to be_empty
         end
       end
 
-      context 'when a batch reassigns a pending invitation ext_id and a later row claims the freed id' do
+      context 'when a batch changes an existing invitation ext_id and a later row claims the freed id' do
         let!(:alice_invitation) do
           create(:course_user_invitation, course: course,
                                           email: 'alice@example.com', name: 'Alice', external_id: 'freed-id')
@@ -497,15 +573,113 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'puts the first row (existing invitation) in existing_invitations unchanged' do
-          _, existing_invitations, = result
-          expect(existing_invitations).to include(alice_invitation)
-          expect(alice_invitation.reload.external_id).to eq('freed-id')
+        it 'updates Alice to new-id' do
+          result
+          expect(alice_invitation.reload.external_id).to eq('new-id')
+        end
+
+        it 'creates a new invitation for Bob with the freed id' do
+          new_invitations, = result
+          expect(new_invitations.map(&:external_id)).to include('freed-id')
+        end
+
+        it 'produces no failed_users entries' do
+          _, _, _, _, failed_users = result
+          expect(failed_users).to be_empty
+        end
+      end
+
+      context 'cross-type freed-id: existing course user frees id, new invitation claims it in same batch' do
+        # invite_new_users runs before add_existing_users, so the new invitation is processed
+        # first and sees the id as still taken. The existing course user is then upserted
+        # successfully, but the new invitation has already been rejected.
+        let!(:enrolled_user_freeing) { create(:user) }
+        let!(:course_user_freeing) do
+          create(:course_student, course: course, user: enrolled_user_freeing, external_id: 'freed-id')
+        end
+        let(:new_user_email) { generate(:email) }
+        let(:invitation_attributes) do
+          { '0' => { name: enrolled_user_freeing.name, email: enrolled_user_freeing.email,
+                     role: :student, phantom: false, timeline_algorithm: :fixed,
+                     external_id: 'new-id' },
+            '1' => { name: 'New Person', email: new_user_email,
+                     role: :student, phantom: false, timeline_algorithm: :fixed,
+                     external_id: 'freed-id' } }
+        end
+        subject(:result) { invitation_service.invite(invitation_attributes) }
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+
+        it 'upserts the existing course user to new-id' do
+          result
+          expect(course_user_freeing.reload.external_id).to eq('new-id')
         end
 
-        it 'rejects the second row as external_id_taken because the freed-id is never released' do
-          _, _, _, _, duplicate_users = result
-          expect(duplicate_users.map { |u| u[:reason] }).to include(:external_id_taken)
+        it 'rejects the new invitation because it is processed before the id is freed' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.map { |u| u[:email] }).to include(new_user_email)
+          expect(failed_users.find { |u| u[:email] == new_user_email }[:reason]).to eq(:external_id_taken)
+        end
+      end
+
+      context 'when a new direct enrollee (existing account, not yet in course) ' \
+              'has an ext_id already taken by another course member' do
+        let!(:other_member) { create(:course_student, course: course, external_id: 'taken-id') }
+        let!(:enrollee) { create(:instance_user).user }
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+
+        subject(:result) do
+          invitation_service.invite(
+            '0' => { name: enrollee.name, email: enrollee.email, role: :student,
+                     phantom: false, timeline_algorithm: :fixed, external_id: 'taken-id' }
+          )
+        end
+
+        it 'puts the enrollee in failed_users with :external_id_taken' do
+          _, _, _, _, failed_users = result
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
+        end
+
+        it 'does not enroll the user' do
+          _, _, new_course_users, = result
+          expect(new_course_users).to be_empty
+        end
+
+        it 'does not create an invitation' do
+          new_invitations, = result
+          expect(new_invitations).to be_empty
+        end
+      end
+
+      context 'when a new invitation ext_id conflicts with a course user ext_id (not a pending invitation)' do
+        let!(:existing_member) { create(:course_student, course: course, external_id: 'cu-taken-id') }
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+
+        it 'puts the row in failed_users with :external_id_taken and does not create an invitation' do
+          result = invitation_service.invite(
+            '0' => { name: 'New Person', email: generate(:email), role: :student,
+                     phantom: false, timeline_algorithm: :fixed, external_id: 'cu-taken-id' }
+          )
+          new_invitations, _, _, _, failed_users = result
+          expect(failed_users.size).to eq(1)
+          expect(failed_users.first[:reason]).to eq(:external_id_taken)
+          expect(new_invitations).to be_empty
+        end
+      end
+
+      context 'when the email belongs to a user with an unconfirmed email address' do
+        let!(:unconfirmed_user) { create(:instance_user).user }
+        before { unconfirmed_user.emails.update_all(confirmed_at: nil) }
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+
+        it 'sends an invitation instead of directly enrolling the user' do
+          result = invitation_service.invite(
+            '0' => { name: unconfirmed_user.name, email: unconfirmed_user.email,
+                     role: :student, phantom: false, timeline_algorithm: :fixed, external_id: nil }
+          )
+          new_invitations, _, new_course_users, = result
+          expect(new_invitations.size).to eq(1)
+          expect(new_course_users).to be_empty
         end
       end
 
@@ -524,29 +698,29 @@ def csv_with_timeline(entries)
         end
 
         context 'when a CSV has two rows with the same email' do
-          it 'puts the second in duplicateUsers with reason duplicate_email' do
+          it 'puts the second in failedUsers with reason duplicate_email' do
             csv = csv_with_timeline([
                                       { name: 'User A', email: 'a@example.com', external_id: 'id-1' },
                                       { name: 'User B', email: 'a@example.com', external_id: 'id-2' }
                                     ])
             result = subject.invite(csv)
-            _new_invitations, _existing, _new_cu, _existing_cu, duplicate_users = result
-            expect(duplicate_users.size).to eq(1)
-            expect(duplicate_users.first[:reason]).to eq(:duplicate_email_in_file)
+            _new_invitations, _existing, _new_cu, _existing_cu, failed_users = result
+            expect(failed_users.size).to eq(1)
+            expect(failed_users.first[:reason]).to eq(:duplicate_email_in_file)
             csv.close!
           end
         end
 
         context 'when a CSV has two rows with the same external_id' do
-          it 'puts the second in duplicateUsers with reason duplicate_external_id' do
+          it 'puts the second in failedUsers with reason duplicate_external_id' do
             csv = csv_with_timeline([
                                       { name: 'User A', email: 'a@example.com', external_id: 'shared-id' },
                                       { name: 'User B', email: 'b@example.com', external_id: 'shared-id' }
                                     ])
             result = subject.invite(csv)
-            _new_invitations, _existing, _new_cu, _existing_cu, duplicate_users = result
-            expect(duplicate_users.size).to eq(1)
-            expect(duplicate_users.first[:reason]).to eq(:duplicate_external_id_in_file)
+            _new_invitations, _existing, _new_cu, _existing_cu, failed_users = result
+            expect(failed_users.size).to eq(1)
+            expect(failed_users.first[:reason]).to eq(:duplicate_external_id_in_file)
             csv.close!
           end
         end
@@ -562,9 +736,9 @@ def csv_with_timeline(entries)
                                     ])
             result = subject.invite(csv)
             expect(result).not_to be_nil
-            _new_invitations, _existing, _new_cu, _existing_cu, duplicate_users = result
-            expect(duplicate_users.size).to eq(1)
-            expect(duplicate_users.first[:reason]).to eq(:duplicate_external_id_in_file)
+            _new_invitations, _existing, _new_cu, _existing_cu, failed_users = result
+            expect(failed_users.size).to eq(1)
+            expect(failed_users.first[:reason]).to eq(:duplicate_external_id_in_file)
             csv.close!
           end
         end
@@ -576,9 +750,9 @@ def csv_with_timeline(entries)
                                       { name: 'User B', email: 'a@example.com', external_id: 'id-1' }
                                     ])
             result = subject.invite(csv)
-            _new_invitations, _existing, _new_cu, _existing_cu, duplicate_users = result
-            expect(duplicate_users.size).to eq(1)
-            expect(duplicate_users.first[:reason]).to eq(:duplicate_email_in_file)
+            _new_invitations, _existing, _new_cu, _existing_cu, failed_users = result
+            expect(failed_users.size).to eq(1)
+            expect(failed_users.first[:reason]).to eq(:duplicate_email_in_file)
             csv.close!
           end
         end
@@ -595,9 +769,9 @@ def csv_with_timeline(entries)
         it 'does not treat a new unique external_id as taken' do
           result = subject.invite(invitation_attributes)
           expect(result).not_to be_nil
-          new_invitations, _, _, _, duplicate_users = result
+          new_invitations, _, _, _, failed_users = result
           expect(new_invitations.length).to eq(1)
-          expect(duplicate_users).to be_empty
+          expect(failed_users).to be_empty
         end
       end
 
@@ -623,6 +797,110 @@ def csv_with_timeline(entries)
       end
     end
 
+    describe 'timeline_algorithm assignment on direct enrollment' do
+      let(:course) { create(:course, default_timeline_algorithm: :fixed) }
+      let(:manager) { create(:course_manager, course: course) }
+      let(:existing_user) { create(:instance_user).user }
+      subject { Course::UserInvitationService.new(manager, manager.user, course) }
+
+      it 'assigns the CSV timeline_algorithm to the enrolled CourseUser, not the course default' do
+        result = subject.invite(
+          '0' => { name: existing_user.name, email: existing_user.email,
+                   role: :student, phantom: false, timeline_algorithm: :otot, external_id: nil }
+        )
+        _, _, new_course_users, = result
+        expect(new_course_users.size).to eq(1)
+        expect(new_course_users.first.timeline_algorithm).to eq('otot')
+      end
+    end
+
+    describe 'ext_id handling on existing records' do
+      let(:course) { create(:course) }
+      let(:manager) { create(:course_manager, course: course) }
+      subject { Course::UserInvitationService.new(manager, manager.user, course) }
+
+      # An existing pending invitation with nil ext_id; CSV provides EXT001 (free)
+      let!(:existing_inv_nil_ext) { create(:course_user_invitation, course: course, external_id: nil) }
+      let(:inv_nil_ext_user_attrs) do
+        { '0' => { name: existing_inv_nil_ext.name, email: existing_inv_nil_ext.email,
+                   role: :student, phantom: false, timeline_algorithm: :fixed, external_id: 'EXT001' } }
+      end
+
+      # Another invitation that already holds 'TAKEN' so EXT_TAKEN is not free
+      let!(:other_inv) { create(:course_user_invitation, course: course, external_id: 'TAKEN') }
+      # An existing pending invitation with nil ext_id; CSV provides TAKEN (already in DB)
+      let!(:existing_inv_taken_ext) { create(:course_user_invitation, course: course, external_id: nil) }
+      let(:inv_taken_ext_user_attrs) do
+        { '0' => { name: existing_inv_taken_ext.name, email: existing_inv_taken_ext.email,
+                   role: :student, phantom: false, timeline_algorithm: :fixed, external_id: 'TAKEN' } }
+      end
+
+      # An existing enrolled course user with nil ext_id; CSV provides EXT002 (free)
+      let!(:enrolled_nil) { create(:course_student, course: course, external_id: nil) }
+      let(:enrolled_nil_user_attrs) do
+        { '0' => { name: enrolled_nil.name, email: enrolled_nil.user.email,
+                   role: :student, phantom: false, timeline_algorithm: :fixed, external_id: 'EXT002' } }
+      end
+
+      # An existing enrolled course user with ext_id 'EXISTING'; CSV provides 'DIFFERENT'
+      let!(:enrolled_conflict) { create(:course_student, course: course, external_id: 'EXISTING') }
+      let(:enrolled_conflict_user_attrs) do
+        { '0' => { name: enrolled_conflict.name, email: enrolled_conflict.user.email,
+                   role: :student, phantom: false, timeline_algorithm: :fixed, external_id: 'DIFFERENT' } }
+      end
+
+      it 'sets ext_id on existing invitation when current is nil and CSV value is free' do
+        result = subject.invite(inv_nil_ext_user_attrs)
+        expect(result).not_to be_nil
+        updated_invitations = result[5]
+        expect(updated_invitations.length).to eq(1)
+        expect(updated_invitations.map { |u| u[:record] }.first.external_id).to eq('EXT001')
+        expect(existing_inv_nil_ext.reload.external_id).to eq('EXT001')
+      end
+
+      it 'rejects with :external_id_taken when existing invitation has nil ext_id but CSV value is taken' do
+        result = subject.invite(inv_taken_ext_user_attrs)
+        expect(result).not_to be_nil
+        failed_users = result[4]
+        expect(failed_users.map { |u| u[:reason] }).to include(:external_id_taken)
+      end
+
+      it 'sets ext_id on existing course user when current is nil and CSV value is free' do
+        result = subject.invite(enrolled_nil_user_attrs)
+        expect(result).not_to be_nil
+        updated_course_users = result[6]
+        expect(updated_course_users.length).to eq(1)
+        expect(updated_course_users.map { |u| u[:record] }.first.external_id).to eq('EXT002')
+        expect(enrolled_nil.reload.external_id).to eq('EXT002')
+      end
+
+      context 'when an existing course user has non-nil ext_id and CSV provides a free different value' do
+        it 'updates the course_user external_id' do
+          subject.invite(enrolled_conflict_user_attrs)
+          expect(enrolled_conflict.reload.external_id).to eq('DIFFERENT')
+        end
+
+        it 'puts the user in updated_course_users' do
+          result = subject.invite(enrolled_conflict_user_attrs)
+          updated_course_users = result[6]
+          expect(updated_course_users.map { |u| u[:record] }).to include(enrolled_conflict)
+        end
+
+        it 'captures the previous ext_id' do
+          result = subject.invite(enrolled_conflict_user_attrs)
+          updated_course_users = result[6]
+          entry = updated_course_users.find { |u| u[:record] == enrolled_conflict }
+          expect(entry[:previous_external_id]).to eq('EXISTING')
+        end
+
+        it 'produces no failed_users entry' do
+          result = subject.invite(enrolled_conflict_user_attrs)
+          _, _, _, _, failed_users = result
+          expect(failed_users).to be_empty
+        end
+      end
+    end
+
     describe '#resend_invitation' do
       let(:previous_sent_time) { 1.day.ago }
       let(:pending_invitations) do
@@ -1145,7 +1423,7 @@ def csv_with_timeline(entries)
       end
 
       it 'adds an invitation to the user' do
-        subject.instance_variable_set(:@duplicate_users, [])
+        subject.instance_variable_set(:@failed_users, [])
         subject.instance_variable_set(:@taken_external_ids, Set.new)
         subject.send(:invite_new_users, invitation_params)
         invitation_params.each do |hash|

From 67de552f503bab9f6f6fed450c70dfeb27645fce Mon Sep 17 00:00:00 2001
From: lws49 <e0970244@u.nus.edu>
Date: Wed, 3 Jun 2026 15:45:57 +0800
Subject: [PATCH 2/3] feat(invitations): add CSV header validation and external
 ID conflict resolution

- validate CSV column headers explicitly instead of checking column count
- detect external ID changes on existing users/invitations before applying;
  surface a confirmation prompt (Keep Existing / Replace) with a side-by-side
  Current / New External ID table capped at 320px for large uploads
- conflict resolution wired into both file upload and individual invite form;
  file ref preserved on Go Back so admin need not re-select
- add ExternalIdResolution and PendingExternalIdConflict types; update invite
  API and operations layer to detect and return conflict payload
- controller rescues PendingExternalIdUpdates, renders jbuilder partial;
  concern branches on @resolution to populate pending vs updated arrays
- i18n: add EN/KO/ZH translations for conflict prompt and new table columns
---
 .../course/user_invitations_controller.rb     |  26 +++-
 .../parse_invitation_concern.rb               |  37 +++--
 .../process_invitation_concern.rb             |  44 +++++-
 .../course/user_invitation_service.rb         |  57 ++++---
 .../_pending_external_id_data.json.jbuilder   |  25 +++
 client/app/api/course/UserInvitations.ts      |  22 ++-
 .../components/forms/IndividualInviteForm.tsx | 134 +++++++++++-----
 .../forms/InviteUsersFileUploadForm.tsx       |   2 +-
 .../misc/ExternalIdConflictPrompt.tsx         | 122 +++++++++++++++
 .../ExternalIdConflictPrompt.test.tsx         | 144 ++++++++++++++++++
 .../tables/ExternalIdConflictTable.tsx        |  68 +++++++++
 .../__test__/ExternalIdConflictTable.test.tsx |  59 +++++++
 .../course/user-invitations/operations.ts     |  48 ++++--
 .../__test__/index.test.tsx                   |  93 +++++++++++
 .../pages/InviteUsersFileUpload/index.tsx     | 107 +++++++++----
 client/app/types/course/userInvitations.ts    |   7 +
 client/locales/en.json                        |  32 +++-
 client/locales/ko.json                        |  29 +++-
 client/locales/zh.json                        |  29 +++-
 config/locales/en/errors.yml                  |   2 +-
 config/locales/ko/errors.yml                  |   2 +-
 config/locales/zh/errors.yml                  |   2 +-
 .../user_invitations_controller_spec.rb       | 114 ++++++++++++++
 .../invitation_duplicate_external_id.csv      |   4 +-
 spec/fixtures/course/invitation_empty.csv     |   1 -
 ...nvitation_fuzzy_roles_phantom_timeline.csv |   2 +-
 .../course/invitation_invalid_email.csv       |   2 +-
 .../invitation_no_external_id_no_timeline.csv |   1 -
 .../fixtures/course/invitation_whitespace.csv |   1 -
 .../course/invitation_with_external_id.csv    |   2 +-
 ...nvitation_with_external_id_no_timeline.csv |   2 +-
 .../course/user_invitation_service_spec.rb    | 107 +++++++++----
 32 files changed, 1151 insertions(+), 176 deletions(-)
 create mode 100644 app/views/course/user_invitations/_pending_external_id_data.json.jbuilder
 create mode 100644 client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx

diff --git a/app/controllers/course/user_invitations_controller.rb b/app/controllers/course/user_invitations_controller.rb
index 0ce9d15e9a9..4da0dfbe7fd 100644
--- a/app/controllers/course/user_invitations_controller.rb
+++ b/app/controllers/course/user_invitations_controller.rb
@@ -15,8 +15,20 @@ def index
 
   def create
     result = invite
-    if result
+    case result
+    when Array
       create_invitation_success(result)
+    when :pending_conflict
+      respond_to do |format|
+        format.json do
+          render partial: 'pending_external_id_data',
+                 locals: {
+                   pending_invitation_updates: @pending_conflict.pending_invitation_updates,
+                   pending_course_user_updates: @pending_conflict.pending_course_user_updates
+                 },
+                 status: :ok
+        end
+      end
     else
       propagate_errors
       errors = current_course.errors[:base]
@@ -93,7 +105,7 @@ def resend_invitation_params
   #   1) Single invitation - specified with the user_invitation_id param
   #   2) All un-confirmed invitation - if user_invitation_id param was not found
   def load_invitations
-    @invitations ||= begin
+    @load_invitations ||= begin
       ids = resend_invitation_params
       ids ||= current_course.invitations.retryable.unconfirmed.select(:id)
       if ids.blank?
@@ -118,12 +130,18 @@ def invite_by_file?
 
   # Invites the users via the service object.
   #
-  # @return [Boolean] True if the invitation was successful.
+  # @return [Array] On success.
+  # @return [Symbol] :pending_conflict when external ID updates require resolution.
+  # @return [Boolean] false on failure.
   def invite
-    invitation_service.invite(invitation_params)
+    invitation_service.invite(invitation_params,
+                              external_id_resolution: params[:external_id_resolution])
   rescue CSV::MalformedCSVError => e
     current_course.errors.add(:base, e.message)
     false
+  rescue Course::UserInvitationService::PendingExternalIdUpdates => e
+    @pending_conflict = e
+    :pending_conflict
   end
 
   # Creates a user invitation service object for this object.
diff --git a/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb b/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
index ecc094b8e91..b658b9d081f 100644
--- a/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
+++ b/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
@@ -9,6 +9,8 @@ module Course::UserInvitationService::ParseInvitationConcern
   extend ActiveSupport::Autoload
 
   TRUE_VALUES = ['t', 'true', 'y', 'yes'].freeze
+  EXPECTED_HEADERS_WITH_TIMELINE = %w[name email role phantom timeline externalid].freeze
+  EXPECTED_HEADERS_WITHOUT_TIMELINE = %w[name email role phantom externalid].freeze
 
   private
 
@@ -116,8 +118,13 @@ def parse_from_file(file)
         row_num = row_number
         row[0] = remove_utf8_byte_order_mark(row[0]) if row_number == 1
         row = strip_row(row)
-        # Ignore first row if it's a header row.
-        next if row_number == 1 && header_row?(row)
+        if row_number == 1 && looks_like_header?(row)
+          unless valid_header_row?(row)
+            raise I18n.t('errors.course.user_invitations.invalid_headers',
+                         expected: expected_headers.join(','))
+          end
+          next
+        end
 
         invite = parse_file_row(row)
         invites << invite if invite
@@ -127,12 +134,22 @@ def parse_from_file(file)
     raise CSV::MalformedCSVError.new(e, row_num), e.message
   end
 
-  # Returns a boolean to determine whether the row is a header row.
-  #
-  # @param[Array] row Array read from CSV file.
-  # @return [Boolean] Whether the row is a header row
-  def header_row?(row)
-    row[0].casecmp('Name') == 0 && row[1].casecmp('Email') == 0
+  def looks_like_header?(row)
+    row[0]&.casecmp('Name')&.zero? && row[1]&.casecmp('Email')&.zero?
+  end
+
+  def expected_headers
+    if @current_course.show_personalized_timeline_features?
+      EXPECTED_HEADERS_WITH_TIMELINE
+    else
+      EXPECTED_HEADERS_WITHOUT_TIMELINE
+    end
+  end
+
+  def valid_header_row?(row)
+    return false unless looks_like_header?(row)
+
+    row.map { |h| h&.downcase }.compact == expected_headers
   end
 
   # Strips a row of whitespaces.
@@ -151,10 +168,6 @@ def strip_row(row)
   def parse_file_row(row)
     return nil if row[1].blank?
 
-    if !@current_course.show_personalized_timeline_features? && row.length > 5
-      raise I18n.t('errors.course.user_invitations.timeline_template_mismatch')
-    end
-
     row[0] = row[1] if row[0].blank?
     role = parse_file_role(row[2])
     phantom = parse_file_phantom(row[3])
diff --git a/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb b/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
index f256d240e8a..11e883c2fab 100644
--- a/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
+++ b/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
@@ -84,10 +84,24 @@ def handle_existing_course_user(user, course_user, existing_course_users)
     elsif @taken_external_ids.include?(csv_ext_id)
       @failed_users.push(user.merge(reason: :external_id_taken))
     else
-      @taken_external_ids.delete(current_ext_id) if current_ext_id
-      @taken_external_ids.add(csv_ext_id)
-      course_user.external_id = csv_ext_id
-      @updated_course_users << { record: course_user, previous_external_id: current_ext_id }
+      case @resolution
+      when :replace_all
+        @taken_external_ids.delete(current_ext_id) if current_ext_id
+        @taken_external_ids.add(csv_ext_id)
+        course_user.external_id = csv_ext_id
+        @updated_course_users << { record: course_user, previous_external_id: current_ext_id }
+      when :keep_existing
+        existing_course_users << course_user
+      else
+        @taken_external_ids.delete(current_ext_id) if current_ext_id
+        @taken_external_ids.add(csv_ext_id)
+        @pending_course_user_updates << {
+          record: course_user,
+          previous_external_id: current_ext_id,
+          new_external_id: csv_ext_id
+        }
+        existing_course_users << course_user
+      end
     end
   end
 
@@ -164,10 +178,24 @@ def handle_existing_invitation(user, invitation, existing_invitations)
     elsif @taken_external_ids.include?(csv_ext_id)
       @failed_users.push(user.merge(reason: :external_id_taken))
     else
-      @taken_external_ids.delete(current_ext_id) if current_ext_id
-      @taken_external_ids.add(csv_ext_id)
-      invitation.external_id = csv_ext_id
-      @updated_invitations << { record: invitation, previous_external_id: current_ext_id }
+      case @resolution
+      when :replace_all
+        @taken_external_ids.delete(current_ext_id) if current_ext_id
+        @taken_external_ids.add(csv_ext_id)
+        invitation.external_id = csv_ext_id
+        @updated_invitations << { record: invitation, previous_external_id: current_ext_id }
+      when :keep_existing
+        existing_invitations << invitation
+      else
+        @taken_external_ids.delete(current_ext_id) if current_ext_id
+        @taken_external_ids.add(csv_ext_id)
+        @pending_invitation_updates << {
+          record: invitation,
+          previous_external_id: current_ext_id,
+          new_external_id: csv_ext_id
+        }
+        existing_invitations << invitation
+      end
     end
   end
 
diff --git a/app/services/course/user_invitation_service.rb b/app/services/course/user_invitation_service.rb
index b7b39e4ddbc..d4612317330 100644
--- a/app/services/course/user_invitation_service.rb
+++ b/app/services/course/user_invitation_service.rb
@@ -6,6 +6,16 @@ class Course::UserInvitationService
   include ProcessInvitationConcern
   include EmailInvitationConcern
 
+  class PendingExternalIdUpdates < StandardError
+    attr_reader :pending_invitation_updates, :pending_course_user_updates
+
+    def initialize(pending_invitation_updates:, pending_course_user_updates:)
+      @pending_invitation_updates = pending_invitation_updates
+      @pending_course_user_updates = pending_course_user_updates
+      super('Pending external ID updates require confirmation')
+    end
+  end
+
   # Constructor for the user invitation service object.
   #
   # @param [CourseUser|nil] current_course_user The course user performing this action.
@@ -28,33 +38,23 @@ def initialize(current_course_user, current_user, current_course)
   #   new_course_users, existing_course_users, failed_users, updated_invitations, updated_course_users
   #   respectively if success. nil when fail.
   # @raise [CSV::MalformedCSVError] When the file provided is invalid.
-  def invite(users)
-    new_invitations = nil
-    existing_invitations = nil
-    new_course_users = nil
-    existing_course_users = nil
-    failed_users = nil
-    updated_invitations = nil
-    updated_course_users = nil
+  def invite(users, external_id_resolution: nil)
+    @resolution = external_id_resolution&.to_sym
+    result = nil
 
     success = Course.transaction do
-      new_invitations, existing_invitations,
-      new_course_users, existing_course_users,
-      failed_users, updated_invitations, updated_course_users = invite_users(users)
-      raise ActiveRecord::Rollback unless updated_invitations.all? { |u| u[:record].save }
-      raise ActiveRecord::Rollback unless updated_course_users.all? { |u| u[:record].save }
-      raise ActiveRecord::Rollback unless new_invitations.all?(&:save)
-      raise ActiveRecord::Rollback unless new_course_users.all?(&:save)
-
+      result = invite_users(users)
+      raise_if_pending_external_id_updates!
+      save_invitation_records!(result)
       true
     end
 
     return unless success
 
+    new_invitations, _, new_course_users, = result
     send_registered_emails(new_course_users)
     send_invitation_emails(new_invitations)
-    [new_invitations, existing_invitations, new_course_users, existing_course_users,
-     failed_users, updated_invitations, updated_course_users]
+    result
   end
 
   # Resends invitation emails to CourseUsers to the given course.
@@ -64,11 +64,28 @@ def invite(users)
   # @return [Boolean] True if there were no errors in sending invitations.
   #   If all provided CourseUsers have already registered, method also returns true.
   def resend_invitation(invitations)
-    invitations.blank? ? true : send_invitation_emails(invitations)
+    invitations.blank? || send_invitation_emails(invitations)
   end
 
   private
 
+  def raise_if_pending_external_id_updates!
+    return unless @pending_invitation_updates.any? || @pending_course_user_updates.any?
+
+    raise PendingExternalIdUpdates.new(
+      pending_invitation_updates: @pending_invitation_updates,
+      pending_course_user_updates: @pending_course_user_updates
+    )
+  end
+
+  def save_invitation_records!(result)
+    new_invitations, _, new_course_users, _, _, updated_invitations, updated_course_users = result
+    all_records = updated_invitations.map { |u| u[:record] } +
+                  updated_course_users.map { |u| u[:record] } +
+                  new_invitations + new_course_users
+    raise ActiveRecord::Rollback unless all_records.all?(&:save)
+  end
+
   # Invites the given users into the course.
   #
   # @param [Array<Hash>|File|TempFile] users Invites the given users.
@@ -88,6 +105,8 @@ def invite_users(users)
     @failed_users = parse_duplicates
     @updated_invitations = []
     @updated_course_users = []
+    @pending_invitation_updates = []
+    @pending_course_user_updates = []
     process_invitations(unique_users) + [@failed_users, @updated_invitations, @updated_course_users]
   end
 end
diff --git a/app/views/course/user_invitations/_pending_external_id_data.json.jbuilder b/app/views/course/user_invitations/_pending_external_id_data.json.jbuilder
new file mode 100644
index 00000000000..8906eeeaf15
--- /dev/null
+++ b/app/views/course/user_invitations/_pending_external_id_data.json.jbuilder
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+json.pendingInvitationUpdates pending_invitation_updates do |item|
+  inv = item[:record]
+  json.id                inv.id
+  json.name              inv.name
+  json.email             inv.email
+  json.externalId        item[:new_external_id]
+  json.previousExternalId item[:previous_external_id]
+  json.role              inv.role
+  json.phantom           inv.phantom
+  json.timelineAlgorithm inv.timeline_algorithm
+end
+
+json.pendingCourseUserUpdates pending_course_user_updates do |item|
+  cu = item[:record]
+  json.id                cu.id
+  json.name              cu.name.strip
+  json.email             cu.user.email
+  json.externalId        item[:new_external_id]
+  json.previousExternalId item[:previous_external_id]
+  json.role              cu.role
+  json.phantom           cu.phantom?
+  json.timelineAlgorithm cu.timeline_algorithm
+end
diff --git a/client/app/api/course/UserInvitations.ts b/client/app/api/course/UserInvitations.ts
index 9d042ee905b..16fa29d7887 100644
--- a/client/app/api/course/UserInvitations.ts
+++ b/client/app/api/course/UserInvitations.ts
@@ -4,8 +4,10 @@ import {
   ManageCourseUsersSharedData,
 } from 'types/course/courseUsers';
 import {
+  ExternalIdResolution,
   InvitationFileEntity,
   InvitationListData,
+  InvitationUpdatedItem,
 } from 'types/course/userInvitations';
 
 import SubmissionsAPI from './Assessment/Submissions';
@@ -36,11 +38,17 @@ export default class UserInvitationsAPI extends BaseCourseAPI {
    * @return {Promise}
    * error response: { errors: [] } - An array of errors will be returned upon validation error.
    */
-  invite(data: InvitationFileEntity | FormData): Promise<
-    AxiosResponse<{
-      newInvitations: number;
-      invitationResult: string; // string which is JSON.parsed to type InvitationResult
-    }>
+  invite(
+    data: InvitationFileEntity | FormData,
+    externalIdResolution?: ExternalIdResolution,
+  ): Promise<
+    AxiosResponse<
+      | { newInvitations: number; invitationResult: string }
+      | {
+          pendingInvitationUpdates: InvitationUpdatedItem[];
+          pendingCourseUserUpdates: InvitationUpdatedItem[];
+        }
+    >
   > {
     const config = {
       headers: {
@@ -60,6 +68,10 @@ export default class UserInvitationsAPI extends BaseCourseAPI {
       formData = data as FormData;
     }
 
+    if (externalIdResolution) {
+      formData.append('external_id_resolution', externalIdResolution);
+    }
+
     return this.client.post(
       `${this.#urlPrefix}/users/invite`,
       formData,
diff --git a/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx b/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx
index 56f8a9b1330..e6bc40956c9 100644
--- a/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx
+++ b/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx
@@ -1,11 +1,13 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useRef, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { defineMessages } from 'react-intl';
 import { yupResolver } from '@hookform/resolvers/yup';
 import {
+  ExternalIdResolution,
   IndividualInvites,
   InvitationResult,
   InvitationsPostData,
+  PendingExternalIdConflict,
 } from 'types/course/userInvitations';
 import * as yup from 'yup';
 
@@ -20,6 +22,7 @@ import {
   getManageCourseUserPermissions,
   getManageCourseUsersSharedData,
 } from '../../selectors';
+import ExternalIdConflictPrompt from '../misc/ExternalIdConflictPrompt';
 
 import IndividualInvitations from './IndividualInvitations';
 
@@ -60,6 +63,9 @@ const IndividualInviteForm: FC<Props> = (props) => {
   const { openResultDialog } = props;
   const { t } = useTranslation();
   const [isLoading, setIsLoading] = useState(false);
+  const [conflictData, setConflictData] =
+    useState<PendingExternalIdConflict | null>(null);
+  const dataRef = useRef<InvitationsPostData | null>(null);
   const dispatch = useAppDispatch();
   const sharedData = useAppSelector(getManageCourseUsersSharedData);
   const permissions = useAppSelector(getManageCourseUserPermissions);
@@ -114,54 +120,98 @@ const IndividualInviteForm: FC<Props> = (props) => {
     }
   }, [invitationsFields.length === 0]);
 
-  const onSubmit = (data: InvitationsPostData): Promise<void> => {
-    setIsLoading(true);
-    return dispatch(inviteUsersFromForm(data))
+  const handleError = (error: unknown): void => {
+    const rawErrors = (error as { response?: { data?: { errors?: unknown } } })
+      ?.response?.data?.errors;
+    let errorList: string[];
+    if (Array.isArray(rawErrors)) errorList = rawErrors;
+    else if (typeof rawErrors === 'string') errorList = [rawErrors];
+    else errorList = [];
+    const first = errorList[0];
+    const overflow =
+      errorList.length > 1 ? ` (and ${errorList.length - 1} more)` : '';
+    if (first) {
+      toast.error(t(translations.failure, { error: first + overflow }), {
+        autoClose: false,
+      });
+    } else {
+      toast.error(t(translations.failureGeneric), { autoClose: false });
+    }
+  };
+
+  const submitWithResolution = (
+    postData: InvitationsPostData,
+    resolution?: ExternalIdResolution,
+  ): Promise<void> =>
+    dispatch(inviteUsersFromForm(postData, resolution))
       .then((response) => {
-        reset(initialValues);
-        openResultDialog(response);
-      })
-      .catch((error) => {
-        const rawErrors = error.response?.data?.errors;
-        let errorList: string[];
-        if (Array.isArray(rawErrors)) errorList = rawErrors;
-        else if (typeof rawErrors === 'string') errorList = [rawErrors];
-        else errorList = [];
-        const first = errorList[0];
-        const overflow =
-          errorList.length > 1 ? ` (and ${errorList.length - 1} more)` : '';
-        if (first) {
-          toast.error(t(translations.failure, { error: first + overflow }), {
-            autoClose: false,
-          });
+        if ('conflict' in response) {
+          setConflictData(response.conflict);
         } else {
-          toast.error(t(translations.failureGeneric), { autoClose: false });
+          reset(initialValues);
+          openResultDialog(response as InvitationResult);
         }
       })
-      .finally(() => {
-        setIsLoading(false);
-      });
+      .catch(handleError)
+      .finally(() => setIsLoading(false));
+
+  const onSubmit = (data: InvitationsPostData): Promise<void> => {
+    setIsLoading(true);
+    dataRef.current = data;
+    return submitWithResolution(data);
+  };
+
+  const handleKeepExisting = (): void => {
+    setConflictData(null);
+    if (dataRef.current) {
+      setIsLoading(true);
+      submitWithResolution(dataRef.current, 'keep_existing');
+    }
+  };
+
+  const handleReplaceAll = (): void => {
+    setConflictData(null);
+    if (dataRef.current) {
+      setIsLoading(true);
+      submitWithResolution(dataRef.current, 'replace_all');
+    }
+  };
+
+  const handleCancel = (): void => {
+    setConflictData(null);
+    dataRef.current = null;
   };
 
   return (
-    <form
-      encType="multipart/form-data"
-      id="invite-users-individual-form"
-      noValidate
-      onSubmit={handleSubmit((data) => onSubmit(data))}
-    >
-      <ErrorText errors={errors} />
-      <IndividualInvitations
-        fieldsConfig={{
-          control,
-          fields: controlledInvitationsFields,
-          append: invitationsAppend,
-          remove: invitationsRemove,
-        }}
-        isLoading={isLoading}
-        permissions={permissions}
-      />
-    </form>
+    <>
+      {conflictData && (
+        <ExternalIdConflictPrompt
+          onCancel={handleCancel}
+          onKeepExisting={handleKeepExisting}
+          onReplaceAll={handleReplaceAll}
+          pendingCourseUserUpdates={conflictData.pendingCourseUserUpdates}
+          pendingInvitationUpdates={conflictData.pendingInvitationUpdates}
+        />
+      )}
+      <form
+        encType="multipart/form-data"
+        id="invite-users-individual-form"
+        noValidate
+        onSubmit={handleSubmit((data) => onSubmit(data))}
+      >
+        <ErrorText errors={errors} />
+        <IndividualInvitations
+          fieldsConfig={{
+            control,
+            fields: controlledInvitationsFields,
+            append: invitationsAppend,
+            remove: invitationsRemove,
+          }}
+          isLoading={isLoading}
+          permissions={permissions}
+        />
+      </form>
+    </>
   );
 };
 
diff --git a/client/app/bundles/course/user-invitations/components/forms/InviteUsersFileUploadForm.tsx b/client/app/bundles/course/user-invitations/components/forms/InviteUsersFileUploadForm.tsx
index 3f1dd85c539..1f36ff16cea 100644
--- a/client/app/bundles/course/user-invitations/components/forms/InviteUsersFileUploadForm.tsx
+++ b/client/app/bundles/course/user-invitations/components/forms/InviteUsersFileUploadForm.tsx
@@ -12,7 +12,7 @@ import useTranslation from 'lib/hooks/useTranslation';
 interface Props {
   open: boolean;
   onSubmit: (
-    data: InvitationFileEntity,
+    data: { file: InvitationFileEntity },
     setError: UseFormSetError<IFormInputs>,
   ) => Promise<void>;
   onClose: () => void;
diff --git a/client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx b/client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx
new file mode 100644
index 00000000000..6e9f377a3ef
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx
@@ -0,0 +1,122 @@
+import { FC } from 'react';
+import { defineMessages } from 'react-intl';
+import {
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  Typography,
+} from '@mui/material';
+import { InvitationUpdatedItem } from 'types/course/userInvitations';
+
+import useTranslation from 'lib/hooks/useTranslation';
+
+import ExternalIdConflictTable from '../tables/ExternalIdConflictTable';
+
+interface Props {
+  pendingInvitationUpdates: InvitationUpdatedItem[];
+  pendingCourseUserUpdates: InvitationUpdatedItem[];
+  onKeepExisting: () => void;
+  onReplaceAll: () => void;
+  onCancel: () => void;
+}
+
+const translations = defineMessages({
+  title: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.title',
+    defaultMessage: 'Confirm External ID Updates',
+  },
+  body: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.body',
+    defaultMessage:
+      'These users are already enrolled or have pending invitations. No new invitation emails will be sent to them. Would you like to keep their current External IDs, or replace them with the values from your file?',
+  },
+  pendingInvitationUpdates: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.pendingInvitationUpdates',
+    defaultMessage: 'Pending Invitation Updates ({count})',
+  },
+  pendingCourseUserUpdates: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.pendingCourseUserUpdates',
+    defaultMessage: 'Pending Course Member Updates ({count})',
+  },
+  goBack: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.goBack',
+    defaultMessage: 'Go Back',
+  },
+  keepExisting: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.keepExisting',
+    defaultMessage: 'Keep Existing',
+  },
+  replace: {
+    id: 'course.userInvitations.ExternalIdConflictPrompt.replace',
+    defaultMessage: 'Replace',
+  },
+});
+
+const ExternalIdConflictPrompt: FC<Props> = ({
+  pendingInvitationUpdates,
+  pendingCourseUserUpdates,
+  onKeepExisting,
+  onReplaceAll,
+  onCancel,
+}) => {
+  const { t } = useTranslation();
+
+  return (
+    <Dialog
+      disableEscapeKeyDown
+      maxWidth="md"
+      onClose={(_event, reason) => {
+        if (reason !== 'backdropClick') onCancel();
+      }}
+      open
+    >
+      <DialogTitle>{t(translations.title)}</DialogTitle>
+      <DialogContent>
+        <DialogContentText>{t(translations.body)}</DialogContentText>
+
+        {pendingInvitationUpdates.length > 0 && (
+          <>
+            <Typography sx={{ mt: 2, mb: 1 }} variant="subtitle2">
+              {t(translations.pendingInvitationUpdates, {
+                count: pendingInvitationUpdates.length,
+              })}
+            </Typography>
+            <Box sx={{ maxHeight: 320, overflow: 'auto' }}>
+              <ExternalIdConflictTable rows={pendingInvitationUpdates} />
+            </Box>
+          </>
+        )}
+
+        {pendingCourseUserUpdates.length > 0 && (
+          <>
+            <Typography sx={{ mt: 2, mb: 1 }} variant="subtitle2">
+              {t(translations.pendingCourseUserUpdates, {
+                count: pendingCourseUserUpdates.length,
+              })}
+            </Typography>
+            <Box sx={{ maxHeight: 320, overflow: 'auto' }}>
+              <ExternalIdConflictTable rows={pendingCourseUserUpdates} />
+            </Box>
+          </>
+        )}
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={onCancel} variant="outlined">
+          {t(translations.goBack)}
+        </Button>
+        <Button onClick={onKeepExisting} variant="contained">
+          {t(translations.keepExisting)}
+        </Button>
+        <Button onClick={onReplaceAll} variant="contained">
+          {t(translations.replace)}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default ExternalIdConflictPrompt;
diff --git a/client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx b/client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx
new file mode 100644
index 00000000000..ff5a8277394
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx
@@ -0,0 +1,144 @@
+import userEvent from '@testing-library/user-event';
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+import { InvitationUpdatedItem } from 'types/course/userInvitations';
+
+import ExternalIdConflictPrompt from '../ExternalIdConflictPrompt';
+
+const invitationUpdate: InvitationUpdatedItem = {
+  id: 1,
+  name: 'Alice Tan',
+  email: 'alice@example.com',
+  externalId: 'NEW001',
+  previousExternalId: 'OLD001',
+  role: 'student',
+  phantom: false,
+};
+
+const courseUserUpdate: InvitationUpdatedItem = {
+  id: 2,
+  name: 'Bob Lim',
+  email: 'bob@example.com',
+  externalId: 'B042',
+  previousExternalId: null,
+  role: 'student',
+  phantom: false,
+};
+
+const noop = (): void => {};
+
+describe('ExternalIdConflictPrompt', () => {
+  it('renders the title', async () => {
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={noop}
+        onKeepExisting={noop}
+        onReplaceAll={noop}
+        pendingCourseUserUpdates={[]}
+        pendingInvitationUpdates={[invitationUpdate]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Confirm External ID Updates')).toBeInTheDocument();
+  });
+
+  it('renders the invitation updates section when non-empty', async () => {
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={noop}
+        onKeepExisting={noop}
+        onReplaceAll={noop}
+        pendingCourseUserUpdates={[]}
+        pendingInvitationUpdates={[invitationUpdate]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText(/Pending Invitation Updates/)).toBeInTheDocument();
+    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
+  });
+
+  it('does not render invitation section when empty', async () => {
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={noop}
+        onKeepExisting={noop}
+        onReplaceAll={noop}
+        pendingCourseUserUpdates={[courseUserUpdate]}
+        pendingInvitationUpdates={[]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(
+      screen.queryByText(/Pending Invitation Updates/),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.getByText(/Pending Course Member Updates/),
+    ).toBeInTheDocument();
+  });
+
+  it('renders both sections when both non-empty', async () => {
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={noop}
+        onKeepExisting={noop}
+        onReplaceAll={noop}
+        pendingCourseUserUpdates={[courseUserUpdate]}
+        pendingInvitationUpdates={[invitationUpdate]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText(/Pending Invitation Updates/)).toBeInTheDocument();
+    expect(
+      screen.getByText(/Pending Course Member Updates/),
+    ).toBeInTheDocument();
+  });
+
+  it('calls onCancel when Go Back is clicked', async () => {
+    const onCancel = jest.fn();
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={onCancel}
+        onKeepExisting={noop}
+        onReplaceAll={noop}
+        pendingCourseUserUpdates={[]}
+        pendingInvitationUpdates={[invitationUpdate]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go Back' }));
+    expect(onCancel).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls onKeepExisting when Keep Existing is clicked', async () => {
+    const onKeepExisting = jest.fn();
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={noop}
+        onKeepExisting={onKeepExisting}
+        onReplaceAll={noop}
+        pendingCourseUserUpdates={[]}
+        pendingInvitationUpdates={[invitationUpdate]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    await userEvent.click(
+      screen.getByRole('button', { name: 'Keep Existing' }),
+    );
+    expect(onKeepExisting).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls onReplaceAll when Replace is clicked', async () => {
+    const onReplaceAll = jest.fn();
+    render(
+      <ExternalIdConflictPrompt
+        onCancel={noop}
+        onKeepExisting={noop}
+        onReplaceAll={onReplaceAll}
+        pendingCourseUserUpdates={[]}
+        pendingInvitationUpdates={[invitationUpdate]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    await userEvent.click(screen.getByRole('button', { name: 'Replace' }));
+    expect(onReplaceAll).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx b/client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx
new file mode 100644
index 00000000000..972b33fd68a
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx
@@ -0,0 +1,68 @@
+import { FC } from 'react';
+import { defineMessages } from 'react-intl';
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableRow,
+  Typography,
+} from '@mui/material';
+import { InvitationUpdatedItem } from 'types/course/userInvitations';
+
+import useTranslation from 'lib/hooks/useTranslation';
+import tableTranslations from 'lib/translations/table';
+
+interface Props {
+  rows: InvitationUpdatedItem[];
+}
+
+const translations = defineMessages({
+  currentExternalId: {
+    id: 'lib.translations.table.column.currentExternalId',
+    defaultMessage: 'Current External ID',
+  },
+  newExternalId: {
+    id: 'lib.translations.table.column.newExternalId',
+    defaultMessage: 'New External ID',
+  },
+});
+
+const ExternalIdConflictTable: FC<Props> = ({ rows }) => {
+  const { t } = useTranslation();
+
+  return (
+    <Table size="small">
+      <TableHead>
+        <TableRow>
+          <TableCell>{t(tableTranslations.name)}</TableCell>
+          <TableCell>{t(tableTranslations.email)}</TableCell>
+          <TableCell>{t(translations.currentExternalId)}</TableCell>
+          <TableCell>{t(translations.newExternalId)}</TableCell>
+        </TableRow>
+      </TableHead>
+      <TableBody>
+        {rows.map((row) => (
+          <TableRow key={row.id}>
+            <TableCell>{row.name}</TableCell>
+            <TableCell>{row.email}</TableCell>
+            <TableCell>
+              {row.previousExternalId ?? (
+                <Typography color="text.secondary" variant="body2">
+                  —
+                </Typography>
+              )}
+            </TableCell>
+            <TableCell>
+              <Typography fontWeight="bold" variant="body2">
+                {row.externalId}
+              </Typography>
+            </TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+    </Table>
+  );
+};
+
+export default ExternalIdConflictTable;
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx
new file mode 100644
index 00000000000..48fcb1870e0
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx
@@ -0,0 +1,59 @@
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+import { InvitationUpdatedItem } from 'types/course/userInvitations';
+
+import ExternalIdConflictTable from '../ExternalIdConflictTable';
+
+const baseItem: InvitationUpdatedItem = {
+  id: 1,
+  name: 'Alice Tan',
+  email: 'alice@example.com',
+  externalId: 'NEW001',
+  previousExternalId: 'OLD001',
+  role: 'student',
+  phantom: false,
+};
+
+describe('ExternalIdConflictTable', () => {
+  it('renders Name, Email, Current External ID, New External ID columns', async () => {
+    render(<ExternalIdConflictTable rows={[baseItem]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Name')).toBeInTheDocument();
+    expect(screen.getByText('Email')).toBeInTheDocument();
+    expect(screen.getByText('Current External ID')).toBeInTheDocument();
+    expect(screen.getByText('New External ID')).toBeInTheDocument();
+  });
+
+  it('renders row data', async () => {
+    render(<ExternalIdConflictTable rows={[baseItem]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
+    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
+    expect(screen.getByText('OLD001')).toBeInTheDocument();
+    expect(screen.getByText('NEW001')).toBeInTheDocument();
+  });
+
+  it('renders — when previousExternalId is null', async () => {
+    render(
+      <ExternalIdConflictTable
+        rows={[{ ...baseItem, previousExternalId: null }]}
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('—')).toBeInTheDocument();
+  });
+
+  it('renders multiple rows', async () => {
+    const second: InvitationUpdatedItem = {
+      ...baseItem,
+      id: 2,
+      name: 'Bob Lim',
+      email: 'bob@example.com',
+      externalId: 'B042',
+      previousExternalId: null,
+    };
+    render(<ExternalIdConflictTable rows={[baseItem, second]} />);
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
+    expect(screen.getByText('Bob Lim')).toBeInTheDocument();
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/operations.ts b/client/app/bundles/course/user-invitations/operations.ts
index d9a0c409114..e4668a7602e 100644
--- a/client/app/bundles/course/user-invitations/operations.ts
+++ b/client/app/bundles/course/user-invitations/operations.ts
@@ -1,9 +1,11 @@
 import { Operation } from 'store';
 import {
+  ExternalIdResolution,
   InvitationFileEntity,
   InvitationPostData,
   InvitationResult,
   InvitationsPostData,
+  PendingExternalIdConflict,
 } from 'types/course/userInvitations';
 
 import CourseAPI from 'api/course';
@@ -75,25 +77,47 @@ export function fetchPermissionsAndSharedData(): Operation {
 
 export function inviteUsersFromFile(
   fileEntity: InvitationFileEntity,
-): Operation<InvitationResult> {
+  resolution?: ExternalIdResolution,
+): Operation<InvitationResult | { conflict: PendingExternalIdConflict }> {
   return async (dispatch) =>
-    CourseAPI.userInvitations.invite(fileEntity).then((response) => {
-      const data = response.data;
-      dispatch(actions.updateInvitationCounts(data.newInvitations));
-      return JSON.parse(data.invitationResult);
-    });
+    CourseAPI.userInvitations
+      .invite(fileEntity, resolution)
+      .then((response) => {
+        const data = response.data;
+        if ('pendingInvitationUpdates' in data) {
+          return {
+            conflict: {
+              pendingInvitationUpdates: data.pendingInvitationUpdates,
+              pendingCourseUserUpdates: data.pendingCourseUserUpdates,
+            },
+          };
+        }
+        dispatch(actions.updateInvitationCounts(data.newInvitations));
+        return JSON.parse(data.invitationResult) as InvitationResult;
+      });
 }
 
 export function inviteUsersFromForm(
   postData: InvitationsPostData,
-): Operation<InvitationResult> {
+  resolution?: ExternalIdResolution,
+): Operation<InvitationResult | { conflict: PendingExternalIdConflict }> {
   const formattedData = formatInvitations(postData.invitations);
   return async (dispatch) =>
-    CourseAPI.userInvitations.invite(formattedData).then((response) => {
-      const data = response.data;
-      dispatch(actions.updateInvitationCounts(data.newInvitations));
-      return JSON.parse(data.invitationResult);
-    });
+    CourseAPI.userInvitations
+      .invite(formattedData, resolution)
+      .then((response) => {
+        const data = response.data;
+        if ('pendingInvitationUpdates' in data) {
+          return {
+            conflict: {
+              pendingInvitationUpdates: data.pendingInvitationUpdates,
+              pendingCourseUserUpdates: data.pendingCourseUserUpdates,
+            },
+          };
+        }
+        dispatch(actions.updateInvitationCounts(data.newInvitations));
+        return JSON.parse(data.invitationResult) as InvitationResult;
+      });
 }
 
 export function resendAllInvitations(): Operation {
diff --git a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx
new file mode 100644
index 00000000000..d9b9daeb577
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx
@@ -0,0 +1,93 @@
+import { render, screen, waitFor } from 'test-utils';
+import { InvitationFileEntity } from 'types/course/userInvitations';
+
+import InviteUsersFileUpload from '../index';
+
+// Capture the onSubmit prop so we can call it directly with IFormInputs-shaped data,
+// reproducing exactly what FormDialog passes at runtime.
+let capturedOnSubmit:
+  | ((data: { file: InvitationFileEntity }) => Promise<void>)
+  | null = null;
+
+const MockFileUploadForm = ({
+  open,
+  onSubmit,
+}: {
+  open: boolean;
+  onSubmit: (data: { file: InvitationFileEntity }) => Promise<void>;
+}): JSX.Element | null => {
+  capturedOnSubmit = onSubmit;
+  return open ? <button data-testid="mock-file-submit" type="button" /> : null;
+};
+MockFileUploadForm.displayName = 'MockFileUploadForm';
+
+jest.mock(
+  '../../../components/forms/InviteUsersFileUploadForm',
+  () => MockFileUploadForm,
+);
+
+const mockInviteUsersFromFile = jest.fn(
+  (): ((_dispatch: unknown) => Promise<object>) =>
+    (_dispatch: unknown): Promise<object> =>
+      Promise.resolve({
+        newInvitations: [],
+        existingInvitations: [],
+        newCourseUsers: [],
+        existingCourseUsers: [],
+        failedUsers: [],
+        updatedInvitations: [],
+        updatedCourseUsers: [],
+      }),
+);
+
+jest.mock('../../../operations', () => ({
+  inviteUsersFromFile: (...args: unknown[]): unknown =>
+    mockInviteUsersFromFile(...args),
+  fetchInvitations: jest.fn(
+    (): (() => Promise<void>) => (): Promise<void> => Promise.resolve(),
+  ),
+  fetchPermissionsAndSharedData: jest.fn(
+    (): (() => Promise<void>) => (): Promise<void> => Promise.resolve(),
+  ),
+}));
+
+const TEST_FILE_ENTITY: InvitationFileEntity = {
+  name: 'invites.csv',
+  url: 'blob:http://localhost/test-123',
+  file: new Blob(['Name,Email\nAlice,alice@test.com'], { type: 'text/csv' }),
+};
+
+describe('<InviteUsersFileUpload />', () => {
+  beforeEach(() => {
+    capturedOnSubmit = null;
+    mockInviteUsersFromFile.mockClear();
+  });
+
+  it('passes InvitationFileEntity (not the IFormInputs wrapper) to inviteUsersFromFile', async () => {
+    render(
+      <InviteUsersFileUpload
+        onClose={jest.fn()}
+        open
+        openResultDialog={jest.fn()}
+      />,
+    );
+
+    await waitFor(() =>
+      expect(screen.getByTestId('mock-file-submit')).toBeInTheDocument(),
+    );
+    expect(capturedOnSubmit).not.toBeNull();
+
+    // Simulate what FormDialog passes: the full IFormInputs wrapper { file: InvitationFileEntity }
+    await capturedOnSubmit!({ file: TEST_FILE_ENTITY });
+
+    expect(mockInviteUsersFromFile).toHaveBeenCalledTimes(1);
+    const firstArg = mockInviteUsersFromFile.mock
+      .calls[0][0] as InvitationFileEntity;
+
+    // Regression guard: the page must extract .file from the IFormInputs wrapper.
+    // If the bug regresses, firstArg would be { file: InvitationFileEntity } and
+    // firstArg.name would be undefined.
+    expect(firstArg.name).toBe('invites.csv');
+    expect(firstArg.file).toBeInstanceOf(Blob);
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
index 563bca9d858..5b3bdbff333 100644
--- a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
+++ b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
@@ -1,8 +1,12 @@
-import { FC, ReactNode } from 'react';
+import { FC, ReactNode, useRef, useState } from 'react';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import DownloadIcon from '@mui/icons-material/Download';
 import { Typography } from '@mui/material';
-import { InvitationResult } from 'types/course/userInvitations';
+import {
+  InvitationFileEntity,
+  InvitationResult,
+  PendingExternalIdConflict,
+} from 'types/course/userInvitations';
 
 import { getCourseUserInviteTemplatePath } from 'course/helper';
 import Link from 'lib/components/core/Link';
@@ -11,6 +15,7 @@ import toast from 'lib/hooks/toast';
 import useTranslation from 'lib/hooks/useTranslation';
 
 import FileUploadForm from '../../components/forms/InviteUsersFileUploadForm';
+import ExternalIdConflictPrompt from '../../components/misc/ExternalIdConflictPrompt';
 import { inviteUsersFromFile } from '../../operations';
 import {
   getManageCourseUserPermissions,
@@ -101,38 +106,71 @@ const InviteUsersFileUpload: FC<Props> = (props) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
 
+  const fileRef = useRef<InvitationFileEntity | null>(null);
+  const [conflictData, setConflictData] =
+    useState<PendingExternalIdConflict | null>(null);
+
   const sharedData = useAppSelector(getManageCourseUsersSharedData);
   const permissions = useAppSelector(getManageCourseUserPermissions);
 
   const defaultTimelineAlgorithm = sharedData.defaultTimelineAlgorithm;
 
-  if (!open) {
+  if (!open && !conflictData) {
     return null;
   }
 
-  const onSubmit = (data): Promise<void> => {
-    return dispatch(inviteUsersFromFile(data.file))
+  const handleError = (error: unknown): void => {
+    const rawErrors = (error as { response?: { data?: { errors?: unknown } } })
+      ?.response?.data?.errors;
+    let errorList: string[];
+    if (Array.isArray(rawErrors)) errorList = rawErrors;
+    else if (typeof rawErrors === 'string') errorList = [rawErrors];
+    else errorList = [];
+    const first = errorList[0];
+    const overflow =
+      errorList.length > 1 ? ` (and ${errorList.length - 1} more)` : '';
+    if (first) {
+      toast.error(t(translations.failure, { error: first + overflow }), {
+        autoClose: false,
+      });
+    } else {
+      toast.error(t(translations.failureGeneric), { autoClose: false });
+    }
+  };
+
+  const submitWithResolution = (
+    fileEntity: InvitationFileEntity,
+    resolution?: 'keep_existing' | 'replace_all',
+  ): Promise<void> =>
+    dispatch(inviteUsersFromFile(fileEntity, resolution))
       .then((response) => {
-        onClose();
-        openResultDialog(response);
-      })
-      .catch((error) => {
-        const rawErrors = error.response?.data?.errors;
-        let errorList: string[];
-        if (Array.isArray(rawErrors)) errorList = rawErrors;
-        else if (typeof rawErrors === 'string') errorList = [rawErrors];
-        else errorList = [];
-        const first = errorList[0];
-        const overflow =
-          errorList.length > 1 ? ` (and ${errorList.length - 1} more)` : '';
-        if (first) {
-          toast.error(t(translations.failure, { error: first + overflow }), {
-            autoClose: false,
-          });
+        if ('conflict' in response) {
+          setConflictData(response.conflict);
         } else {
-          toast.error(t(translations.failureGeneric), { autoClose: false });
+          onClose();
+          openResultDialog(response as InvitationResult);
         }
-      });
+      })
+      .catch(handleError);
+
+  const onSubmit = (data: { file: InvitationFileEntity }): Promise<void> => {
+    fileRef.current = data.file;
+    return submitWithResolution(data.file);
+  };
+
+  const handleKeepExisting = (): void => {
+    setConflictData(null);
+    if (fileRef.current) submitWithResolution(fileRef.current, 'keep_existing');
+  };
+
+  const handleReplaceAll = (): void => {
+    setConflictData(null);
+    if (fileRef.current) submitWithResolution(fileRef.current, 'replace_all');
+  };
+
+  const handleCancel = (): void => {
+    setConflictData(null);
+    fileRef.current = null;
   };
 
   const formSubtitle = (
@@ -203,12 +241,23 @@ const InviteUsersFileUpload: FC<Props> = (props) => {
   );
 
   return (
-    <FileUploadForm
-      formSubtitle={formSubtitle}
-      onClose={onClose}
-      onSubmit={onSubmit}
-      open={open}
-    />
+    <>
+      {conflictData && (
+        <ExternalIdConflictPrompt
+          onCancel={handleCancel}
+          onKeepExisting={handleKeepExisting}
+          onReplaceAll={handleReplaceAll}
+          pendingCourseUserUpdates={conflictData.pendingCourseUserUpdates}
+          pendingInvitationUpdates={conflictData.pendingInvitationUpdates}
+        />
+      )}
+      <FileUploadForm
+        formSubtitle={formSubtitle}
+        onClose={onClose}
+        onSubmit={onSubmit}
+        open={open}
+      />
+    </>
   );
 };
 
diff --git a/client/app/types/course/userInvitations.ts b/client/app/types/course/userInvitations.ts
index 956d0488fa7..691cf0b5b5d 100644
--- a/client/app/types/course/userInvitations.ts
+++ b/client/app/types/course/userInvitations.ts
@@ -32,6 +32,13 @@ export interface InvitationResult {
   updatedInvitations?: InvitationUpdatedItem[];
 }
 
+export type ExternalIdResolution = 'keep_existing' | 'replace_all';
+
+export interface PendingExternalIdConflict {
+  pendingInvitationUpdates: InvitationUpdatedItem[];
+  pendingCourseUserUpdates: InvitationUpdatedItem[];
+}
+
 export interface InvitationSuccessRow {
   id: string;
   name: string;
diff --git a/client/locales/en.json b/client/locales/en.json
index 8921ac2ea6d..cbcf00b1b6d 100644
--- a/client/locales/en.json
+++ b/client/locales/en.json
@@ -522,8 +522,7 @@
     "defaultMessage": "The AI model used by Codaveri to generate help conversations with students for programming questions."
   },
   "course.admin.CodaveriSettings.codaveriSystemPromptDescription": {
-    "defaultMessage":
-      "You may customize the behavior of the Codaveri model by providing instructions here. {br} When assisting students, these instructions will be followed in addition to any you have set on the question itself.{br}To reference question-specific details, you may use the following variables within the prompt, writing them with brackets as shown below:"
+    "defaultMessage": "You may customize the behavior of the Codaveri model by providing instructions here. {br} When assisting students, these instructions will be followed in addition to any you have set on the question itself.{br}To reference question-specific details, you may use the following variables within the prompt, writing them with brackets as shown below:"
   },
   "course.admin.CodaveriSettings.codaveriSystemPromptProblemDescriptionLine": {
     "defaultMessage": "{problemDescriptionVar} : The full description of the coding problem."
@@ -5988,7 +5987,7 @@
   "course.plagiarism.PlagiarismIndex.assessments.noPlagiarismCheckableQuestions": {
     "defaultMessage": "No checkable questions"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": { 
+  "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": {
     "defaultMessage": "Not enough submissions"
   },
   "course.plagiarism.PlagiarismIndex.assessments.runAssessmentsPlagiarism": {
@@ -9137,5 +9136,32 @@
   },
   "users.troubleSigningIn": {
     "defaultMessage": "Trouble signing in?"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.title": {
+    "defaultMessage": "Confirm External ID Updates"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.body": {
+    "defaultMessage": "These users are already enrolled or have pending invitations. No new invitation emails will be sent to them. Would you like to keep their current External IDs, or replace them with the values from your file?"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.pendingInvitationUpdates": {
+    "defaultMessage": "Pending Invitation Updates ({count})"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.pendingCourseUserUpdates": {
+    "defaultMessage": "Pending Course Member Updates ({count})"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.goBack": {
+    "defaultMessage": "Go Back"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.keepExisting": {
+    "defaultMessage": "Keep Existing"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.replace": {
+    "defaultMessage": "Replace"
+  },
+  "lib.translations.table.column.currentExternalId": {
+    "defaultMessage": "Current External ID"
+  },
+  "lib.translations.table.column.newExternalId": {
+    "defaultMessage": "New External ID"
   }
 }
diff --git a/client/locales/ko.json b/client/locales/ko.json
index b80694eff9b..89267f637b6 100644
--- a/client/locales/ko.json
+++ b/client/locales/ko.json
@@ -5969,7 +5969,7 @@
   "course.plagiarism.PlagiarismIndex.assessments.noPlagiarismCheckableQuestions": {
     "defaultMessage": "검사 가능한 질문이 없습니다"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": { 
+  "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": {
     "defaultMessage": "제출이 충분하지 않습니다"
   },
   "course.plagiarism.PlagiarismIndex.assessments.runAssessmentsPlagiarism": {
@@ -9127,5 +9127,32 @@
   },
   "users.troubleSigningIn": {
     "defaultMessage": "로그인에 문제가 있으신가요?"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.title": {
+    "defaultMessage": "외부 ID 업데이트 확인"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.body": {
+    "defaultMessage": "이 사용자들은 이미 등록되었거나 초대가 대기 중입니다. 새로운 초대 이메일은 발송되지 않습니다. 현재 외부 ID를 유지하거나 파일의 값으로 교체하시겠습니까?"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.pendingInvitationUpdates": {
+    "defaultMessage": "대기 중인 초대 업데이트 ({count}개)"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.pendingCourseUserUpdates": {
+    "defaultMessage": "대기 중인 수강생 업데이트 ({count}개)"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.goBack": {
+    "defaultMessage": "돌아가기"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.keepExisting": {
+    "defaultMessage": "현재 유지"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.replace": {
+    "defaultMessage": "교체"
+  },
+  "lib.translations.table.column.currentExternalId": {
+    "defaultMessage": "현재 외부 ID"
+  },
+  "lib.translations.table.column.newExternalId": {
+    "defaultMessage": "새 외부 ID"
   }
 }
diff --git a/client/locales/zh.json b/client/locales/zh.json
index 9d7e72e6a7e..2b481bb6bde 100644
--- a/client/locales/zh.json
+++ b/client/locales/zh.json
@@ -5963,7 +5963,7 @@
   "course.plagiarism.PlagiarismIndex.assessments.noPlagiarismCheckableQuestions": {
     "defaultMessage": "没有可检查的问题"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": { 
+  "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": {
     "defaultMessage": "提交数量不足"
   },
   "course.plagiarism.PlagiarismIndex.assessments.runAssessmentsPlagiarism": {
@@ -9121,5 +9121,32 @@
   },
   "users.troubleSigningIn": {
     "defaultMessage": "登录遇到问题？"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.title": {
+    "defaultMessage": "确认外部编号更新"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.body": {
+    "defaultMessage": "这些用户已经注册或有待处理的邀请。不会向他们发送新的邀请邮件。您希望保留其当前的外部编号，还是用文件中的值替换它们？"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.pendingInvitationUpdates": {
+    "defaultMessage": "待处理邀请更新（{count}）"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.pendingCourseUserUpdates": {
+    "defaultMessage": "待处理课程成员更新（{count}）"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.goBack": {
+    "defaultMessage": "返回"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.keepExisting": {
+    "defaultMessage": "保留现有"
+  },
+  "course.userInvitations.ExternalIdConflictPrompt.replace": {
+    "defaultMessage": "替换"
+  },
+  "lib.translations.table.column.currentExternalId": {
+    "defaultMessage": "当前外部编号"
+  },
+  "lib.translations.table.column.newExternalId": {
+    "defaultMessage": "新外部编号"
   }
 }
diff --git a/config/locales/en/errors.yml b/config/locales/en/errors.yml
index 35b92605ec0..be148c78939 100644
--- a/config/locales/en/errors.yml
+++ b/config/locales/en/errors.yml
@@ -20,7 +20,7 @@ en:
         invalid_email: '%{email} could not be processed: invalid email: %{message}.'
         duplicate_external_id: '%{email} could not be processed: external ID "%{external_id}" is already taken.'
         other_error: '%{email} could not be processed: %{message}.'
-        timeline_template_mismatch: 'more than 5 columns detected. This course does not use Personalized Timelines. Please re-upload using the 5-column template (Name, Email, Role, Phantom, External ID).'
+        invalid_headers: 'Invalid CSV headers. Expected: %{expected}. Please download and use the template file.'
       user_registrations:
         invalid_code: 'You have entered an invalid invitation code.'
         code_taken: >
diff --git a/config/locales/ko/errors.yml b/config/locales/ko/errors.yml
index 9ad4bc2f498..69cc3dacb25 100644
--- a/config/locales/ko/errors.yml
+++ b/config/locales/ko/errors.yml
@@ -20,7 +20,7 @@ ko:
         invalid_email: '%{email}을(를) 처리할 수 없습니다: 유효하지 않은 이메일: %{message}.'
         duplicate_external_id: '%{email}을(를) 처리할 수 없습니다: 외부 ID "%{external_id}"는 이미 사용 중입니다.'
         other_error: '%{email}을(를) 처리할 수 없습니다: %{message}.'
-        timeline_template_mismatch: '5개를 초과하는 열이 감지되었습니다. 이 강좌는 개인화된 일정 기능을 사용하지 않습니다. 5열 템플릿(이름, 이메일, 역할, 팬텀, 외부 ID)을 사용하여 다시 업로드해 주십시오.'
+        invalid_headers: 'CSV 헤더가 올바르지 않습니다. 예상 형식: %{expected}. 템플릿 파일을 다운로드하여 사용해 주세요.'
       user_registrations:
         invalid_code: '잘못된 초대 코드를 입력하셨습니다.'
         code_taken: >
diff --git a/config/locales/zh/errors.yml b/config/locales/zh/errors.yml
index eae926e15b9..cf97dc6a390 100644
--- a/config/locales/zh/errors.yml
+++ b/config/locales/zh/errors.yml
@@ -20,7 +20,7 @@ zh:
         invalid_email: '%{email}无法处理：邮箱无效：%{message}。'
         duplicate_external_id: '%{email}无法处理：外部编号"%{external_id}"已被使用。'
         other_error: '%{email}无法处理：%{message}。'
-        timeline_template_mismatch: '检测到超过 5 列。本课程未使用个性化时间线。请使用 5 列模板重新上传（姓名、电子邮箱、角色、虚拟用户、外部编号）。'
+        invalid_headers: 'CSV 标题无效。预期格式：%{expected}。请下载并使用模板文件。'
       user_registrations:
         invalid_code: '你输入了一个无效的邀请码。'
         code_taken: >
diff --git a/spec/controllers/course/user_invitations_controller_spec.rb b/spec/controllers/course/user_invitations_controller_spec.rb
index d9e95a38de3..eca86cd44be 100644
--- a/spec/controllers/course/user_invitations_controller_spec.rb
+++ b/spec/controllers/course/user_invitations_controller_spec.rb
@@ -68,6 +68,118 @@ def replace_with_erroneous_course
             expect(controller.current_course.errors[:base].length).not_to eq(0)
           end
         end
+
+        context 'when uploading a CSV with external ID updates and no resolution param' do
+          render_views
+
+          let(:existing_user) { create(:user) }
+          let!(:existing_course_user) do
+            create(:course_student, course: course, user: existing_user, external_id: 'OLD001')
+          end
+          let(:csv_content) do
+            "Name,Email,Role,Phantom,Timeline,ExternalId\n" \
+              "#{existing_user.name},#{existing_user.email},student,false,,NEW001"
+          end
+          let(:csv_file) do
+            file = Tempfile.new(['invite', '.csv'])
+            file.write(csv_content)
+            file.rewind
+            Rack::Test::UploadedFile.new(file.path, 'text/csv').tap { file.close }
+          end
+
+          subject do
+            post :create, format: :json, params: { course_id: course, course: { invitations_file: csv_file } }
+          end
+
+          it 'returns 200 with pendingInvitationUpdates or pendingCourseUserUpdates' do
+            subject
+            expect(response).to have_http_status(:ok)
+            json = JSON.parse(response.body)
+            expect(json.keys).to include('pendingCourseUserUpdates')
+            expect(json['pendingCourseUserUpdates']).not_to be_empty
+          end
+
+          it 'does not change external_id in the database' do
+            expect { subject }.not_to(change { existing_course_user.reload.external_id })
+          end
+        end
+
+        context 'when uploading with resolution=keep_existing' do
+          render_views
+
+          let(:existing_user) { create(:user) }
+          let!(:existing_course_user) do
+            create(:course_student, course: course, user: existing_user, external_id: 'OLD001')
+          end
+          let(:csv_content) do
+            "Name,Email,Role,Phantom,Timeline,ExternalId\n" \
+              "#{existing_user.name},#{existing_user.email},student,false,,NEW001"
+          end
+          let(:csv_file) do
+            file = Tempfile.new(['invite', '.csv'])
+            file.write(csv_content)
+            file.rewind
+            Rack::Test::UploadedFile.new(file.path, 'text/csv').tap { file.close }
+          end
+
+          subject do
+            post :create, format: :json, params: {
+              course_id: course,
+              course: { invitations_file: csv_file },
+              external_id_resolution: 'keep_existing'
+            }
+          end
+
+          it 'returns 200 with invitationResult' do
+            subject
+            expect(response).to have_http_status(:ok)
+            json = JSON.parse(response.body)
+            expect(json).to have_key('invitationResult')
+          end
+
+          it 'does not change the external_id' do
+            expect { subject }.not_to(change { existing_course_user.reload.external_id })
+          end
+        end
+
+        context 'when uploading with resolution=replace_all' do
+          render_views
+
+          let(:existing_user) { create(:user) }
+          let!(:existing_course_user) do
+            create(:course_student, course: course, user: existing_user, external_id: 'OLD001')
+          end
+          let(:csv_content) do
+            "Name,Email,Role,Phantom,Timeline,ExternalId\n" \
+              "#{existing_user.name},#{existing_user.email},student,false,,NEW001"
+          end
+          let(:csv_file) do
+            file = Tempfile.new(['invite', '.csv'])
+            file.write(csv_content)
+            file.rewind
+            Rack::Test::UploadedFile.new(file.path, 'text/csv').tap { file.close }
+          end
+
+          subject do
+            post :create, format: :json, params: {
+              course_id: course,
+              course: { invitations_file: csv_file },
+              external_id_resolution: 'replace_all'
+            }
+          end
+
+          it 'returns 200 with invitationResult' do
+            subject
+            expect(response).to have_http_status(:ok)
+            json = JSON.parse(response.body)
+            expect(json).to have_key('invitationResult')
+          end
+
+          it 'updates the external_id to the new value' do
+            subject
+            expect(existing_course_user.reload.external_id).to eq('NEW001')
+          end
+        end
       end
 
       context 'when inviting a user who already has a non-retryable (failed) invitation' do
@@ -149,6 +261,7 @@ def replace_with_erroneous_course
       subject { post :create, params: { course_id: course, course: invite_params } }
 
       context 'when the CSV has invalid emails' do
+        before { course.update!(show_personalized_timeline_features: false) }
         let(:invite_params) do
           { invitations_file: fixture_file_upload('course/invitation_invalid_email.csv') }
         end
@@ -161,6 +274,7 @@ def replace_with_erroneous_course
       end
 
       context 'when the CSV has an external ID already taken by an existing course user' do
+        before { course.update!(show_personalized_timeline_features: false) }
         let!(:existing_user) { create(:course_student, course: course, external_id: 'EXT_DUPE') }
         let(:invite_params) do
           { invitations_file: fixture_file_upload('course/invitation_duplicate_external_id.csv') }
diff --git a/spec/fixtures/course/invitation_duplicate_external_id.csv b/spec/fixtures/course/invitation_duplicate_external_id.csv
index a1ca22f4caa..8518358945c 100644
--- a/spec/fixtures/course/invitation_duplicate_external_id.csv
+++ b/spec/fixtures/course/invitation_duplicate_external_id.csv
@@ -1,2 +1,2 @@
-name,email,role,phantom,timeline_algorithm,external_id
-Alice,alice_ext_dupe1@example.com,student,false,fixed,EXT_DUPE
+name,email,role,phantom,externalid
+Alice,alice_ext_dupe1@example.com,student,false,EXT_DUPE
diff --git a/spec/fixtures/course/invitation_empty.csv b/spec/fixtures/course/invitation_empty.csv
index 435a29647fa..0ad61c523c7 100644
--- a/spec/fixtures/course/invitation_empty.csv
+++ b/spec/fixtures/course/invitation_empty.csv
@@ -1,4 +1,3 @@
-name,email
 Foo,bar@foo.com
 Blank Email,
 ,blank@name.com
diff --git a/spec/fixtures/course/invitation_fuzzy_roles_phantom_timeline.csv b/spec/fixtures/course/invitation_fuzzy_roles_phantom_timeline.csv
index 25e55fa3588..088869fcb90 100644
--- a/spec/fixtures/course/invitation_fuzzy_roles_phantom_timeline.csv
+++ b/spec/fixtures/course/invitation_fuzzy_roles_phantom_timeline.csv
@@ -1,4 +1,4 @@
-name,email,role,phantom,timeline_algorithm
+name,email,role,phantom,timeline,externalid
 Foo,bar@foo.com,,,
 Non-Phantom Staff 1,foo1@bar.com,Teaching Assistant,no,stragGlers
 Non-Phantom Staff 2,foo2@bar.com,manager,no,OTOT
diff --git a/spec/fixtures/course/invitation_invalid_email.csv b/spec/fixtures/course/invitation_invalid_email.csv
index e8838ad89a3..37832e7ed14 100644
--- a/spec/fixtures/course/invitation_invalid_email.csv
+++ b/spec/fixtures/course/invitation_invalid_email.csv
@@ -1,3 +1,3 @@
-name,email,role
+name,email,role,phantom,externalid
 baz,foo.com
 bar,twang.com
diff --git a/spec/fixtures/course/invitation_no_external_id_no_timeline.csv b/spec/fixtures/course/invitation_no_external_id_no_timeline.csv
index d4f4137ff4e..a80f11cec0f 100644
--- a/spec/fixtures/course/invitation_no_external_id_no_timeline.csv
+++ b/spec/fixtures/course/invitation_no_external_id_no_timeline.csv
@@ -1,3 +1,2 @@
-name,email,role,phantom
 Alice,alice@example.com,student,false
 Bob,bob@example.com,teaching_assistant,false
diff --git a/spec/fixtures/course/invitation_whitespace.csv b/spec/fixtures/course/invitation_whitespace.csv
index 7f67af54eb8..974ec32974c 100644
--- a/spec/fixtures/course/invitation_whitespace.csv
+++ b/spec/fixtures/course/invitation_whitespace.csv
@@ -1,4 +1,3 @@
-name,email,role
   Foo  ,bar@foo.com   ,student
   Bar,  baz@bar.com,teaching_assistant
 Baz  ,   foo@baz.com   ,student
diff --git a/spec/fixtures/course/invitation_with_external_id.csv b/spec/fixtures/course/invitation_with_external_id.csv
index acaeff99b2f..bf83f5abcf0 100644
--- a/spec/fixtures/course/invitation_with_external_id.csv
+++ b/spec/fixtures/course/invitation_with_external_id.csv
@@ -1,4 +1,4 @@
-name,email,role,phantom,timeline_algorithm,external_id
+name,email,role,phantom,timeline,externalid
 Alice,alice@example.com,student,false,fixed,EXT001
 Bob,bob@example.com,teaching_assistant,false,fomo,EXT002
 Charlie,charlie@example.com,,,,
diff --git a/spec/fixtures/course/invitation_with_external_id_no_timeline.csv b/spec/fixtures/course/invitation_with_external_id_no_timeline.csv
index 612e7601e6d..e90eb5e489f 100644
--- a/spec/fixtures/course/invitation_with_external_id_no_timeline.csv
+++ b/spec/fixtures/course/invitation_with_external_id_no_timeline.csv
@@ -1,4 +1,4 @@
-name,email,role,phantom,external_id
+name,email,role,phantom,externalid
 Alice,alice@example.com,student,false,EXT001
 Bob,bob@example.com,teaching_assistant,false,EXT002
 Charlie,charlie@example.com,,,
diff --git a/spec/services/course/user_invitation_service_spec.rb b/spec/services/course/user_invitation_service_spec.rb
index 90d868965f6..af51c108e17 100644
--- a/spec/services/course/user_invitation_service_spec.rb
+++ b/spec/services/course/user_invitation_service_spec.rb
@@ -7,7 +7,6 @@
     def temp_csv_from_attributes(records, roles = [], timeline_algorithms = [])
       Tempfile.new(File.basename(__FILE__, '.*')).tap do |file|
         file.write(CSV.generate do |csv|
-          csv << [:name, :email, :role]
           records.zip(roles, timeline_algorithms).each do |user, role, timeline_algorithm|
             csv << (role.blank? ? [user.name, user.email] : [user.name, user.email, role, false, timeline_algorithm])
           end
@@ -256,7 +255,7 @@ def csv_with_external_id_and_timeline(entries)
 
         it 'does not abort the batch' do
           csv = csv_with_external_id_and_timeline(
-            [{ name: 'New User', email: generate(:email), external_id: 'taken-id' }]
+            [name: 'New User', email: generate(:email), external_id: 'taken-id']
           )
           result = subject.invite(csv)
           expect(result).not_to be_nil
@@ -267,12 +266,15 @@ def csv_with_external_id_and_timeline(entries)
         end
       end
 
-      context 'when a 6-column CSV (timeline template) is uploaded to a non-timeline course' do
+      context 'when a timeline-template-header CSV is uploaded to a non-timeline course' do
         before { course.update!(show_personalized_timeline_features: false) }
 
         it 'raises CSV::MalformedCSVError to prevent timeline values being stored as external IDs' do
           csv = Tempfile.new(File.basename(__FILE__, '.*')).tap do |file|
-            file.write(CSV.generate { |c| c << ['Alice', generate(:email), 'student', 'false', 'otot', 'EXT001'] })
+            file.write(CSV.generate do |c|
+              c << ['Name', 'Email', 'Role', 'Phantom', 'Timeline', 'ExternalId']
+              c << ['Alice', generate(:email), 'student', 'false', 'otot', 'EXT001']
+            end)
             file.rewind
           end
           expect { subject.invite(csv) }.to raise_error(CSV::MalformedCSVError)
@@ -297,7 +299,7 @@ def csv_with_external_id_no_timeline(entries)
 
         it 'does not abort the batch' do
           csv = csv_with_external_id_no_timeline(
-            [{ name: 'New User', email: generate(:email), external_id: 'taken-id' }]
+            [name: 'New User', email: generate(:email), external_id: 'taken-id']
           )
           result = subject.invite(csv)
           expect(result).not_to be_nil
@@ -629,8 +631,8 @@ def csv_with_external_id_no_timeline(entries)
 
         subject(:result) do
           invitation_service.invite(
-            '0' => { name: enrollee.name, email: enrollee.email, role: :student,
-                     phantom: false, timeline_algorithm: :fixed, external_id: 'taken-id' }
+            { '0' => { name: enrollee.name, email: enrollee.email, role: :student,
+                       phantom: false, timeline_algorithm: :fixed, external_id: 'taken-id' } }
           )
         end
 
@@ -657,8 +659,8 @@ def csv_with_external_id_no_timeline(entries)
 
         it 'puts the row in failed_users with :external_id_taken and does not create an invitation' do
           result = invitation_service.invite(
-            '0' => { name: 'New Person', email: generate(:email), role: :student,
-                     phantom: false, timeline_algorithm: :fixed, external_id: 'cu-taken-id' }
+            { '0' => { name: 'New Person', email: generate(:email), role: :student,
+                       phantom: false, timeline_algorithm: :fixed, external_id: 'cu-taken-id' } }
           )
           new_invitations, _, _, _, failed_users = result
           expect(failed_users.size).to eq(1)
@@ -674,8 +676,8 @@ def csv_with_external_id_no_timeline(entries)
 
         it 'sends an invitation instead of directly enrolling the user' do
           result = invitation_service.invite(
-            '0' => { name: unconfirmed_user.name, email: unconfirmed_user.email,
-                     role: :student, phantom: false, timeline_algorithm: :fixed, external_id: nil }
+            { '0' => { name: unconfirmed_user.name, email: unconfirmed_user.email,
+                       role: :student, phantom: false, timeline_algorithm: :fixed, external_id: nil } }
           )
           new_invitations, _, new_course_users, = result
           expect(new_invitations.size).to eq(1)
@@ -777,7 +779,7 @@ def csv_with_timeline(entries)
 
       context 'when an invalid email is specified' do
         let(:invalid_user_attributes) do
-          [{ name: build(:user).name, email: 'xxnot an email', role: :student }]
+          [name: build(:user).name, email: 'xxnot an email', role: :student]
         end
 
         it 'fails' do
@@ -805,8 +807,8 @@ def csv_with_timeline(entries)
 
       it 'assigns the CSV timeline_algorithm to the enrolled CourseUser, not the course default' do
         result = subject.invite(
-          '0' => { name: existing_user.name, email: existing_user.email,
-                   role: :student, phantom: false, timeline_algorithm: :otot, external_id: nil }
+          { '0' => { name: existing_user.name, email: existing_user.email,
+                     role: :student, phantom: false, timeline_algorithm: :otot, external_id: nil } }
         )
         _, _, new_course_users, = result
         expect(new_course_users.size).to eq(1)
@@ -1002,6 +1004,42 @@ def csv_with_timeline(entries)
       context 'when personal timelines are enabled' do
         before { course.update!(show_personalized_timeline_features: true) }
 
+        it 'accepts a CSV with exact template headers' do
+          csv_content = "Name,Email,Role,Phantom,Timeline,ExternalId\n" \
+                        "Alice,alice@example.com,student,false,fixed,EXT001\n"
+          Tempfile.create(['header_test', '.csv']) do |f|
+            f.write(csv_content)
+            f.rewind
+            result = stubbed_user_invitation_service.send(:parse_from_file, f)
+            expect(result.length).to eq(1)
+            expect(result[0][:external_id]).to eq('EXT001')
+          end
+        end
+
+        it 'accepts a CSV with exact template headers (case-insensitive)' do
+          csv_content = "name,email,role,phantom,timeline,externalid\n" \
+                        "Alice,alice@example.com,student,false,fixed,EXT001\n"
+          Tempfile.create(['header_test_lower', '.csv']) do |f|
+            f.write(csv_content)
+            f.rewind
+            result = stubbed_user_invitation_service.send(:parse_from_file, f)
+            expect(result.length).to eq(1)
+            expect(result[0][:external_id]).to eq('EXT001')
+          end
+        end
+
+        it 'raises invalid_headers error when header column names are wrong (with timeline)' do
+          csv_content = "name,email,role,phantom,timeline_algorithm,external_id\n" \
+                        "Alice,alice@example.com,student,false,fixed,EXT001\n"
+          Tempfile.create(['bad_header_timeline', '.csv']) do |f|
+            f.write(csv_content)
+            f.rewind
+            expect do
+              stubbed_user_invitation_service.send(:parse_from_file, f)
+            end.to raise_error(CSV::MalformedCSVError)
+          end
+        end
+
         it 'accepts a file with name/header' do
           result = subject.send(:parse_from_file, temp_csv)
           expect(result.length).to eq(users.length)
@@ -1130,19 +1168,12 @@ def csv_with_timeline(entries)
           end
         end
 
-        context 'when the csv header uses a slightly wrong external_id column name' do
-          subject do
-            stubbed_user_invitation_service.
-              send(:parse_from_file, file_fixture('course/invitation_external_id_wrong_header.csv'))
-          end
-
-          it 'still detects and skips the header row' do
-            expect(subject.length).to eq(2)
-          end
-
-          it 'still parses external_id from col 6 correctly' do
-            expect(subject[0][:external_id]).to eq('EXT001')
-            expect(subject[1][:external_id]).to eq('EXT002')
+        context 'when the csv header uses wrong column names' do
+          it 'raises an error for the wrong header' do
+            expect do
+              stubbed_user_invitation_service.
+                send(:parse_from_file, file_fixture('course/invitation_external_id_wrong_header.csv'))
+            end.to raise_error(CSV::MalformedCSVError)
           end
         end
       end
@@ -1150,6 +1181,28 @@ def csv_with_timeline(entries)
       context 'when personal timelines are disabled' do
         before { course.update!(show_personalized_timeline_features: false) }
 
+        it 'accepts a CSV with exact template headers (no timeline)' do
+          csv_content = "Name,Email,Role,Phantom,ExternalId\nAlice,alice@example.com,student,false,EXT001\n"
+          Tempfile.create(['header_no_timeline', '.csv']) do |f|
+            f.write(csv_content)
+            f.rewind
+            result = stubbed_user_invitation_service.send(:parse_from_file, f)
+            expect(result.length).to eq(1)
+            expect(result[0][:external_id]).to eq('EXT001')
+          end
+        end
+
+        it 'raises invalid_headers error when header column names are wrong (no timeline)' do
+          csv_content = "name,email,role,phantom,external_id\nAlice,alice@example.com,student,false,EXT001\n"
+          Tempfile.create(['bad_header_no_timeline', '.csv']) do |f|
+            f.write(csv_content)
+            f.rewind
+            expect do
+              stubbed_user_invitation_service.send(:parse_from_file, f)
+            end.to raise_error(CSV::MalformedCSVError)
+          end
+        end
+
         context 'when the csv has an external_id column' do
           subject do
             stubbed_user_invitation_service.

From 9112971cb54306f38a03627e34816e213142b3fa Mon Sep 17 00:00:00 2001
From: lws49 <e0970244@u.nus.edu>
Date: Thu, 4 Jun 2026 12:20:46 +0800
Subject: [PATCH 3/3] feat(invitations): replace external ID prompt with
 post-hoc apply/undo in results

Default to keeping existing external IDs on invite and report differing rows
as pending diffs. Surface them in the results dialog with an opt-in, reversible
Apply/Undo control backed by an atomic update_external_ids endpoint. Removes the
pre-finalize ExternalIdConflictPrompt gate.
---
 .../course/user_invitations_controller.rb     |   45 +-
 app/models/user.rb                            |    3 +-
 .../parse_invitation_concern.rb               |   54 +-
 .../process_invitation_concern.rb             |   53 +-
 .../course/user_invitation_service.rb         |   85 +-
 .../_invitation_result_data.json.jbuilder     |   28 +-
 .../_pending_external_id_data.json.jbuilder   |   25 -
 client/app/api/course/UserInvitations.ts      |   30 +-
 .../components/forms/IndividualInviteForm.tsx |   99 +-
 .../misc/ExternalIdConflictPrompt.tsx         |  122 -
 .../misc/InvitationResultDialog.tsx           |  238 +-
 .../ExternalIdConflictPrompt.test.tsx         |  144 -
 .../__test__/InvitationResultDialog.test.tsx  |  349 +-
 .../tables/ExternalIdConflictTable.tsx        |   68 -
 .../tables/ExternalIdUpdateTable.tsx          |  147 +
 .../tables/InvitationResultExistingTable.tsx  |   36 +-
 .../__test__/ExternalIdConflictTable.test.tsx |   59 -
 .../__test__/ExternalIdUpdateTable.test.tsx   |   82 +
 .../InvitationResultExistingTable.test.tsx    |   89 -
 .../course/user-invitations/operations.ts     |   54 +-
 .../__test__/index.test.tsx                   |   48 +-
 .../pages/InviteUsersFileUpload/index.tsx     |   72 +-
 client/app/types/course/userInvitations.ts    |   13 +-
 client/locales/en.json                        | 3386 ++++++++++-------
 config/routes.rb                              |    1 +
 .../user_invitations_controller_spec.rb       |   89 +-
 .../course/user_invitation_service_spec.rb    |  204 +-
 27 files changed, 3262 insertions(+), 2361 deletions(-)
 delete mode 100644 app/views/course/user_invitations/_pending_external_id_data.json.jbuilder
 delete mode 100644 client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx
 delete mode 100644 client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx
 delete mode 100644 client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/ExternalIdUpdateTable.tsx
 delete mode 100644 client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx
 create mode 100644 client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdUpdateTable.test.tsx

diff --git a/app/controllers/course/user_invitations_controller.rb b/app/controllers/course/user_invitations_controller.rb
index 4da0dfbe7fd..0092e460342 100644
--- a/app/controllers/course/user_invitations_controller.rb
+++ b/app/controllers/course/user_invitations_controller.rb
@@ -15,20 +15,8 @@ def index
 
   def create
     result = invite
-    case result
-    when Array
+    if result.is_a?(Array)
       create_invitation_success(result)
-    when :pending_conflict
-      respond_to do |format|
-        format.json do
-          render partial: 'pending_external_id_data',
-                 locals: {
-                   pending_invitation_updates: @pending_conflict.pending_invitation_updates,
-                   pending_course_user_updates: @pending_conflict.pending_course_user_updates
-                 },
-                 status: :ok
-        end
-      end
     else
       propagate_errors
       errors = current_course.errors[:base]
@@ -36,6 +24,13 @@ def create
     end
   end
 
+  def update_external_ids
+    invitation_service.update_external_ids(external_id_updates_params)
+    head :ok
+  rescue Course::UserInvitationService::ExternalIdConflict => e
+    render json: { conflictingExternalId: e.external_id }, status: :conflict
+  end
+
   def destroy
     if @invitation.destroy
       destroy_invitation_success
@@ -55,7 +50,8 @@ def resend_invitation
   end
 
   def resend_invitations
-    if invitation_service.resend_invitation(load_invitations)
+    @invitations = load_invitations
+    if invitation_service.resend_invitation(@invitations)
       resend_invitations_success
     else
       resend_invitations_failure
@@ -68,6 +64,12 @@ def toggle_registration
 
   private
 
+  def external_id_updates_params
+    params.permit(updates: [:type, :id, :external_id])[:updates].to_a.map do |u|
+      { type: u[:type], id: u[:id].to_i, external_id: u[:external_id] }
+    end
+  end
+
   def course_user_invitation_params
     @course_user_invitation_params ||= begin
       params[:course] = { invitations_attributes: {} } unless params.key?(:course)
@@ -131,17 +133,12 @@ def invite_by_file?
   # Invites the users via the service object.
   #
   # @return [Array] On success.
-  # @return [Symbol] :pending_conflict when external ID updates require resolution.
   # @return [Boolean] false on failure.
   def invite
-    invitation_service.invite(invitation_params,
-                              external_id_resolution: params[:external_id_resolution])
+    invitation_service.invite(invitation_params)
   rescue CSV::MalformedCSVError => e
     current_course.errors.add(:base, e.message)
     false
-  rescue Course::UserInvitationService::PendingExternalIdUpdates => e
-    @pending_conflict = e
-    :pending_conflict
   end
 
   # Creates a user invitation service object for this object.
@@ -237,15 +234,15 @@ def invalid_invitations
   # Returns the invitation response based on file or entry invitation.
   def parse_invitation_result(new_invitations, existing_invitations, new_course_users,
                               existing_course_users, failed_users,
-                              updated_invitations, updated_course_users)
+                              pending_invitation_updates, pending_course_user_updates)
     render_to_string(partial: 'invitation_result_data',
                      locals: { new_invitations: new_invitations,
                                existing_invitations: existing_invitations,
                                new_course_users: new_course_users,
                                existing_course_users: existing_course_users,
                                failed_users: failed_users,
-                               updated_invitations: updated_invitations,
-                               updated_course_users: updated_course_users })
+                               pending_invitation_updates: pending_invitation_updates,
+                               pending_course_user_updates: pending_course_user_updates })
   end
 
   # Enables or disables registration codes in the given course.
@@ -286,7 +283,7 @@ def resend_invitation_failure
   def resend_invitations_success
     respond_to do |format|
       format.json do
-        render partial: 'course_user_invitation_list', locals: { invitations: @invitations.reload }, status: :ok
+        render partial: 'course_user_invitation_list', locals: { invitations: @invitations }, status: :ok
       end
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 75aae3fc495..58a50cbe5ff 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,6 +7,7 @@ class User < ApplicationRecord
   include UserSearchConcern
   include TimeZoneConcern
   include Generic::CollectionConcern
+
   model_stamper
   acts_as_reader
   mount_uploader :profile_photo, ImageUploader
@@ -93,7 +94,7 @@ def deleted
   #
   # @return [Boolean]
   def built_in?
-    id == User::SYSTEM_USER_ID || id == User::DELETED_USER_ID
+    [User::SYSTEM_USER_ID, User::DELETED_USER_ID].include?(id)
   end
 
   # Pick the default email and set it as primary email. This method would immediately set the
diff --git a/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb b/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
index b658b9d081f..1d76601e533 100644
--- a/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
+++ b/app/services/concerns/course/user_invitation_service/parse_invitation_concern.rb
@@ -37,35 +37,48 @@ def parse_invitations(users)
         parse_from_form(users)
       end
 
-    partition_unique_users(restrict_invitee_role(result))
+    restrict_invitee_role(result)
   end
 
-  # Partition users into unique (including first duplicate instance) and duplicate users.
+  # Partition users into unique and duplicate users.
+  #
+  # Email dedup applies to all rows. External-ID dedup applies only to rows
+  # whose email is NOT in +existing_account_emails+ — users with existing platform
+  # accounts are handled by the DB-aware process phase, so pre-deduping their
+  # external IDs here would incorrectly fail rows that the process phase would
+  # accept (e.g. an enrolled user re-uploaded with their current external ID).
   #
   # @param [Array<Hash>] users
-  # @return [
-  #   [Array<Hash>],
-  #   [Array<Hash>]
-  # ]
-  def partition_unique_users(users)
+  # @param [Set<String>] existing_account_emails Downcased emails of users who
+  #   already have a platform account. These rows skip external-ID dedup.
+  # @return [[Array<Hash>, Array<Hash>]]
+  def partition_unique_users(users, existing_account_emails = Set.new)
     users.each { |user| user[:email] = user[:email].downcase }
     seen_emails = Set.new
     seen_external_ids = Set.new
-    unique_users = []
-    failed_users = []
-    users.each do |user|
-      ext_id = user[:external_id].presence
-      if seen_emails.include?(user[:email])
-        failed_users.push(user.merge(reason: :duplicate_email_in_file))
-      elsif ext_id && seen_external_ids.include?(ext_id)
-        failed_users.push(user.merge(reason: :duplicate_external_id_in_file))
+    users.each_with_object([[], []]) do |user, (unique, failed)|
+      reason = duplicate_reason(user, seen_emails, seen_external_ids, existing_account_emails)
+      if reason
+        failed << user.merge(reason: reason)
       else
-        seen_emails.add(user[:email])
-        seen_external_ids.add(ext_id) if ext_id
-        unique_users << user
+        track_seen!(user, seen_emails, seen_external_ids, existing_account_emails)
+        unique << user
       end
     end
-    [unique_users, failed_users]
+  end
+
+  def duplicate_reason(user, seen_emails, seen_external_ids, existing_account_emails)
+    return :duplicate_email_in_file if seen_emails.include?(user[:email])
+
+    ext_id = user[:external_id].presence
+    return :duplicate_external_id_in_file \
+      if ext_id && !existing_account_emails.include?(user[:email]) && seen_external_ids.include?(ext_id)
+  end
+
+  def track_seen!(user, seen_emails, seen_external_ids, existing_account_emails)
+    seen_emails.add(user[:email])
+    ext_id = user[:external_id].presence
+    seen_external_ids.add(ext_id) if ext_id && !existing_account_emails.include?(user[:email])
   end
 
   # Change all invitees' roles to :student if inviter is a teaching_assistant.
@@ -149,7 +162,8 @@ def expected_headers
   def valid_header_row?(row)
     return false unless looks_like_header?(row)
 
-    row.map { |h| h&.downcase }.compact == expected_headers
+    provided = row.map { |h| h&.downcase }.compact
+    expected_headers.first(provided.length) == provided
   end
 
   # Strips a row of whitespaces.
diff --git a/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb b/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
index 11e883c2fab..3e9c34fe9df 100644
--- a/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
+++ b/app/services/concerns/course/user_invitation_service/process_invitation_concern.rb
@@ -23,6 +23,7 @@ module Course::UserInvitationService::ProcessInvitationConcern
   #   Conflicts are accumulated into +@failed_users+ as a side effect.
   def process_invitations(users)
     @taken_external_ids = load_existing_external_ids
+    Rails.logger.info("Processing invitations with taken external IDs: #{@taken_external_ids.to_a}")
     augment_user_objects(users)
     existing_users, new_users = users.partition { |user| user[:user].present? }
     [*invite_new_users(new_users),
@@ -36,7 +37,7 @@ def process_invitations(users)
   # @return [void]
   def augment_user_objects(users)
     email_user_mapping = find_existing_users(users.map { |user| user[:email] })
-    users.each { |user| user[:user] = email_user_mapping[user[:email]] }
+    users.each { |user| user[:user] ||= email_user_mapping[user[:email]] }
   end
 
   # Given a list of email addresses, returns a Hash containing the mappings from email addresses
@@ -84,24 +85,13 @@ def handle_existing_course_user(user, course_user, existing_course_users)
     elsif @taken_external_ids.include?(csv_ext_id)
       @failed_users.push(user.merge(reason: :external_id_taken))
     else
-      case @resolution
-      when :replace_all
-        @taken_external_ids.delete(current_ext_id) if current_ext_id
-        @taken_external_ids.add(csv_ext_id)
-        course_user.external_id = csv_ext_id
-        @updated_course_users << { record: course_user, previous_external_id: current_ext_id }
-      when :keep_existing
-        existing_course_users << course_user
-      else
-        @taken_external_ids.delete(current_ext_id) if current_ext_id
-        @taken_external_ids.add(csv_ext_id)
-        @pending_course_user_updates << {
-          record: course_user,
-          previous_external_id: current_ext_id,
-          new_external_id: csv_ext_id
-        }
-        existing_course_users << course_user
-      end
+      @taken_external_ids.add(csv_ext_id)
+      @pending_course_user_updates << {
+        record: course_user,
+        previous_external_id: current_ext_id,
+        new_external_id: csv_ext_id
+      }
+      existing_course_users << course_user
     end
   end
 
@@ -178,24 +168,13 @@ def handle_existing_invitation(user, invitation, existing_invitations)
     elsif @taken_external_ids.include?(csv_ext_id)
       @failed_users.push(user.merge(reason: :external_id_taken))
     else
-      case @resolution
-      when :replace_all
-        @taken_external_ids.delete(current_ext_id) if current_ext_id
-        @taken_external_ids.add(csv_ext_id)
-        invitation.external_id = csv_ext_id
-        @updated_invitations << { record: invitation, previous_external_id: current_ext_id }
-      when :keep_existing
-        existing_invitations << invitation
-      else
-        @taken_external_ids.delete(current_ext_id) if current_ext_id
-        @taken_external_ids.add(csv_ext_id)
-        @pending_invitation_updates << {
-          record: invitation,
-          previous_external_id: current_ext_id,
-          new_external_id: csv_ext_id
-        }
-        existing_invitations << invitation
-      end
+      @taken_external_ids.add(csv_ext_id)
+      @pending_invitation_updates << {
+        record: invitation,
+        previous_external_id: current_ext_id,
+        new_external_id: csv_ext_id
+      }
+      existing_invitations << invitation
     end
   end
 
diff --git a/app/services/course/user_invitation_service.rb b/app/services/course/user_invitation_service.rb
index d4612317330..f49051c14d6 100644
--- a/app/services/course/user_invitation_service.rb
+++ b/app/services/course/user_invitation_service.rb
@@ -6,13 +6,12 @@ class Course::UserInvitationService
   include ProcessInvitationConcern
   include EmailInvitationConcern
 
-  class PendingExternalIdUpdates < StandardError
-    attr_reader :pending_invitation_updates, :pending_course_user_updates
+  class ExternalIdConflict < StandardError
+    attr_reader :external_id
 
-    def initialize(pending_invitation_updates:, pending_course_user_updates:)
-      @pending_invitation_updates = pending_invitation_updates
-      @pending_course_user_updates = pending_course_user_updates
-      super('Pending external ID updates require confirmation')
+    def initialize(external_id)
+      @external_id = external_id
+      super("External ID '#{external_id}' is already used by another member")
     end
   end
 
@@ -35,16 +34,14 @@ def initialize(current_course_user, current_user, current_course)
   #
   # @param [Array<Hash>|File|TempFile] users Invites the given users.
   # @return [Array<Integer>|nil] An array containing the size of new_invitations, existing_invitations,
-  #   new_course_users, existing_course_users, failed_users, updated_invitations, updated_course_users
-  #   respectively if success. nil when fail.
+  #   new_course_users, existing_course_users, failed_users, pending_invitation_updates,
+  #   pending_course_user_updates respectively if success. nil when fail.
   # @raise [CSV::MalformedCSVError] When the file provided is invalid.
-  def invite(users, external_id_resolution: nil)
-    @resolution = external_id_resolution&.to_sym
+  def invite(users)
     result = nil
 
     success = Course.transaction do
       result = invite_users(users)
-      raise_if_pending_external_id_updates!
       save_invitation_records!(result)
       true
     end
@@ -57,6 +54,28 @@ def invite(users, external_id_resolution: nil)
     result
   end
 
+  # Atomically updates external IDs for course users and/or invitations.
+  #
+  # @param [Array<Hash>] updates Each hash must contain :type ('course_user' or 'invitation'),
+  #   :id, and :external_id (blank value clears it).
+  # @raise [ExternalIdConflict] if any new external_id is already taken by another member.
+  # rubocop:disable Metrics/AbcSize
+  def update_external_ids(updates)
+    course_user_updates = updates.select { |u| u[:type].to_s == 'course_user' }
+    invitation_updates = updates.select { |u| u[:type].to_s == 'invitation' }
+
+    course_users = @current_course.course_users.where(id: course_user_updates.map { |u| u[:id] }).index_by(&:id)
+    invitations = @current_course.invitations.where(id: invitation_updates.map { |u| u[:id] }).index_by(&:id)
+
+    taken = external_ids_taken_outside(course_users.keys, invitations.keys)
+
+    Course.transaction do
+      apply_external_id_update(course_user_updates, course_users, taken)
+      apply_external_id_update(invitation_updates, invitations, taken)
+    end
+  end
+  # rubocop:enable Metrics/AbcSize
+
   # Resends invitation emails to CourseUsers to the given course.
   # This method disregards CourseUsers that do not have an 'invited' status.
   #
@@ -69,20 +88,33 @@ def resend_invitation(invitations)
 
   private
 
-  def raise_if_pending_external_id_updates!
-    return unless @pending_invitation_updates.any? || @pending_course_user_updates.any?
+  def external_ids_taken_outside(excluded_course_user_ids, excluded_invitation_ids)
+    course_ext_ids = @current_course.course_users.
+                     where.not(id: excluded_course_user_ids).
+                     where.not(external_id: nil).pluck(:external_id)
+    invitation_ext_ids = Course::UserInvitation.unconfirmed.
+                         where(course: @current_course).
+                         where.not(id: excluded_invitation_ids).
+                         where.not(external_id: nil).pluck(:external_id)
+    Set.new(course_ext_ids + invitation_ext_ids)
+  end
+
+  def apply_external_id_update(updates, records_by_id, taken)
+    updates.each do |update|
+      record = records_by_id[update[:id]]
+      next unless record
 
-    raise PendingExternalIdUpdates.new(
-      pending_invitation_updates: @pending_invitation_updates,
-      pending_course_user_updates: @pending_course_user_updates
-    )
+      value = update[:external_id].presence
+      raise ExternalIdConflict, value if value && taken.include?(value)
+
+      taken.add(value) if value
+      record.update!(external_id: value)
+    end
   end
 
   def save_invitation_records!(result)
-    new_invitations, _, new_course_users, _, _, updated_invitations, updated_course_users = result
-    all_records = updated_invitations.map { |u| u[:record] } +
-                  updated_course_users.map { |u| u[:record] } +
-                  new_invitations + new_course_users
+    new_invitations, _, new_course_users, = result
+    all_records = new_invitations + new_course_users
     raise ActiveRecord::Rollback unless all_records.all?(&:save)
   end
 
@@ -101,12 +133,15 @@ def save_invitation_records!(result)
   #     newly registered and already registered, and duplicate users respectively.
   # @raise [CSV::MalformedCSVError] When the file provided is invalid.
   def invite_users(users)
-    unique_users, parse_duplicates = parse_invitations(users)
+    user_hashes = parse_invitations(users)
+    augment_user_objects(user_hashes)
+    existing_account_emails = user_hashes.
+                              select { |u| u[:user].present? }.
+                              to_set { |u| u[:email].downcase }
+    unique_users, parse_duplicates = partition_unique_users(user_hashes, existing_account_emails)
     @failed_users = parse_duplicates
-    @updated_invitations = []
-    @updated_course_users = []
     @pending_invitation_updates = []
     @pending_course_user_updates = []
-    process_invitations(unique_users) + [@failed_users, @updated_invitations, @updated_course_users]
+    process_invitations(unique_users) + [@failed_users, @pending_invitation_updates, @pending_course_user_updates]
   end
 end
diff --git a/app/views/course/user_invitations/_invitation_result_data.json.jbuilder b/app/views/course/user_invitations/_invitation_result_data.json.jbuilder
index 19c26c655f2..a406fde4aba 100644
--- a/app/views/course/user_invitations/_invitation_result_data.json.jbuilder
+++ b/app/views/course/user_invitations/_invitation_result_data.json.jbuilder
@@ -54,26 +54,26 @@ json.failedUsers failed_users.each.with_index do |failed_user, index|
   json.timelineAlgorithm failed_user[:timeline_algorithm]
 end
 
-json.updatedInvitations updated_invitations.each do |item|
+json.pendingInvitationUpdates pending_invitation_updates do |item|
   inv = item[:record]
-  json.id            inv.id
-  json.name          inv.name
-  json.email         inv.email
-  json.externalId    inv.external_id
+  json.id                inv.id
+  json.name              inv.name
+  json.email             inv.email
+  json.externalId        item[:new_external_id]
   json.previousExternalId item[:previous_external_id]
-  json.role          inv.role
-  json.phantom       inv.phantom
+  json.role              inv.role
+  json.phantom           inv.phantom
   json.timelineAlgorithm inv.timeline_algorithm
 end
 
-json.updatedCourseUsers updated_course_users.each do |item|
+json.pendingCourseUserUpdates pending_course_user_updates do |item|
   cu = item[:record]
-  json.id             cu.id if cu.id
-  json.name           cu.name.strip
-  json.email          cu.user.email
-  json.externalId     cu.external_id
+  json.id                cu.id
+  json.name              cu.name.strip
+  json.email             cu.user.email
+  json.externalId        item[:new_external_id]
   json.previousExternalId item[:previous_external_id]
-  json.role           cu.role
-  json.phantom        cu.phantom?
+  json.role              cu.role
+  json.phantom           cu.phantom?
   json.timelineAlgorithm cu.timeline_algorithm
 end
diff --git a/app/views/course/user_invitations/_pending_external_id_data.json.jbuilder b/app/views/course/user_invitations/_pending_external_id_data.json.jbuilder
deleted file mode 100644
index 8906eeeaf15..00000000000
--- a/app/views/course/user_invitations/_pending_external_id_data.json.jbuilder
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-json.pendingInvitationUpdates pending_invitation_updates do |item|
-  inv = item[:record]
-  json.id                inv.id
-  json.name              inv.name
-  json.email             inv.email
-  json.externalId        item[:new_external_id]
-  json.previousExternalId item[:previous_external_id]
-  json.role              inv.role
-  json.phantom           inv.phantom
-  json.timelineAlgorithm inv.timeline_algorithm
-end
-
-json.pendingCourseUserUpdates pending_course_user_updates do |item|
-  cu = item[:record]
-  json.id                cu.id
-  json.name              cu.name.strip
-  json.email             cu.user.email
-  json.externalId        item[:new_external_id]
-  json.previousExternalId item[:previous_external_id]
-  json.role              cu.role
-  json.phantom           cu.phantom?
-  json.timelineAlgorithm cu.timeline_algorithm
-end
diff --git a/client/app/api/course/UserInvitations.ts b/client/app/api/course/UserInvitations.ts
index 16fa29d7887..067ec3a75d1 100644
--- a/client/app/api/course/UserInvitations.ts
+++ b/client/app/api/course/UserInvitations.ts
@@ -4,10 +4,9 @@ import {
   ManageCourseUsersSharedData,
 } from 'types/course/courseUsers';
 import {
-  ExternalIdResolution,
+  ExternalIdUpdate,
   InvitationFileEntity,
   InvitationListData,
-  InvitationUpdatedItem,
 } from 'types/course/userInvitations';
 
 import SubmissionsAPI from './Assessment/Submissions';
@@ -40,15 +39,8 @@ export default class UserInvitationsAPI extends BaseCourseAPI {
    */
   invite(
     data: InvitationFileEntity | FormData,
-    externalIdResolution?: ExternalIdResolution,
   ): Promise<
-    AxiosResponse<
-      | { newInvitations: number; invitationResult: string }
-      | {
-          pendingInvitationUpdates: InvitationUpdatedItem[];
-          pendingCourseUserUpdates: InvitationUpdatedItem[];
-        }
-    >
+    AxiosResponse<{ newInvitations: number; invitationResult: string }>
   > {
     const config = {
       headers: {
@@ -60,18 +52,12 @@ export default class UserInvitationsAPI extends BaseCourseAPI {
     let formData = new FormData();
 
     if ('file' in data) {
-      const temp = {
-        invitations_file: data.file,
-      };
+      const temp = { invitations_file: data.file };
       SubmissionsAPI.appendFormData(formData, temp, 'course');
     } else {
       formData = data as FormData;
     }
 
-    if (externalIdResolution) {
-      formData.append('external_id_resolution', externalIdResolution);
-    }
-
     return this.client.post(
       `${this.#urlPrefix}/users/invite`,
       formData,
@@ -79,6 +65,16 @@ export default class UserInvitationsAPI extends BaseCourseAPI {
     );
   }
 
+  updateExternalIds(updates: ExternalIdUpdate[]): Promise<AxiosResponse<void>> {
+    return this.client.post(`${this.#urlPrefix}/users/update_external_ids`, {
+      updates: updates.map((u) => ({
+        type: u.type,
+        id: u.id,
+        external_id: u.externalId ?? '',
+      })),
+    });
+  }
+
   /**
    * Fetches course registration key.
    */
diff --git a/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx b/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx
index e6bc40956c9..0c52009e2ea 100644
--- a/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx
+++ b/client/app/bundles/course/user-invitations/components/forms/IndividualInviteForm.tsx
@@ -1,13 +1,11 @@
-import { FC, useEffect, useRef, useState } from 'react';
+import { FC, useEffect, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { defineMessages } from 'react-intl';
 import { yupResolver } from '@hookform/resolvers/yup';
 import {
-  ExternalIdResolution,
   IndividualInvites,
   InvitationResult,
   InvitationsPostData,
-  PendingExternalIdConflict,
 } from 'types/course/userInvitations';
 import * as yup from 'yup';
 
@@ -22,7 +20,6 @@ import {
   getManageCourseUserPermissions,
   getManageCourseUsersSharedData,
 } from '../../selectors';
-import ExternalIdConflictPrompt from '../misc/ExternalIdConflictPrompt';
 
 import IndividualInvitations from './IndividualInvitations';
 
@@ -63,9 +60,6 @@ const IndividualInviteForm: FC<Props> = (props) => {
   const { openResultDialog } = props;
   const { t } = useTranslation();
   const [isLoading, setIsLoading] = useState(false);
-  const [conflictData, setConflictData] =
-    useState<PendingExternalIdConflict | null>(null);
-  const dataRef = useRef<InvitationsPostData | null>(null);
   const dispatch = useAppDispatch();
   const sharedData = useAppSelector(getManageCourseUsersSharedData);
   const permissions = useAppSelector(getManageCourseUserPermissions);
@@ -139,79 +133,36 @@ const IndividualInviteForm: FC<Props> = (props) => {
     }
   };
 
-  const submitWithResolution = (
-    postData: InvitationsPostData,
-    resolution?: ExternalIdResolution,
-  ): Promise<void> =>
-    dispatch(inviteUsersFromForm(postData, resolution))
-      .then((response) => {
-        if ('conflict' in response) {
-          setConflictData(response.conflict);
-        } else {
-          reset(initialValues);
-          openResultDialog(response as InvitationResult);
-        }
+  const onSubmit = (data: InvitationsPostData): Promise<void> => {
+    setIsLoading(true);
+    return dispatch(inviteUsersFromForm(data))
+      .then((result) => {
+        reset(initialValues);
+        openResultDialog(result);
       })
       .catch(handleError)
       .finally(() => setIsLoading(false));
-
-  const onSubmit = (data: InvitationsPostData): Promise<void> => {
-    setIsLoading(true);
-    dataRef.current = data;
-    return submitWithResolution(data);
-  };
-
-  const handleKeepExisting = (): void => {
-    setConflictData(null);
-    if (dataRef.current) {
-      setIsLoading(true);
-      submitWithResolution(dataRef.current, 'keep_existing');
-    }
-  };
-
-  const handleReplaceAll = (): void => {
-    setConflictData(null);
-    if (dataRef.current) {
-      setIsLoading(true);
-      submitWithResolution(dataRef.current, 'replace_all');
-    }
-  };
-
-  const handleCancel = (): void => {
-    setConflictData(null);
-    dataRef.current = null;
   };
 
   return (
-    <>
-      {conflictData && (
-        <ExternalIdConflictPrompt
-          onCancel={handleCancel}
-          onKeepExisting={handleKeepExisting}
-          onReplaceAll={handleReplaceAll}
-          pendingCourseUserUpdates={conflictData.pendingCourseUserUpdates}
-          pendingInvitationUpdates={conflictData.pendingInvitationUpdates}
-        />
-      )}
-      <form
-        encType="multipart/form-data"
-        id="invite-users-individual-form"
-        noValidate
-        onSubmit={handleSubmit((data) => onSubmit(data))}
-      >
-        <ErrorText errors={errors} />
-        <IndividualInvitations
-          fieldsConfig={{
-            control,
-            fields: controlledInvitationsFields,
-            append: invitationsAppend,
-            remove: invitationsRemove,
-          }}
-          isLoading={isLoading}
-          permissions={permissions}
-        />
-      </form>
-    </>
+    <form
+      encType="multipart/form-data"
+      id="invite-users-individual-form"
+      noValidate
+      onSubmit={handleSubmit((data) => onSubmit(data))}
+    >
+      <ErrorText errors={errors} />
+      <IndividualInvitations
+        fieldsConfig={{
+          control,
+          fields: controlledInvitationsFields,
+          append: invitationsAppend,
+          remove: invitationsRemove,
+        }}
+        isLoading={isLoading}
+        permissions={permissions}
+      />
+    </form>
   );
 };
 
diff --git a/client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx b/client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx
deleted file mode 100644
index 6e9f377a3ef..00000000000
--- a/client/app/bundles/course/user-invitations/components/misc/ExternalIdConflictPrompt.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { FC } from 'react';
-import { defineMessages } from 'react-intl';
-import {
-  Box,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-  Typography,
-} from '@mui/material';
-import { InvitationUpdatedItem } from 'types/course/userInvitations';
-
-import useTranslation from 'lib/hooks/useTranslation';
-
-import ExternalIdConflictTable from '../tables/ExternalIdConflictTable';
-
-interface Props {
-  pendingInvitationUpdates: InvitationUpdatedItem[];
-  pendingCourseUserUpdates: InvitationUpdatedItem[];
-  onKeepExisting: () => void;
-  onReplaceAll: () => void;
-  onCancel: () => void;
-}
-
-const translations = defineMessages({
-  title: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.title',
-    defaultMessage: 'Confirm External ID Updates',
-  },
-  body: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.body',
-    defaultMessage:
-      'These users are already enrolled or have pending invitations. No new invitation emails will be sent to them. Would you like to keep their current External IDs, or replace them with the values from your file?',
-  },
-  pendingInvitationUpdates: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.pendingInvitationUpdates',
-    defaultMessage: 'Pending Invitation Updates ({count})',
-  },
-  pendingCourseUserUpdates: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.pendingCourseUserUpdates',
-    defaultMessage: 'Pending Course Member Updates ({count})',
-  },
-  goBack: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.goBack',
-    defaultMessage: 'Go Back',
-  },
-  keepExisting: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.keepExisting',
-    defaultMessage: 'Keep Existing',
-  },
-  replace: {
-    id: 'course.userInvitations.ExternalIdConflictPrompt.replace',
-    defaultMessage: 'Replace',
-  },
-});
-
-const ExternalIdConflictPrompt: FC<Props> = ({
-  pendingInvitationUpdates,
-  pendingCourseUserUpdates,
-  onKeepExisting,
-  onReplaceAll,
-  onCancel,
-}) => {
-  const { t } = useTranslation();
-
-  return (
-    <Dialog
-      disableEscapeKeyDown
-      maxWidth="md"
-      onClose={(_event, reason) => {
-        if (reason !== 'backdropClick') onCancel();
-      }}
-      open
-    >
-      <DialogTitle>{t(translations.title)}</DialogTitle>
-      <DialogContent>
-        <DialogContentText>{t(translations.body)}</DialogContentText>
-
-        {pendingInvitationUpdates.length > 0 && (
-          <>
-            <Typography sx={{ mt: 2, mb: 1 }} variant="subtitle2">
-              {t(translations.pendingInvitationUpdates, {
-                count: pendingInvitationUpdates.length,
-              })}
-            </Typography>
-            <Box sx={{ maxHeight: 320, overflow: 'auto' }}>
-              <ExternalIdConflictTable rows={pendingInvitationUpdates} />
-            </Box>
-          </>
-        )}
-
-        {pendingCourseUserUpdates.length > 0 && (
-          <>
-            <Typography sx={{ mt: 2, mb: 1 }} variant="subtitle2">
-              {t(translations.pendingCourseUserUpdates, {
-                count: pendingCourseUserUpdates.length,
-              })}
-            </Typography>
-            <Box sx={{ maxHeight: 320, overflow: 'auto' }}>
-              <ExternalIdConflictTable rows={pendingCourseUserUpdates} />
-            </Box>
-          </>
-        )}
-      </DialogContent>
-      <DialogActions>
-        <Button onClick={onCancel} variant="outlined">
-          {t(translations.goBack)}
-        </Button>
-        <Button onClick={onKeepExisting} variant="contained">
-          {t(translations.keepExisting)}
-        </Button>
-        <Button onClick={onReplaceAll} variant="contained">
-          {t(translations.replace)}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-};
-
-export default ExternalIdConflictPrompt;
diff --git a/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx b/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx
index 7b7b4510f1a..aa149cda180 100644
--- a/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx
+++ b/client/app/bundles/course/user-invitations/components/misc/InvitationResultDialog.tsx
@@ -1,8 +1,10 @@
-import { FC } from 'react';
+import { FC, useEffect, useState } from 'react';
 import { defineMessages } from 'react-intl';
 import ErrorOutline from '@mui/icons-material/ErrorOutline';
 import HelpIcon from '@mui/icons-material/Help';
+import WarningAmber from '@mui/icons-material/WarningAmber';
 import {
+  Alert,
   Button,
   Dialog,
   DialogActions,
@@ -13,17 +15,20 @@ import {
 } from '@mui/material';
 import { CourseUserData } from 'types/course/courseUsers';
 import {
+  ExternalIdUpdate,
   FailedInvitationRowData,
   InvitationListData,
   InvitationResult,
   InvitationSuccessRow,
-  InvitationUpdatedItem,
 } from 'types/course/userInvitations';
 
-import { useAppSelector } from 'lib/hooks/store';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/store';
+import toast from 'lib/hooks/toast';
 import useTranslation from 'lib/hooks/useTranslation';
 
+import { updateExternalIds } from '../../operations';
 import { getManageCourseUsersSharedData } from '../../selectors';
+import ExternalIdUpdateTable from '../tables/ExternalIdUpdateTable';
 import InvitationResultExistingTable, {
   ExistingRow,
 } from '../tables/InvitationResultExistingTable';
@@ -71,6 +76,23 @@ const translations = defineMessages({
     id: 'course.userInvitations.InvitationResultDialog.newCourseUsers',
     defaultMessage: 'New Course Users ({count})',
   },
+  externalIdUpdates: {
+    id: 'course.userInvitations.InvitationResultDialog.externalIdUpdates',
+    defaultMessage: 'External IDs to update ({count})',
+  },
+  externalIdUpdatesInfo: {
+    id: 'course.userInvitations.InvitationResultDialog.externalIdUpdatesInfo',
+    defaultMessage:
+      'These users are already invited or enrolled. Their External ID changes only if you apply the file values.',
+  },
+  invitationsSubheading: {
+    id: 'course.userInvitations.InvitationResultDialog.invitationsSubheading',
+    defaultMessage: 'Invitations ({count})',
+  },
+  enrolledMembersSubheading: {
+    id: 'course.userInvitations.InvitationResultDialog.enrolledMembersSubheading',
+    defaultMessage: 'Enrolled members ({count})',
+  },
   existingInvitations: {
     id: 'course.userInvitations.InvitationResultDialog.existingInvitations',
     defaultMessage: 'Existing Invitations ({count})',
@@ -89,13 +111,27 @@ const translations = defineMessages({
     defaultMessage:
       'These users are already enrolled in this course. They were not re-enrolled.',
   },
-  externalIdUpdatedInfo: {
-    id: 'course.userInvitations.InvitationResultDialog.externalIdUpdatedInfo',
-    defaultMessage: 'External IDs were updated where specified.',
+  pendingExternalIdInfo: {
+    id: 'course.userInvitations.InvitationResultDialog.pendingExternalIdInfo',
+    defaultMessage:
+      '{count, plural, one {# row has} other {# rows have}} a different External ID in your file. Current values were kept.',
+  },
+  externalIdUpdatedDone: {
+    id: 'course.userInvitations.InvitationResultDialog.externalIdUpdatedDone',
+    defaultMessage: 'External IDs were updated from your file.',
+  },
+  applyFileValues: {
+    id: 'course.userInvitations.InvitationResultDialog.applyFileValues',
+    defaultMessage: 'Apply changes ({count})',
   },
-  updatedSubtitle: {
-    id: 'course.userInvitations.InvitationResultDialog.updatedSubtitle',
-    defaultMessage: '{count} updated · shown first',
+  changesApplied: {
+    id: 'course.userInvitations.InvitationResultDialog.changesApplied',
+    defaultMessage: 'Changes applied',
+  },
+  applyFailed: {
+    id: 'course.userInvitations.InvitationResultDialog.applyFailed',
+    defaultMessage:
+      "Couldn''t apply — External ID ''{id}'' is now used by another member. No changes were made.",
   },
 });
 
@@ -112,26 +148,25 @@ const toSuccessRow = (
   timelineAlgorithm: item.timelineAlgorithm,
 });
 
-const toUpdatedExistingRow = (item: InvitationUpdatedItem): ExistingRow => ({
-  id: item.id,
-  name: item.name,
-  email: item.email,
-  externalId: item.externalId,
-  previousExternalId: item.previousExternalId,
-  role: item.role,
-  phantom: item.phantom,
-  timelineAlgorithm: item.timelineAlgorithm,
-});
-
 const InvitationResultDialog: FC<Props> = ({
   open,
   handleClose,
   invitationResult,
 }) => {
   const { t } = useTranslation();
+  const dispatch = useAppDispatch();
   const { showPersonalizedTimelineFeatures } = useAppSelector(
     getManageCourseUsersSharedData,
   );
+  const [applied, setApplied] = useState(false);
+  const [busy, setBusy] = useState(false);
+
+  useEffect(() => {
+    if (!open) {
+      setApplied(false);
+      setBusy(false);
+    }
+  }, [open]);
 
   if (!open) return null;
 
@@ -141,8 +176,8 @@ const InvitationResultDialog: FC<Props> = ({
     existingInvitations = [],
     existingCourseUsers = [],
     failedUsers = [],
-    updatedInvitations = [],
-    updatedCourseUsers = [],
+    pendingInvitationUpdates = [],
+    pendingCourseUserUpdates = [],
   } = invitationResult;
 
   const newInvitationRows = newInvitations.map((i) => toSuccessRow(i, 'inv'));
@@ -173,16 +208,46 @@ const InvitationResultDialog: FC<Props> = ({
     ...failedUsers,
   ];
 
-  const existingInvitationRows: ExistingRow[] = [
-    ...normalExistingInvitations,
-    ...updatedInvitations.map(toUpdatedExistingRow),
-  ];
-  const existingCourseUserRows: ExistingRow[] = [
-    ...existingCourseUsers,
-    ...updatedCourseUsers.map(toUpdatedExistingRow),
+  const pendingCount =
+    pendingInvitationUpdates.length + pendingCourseUserUpdates.length;
+
+  const buildApplyUpdates = (): ExternalIdUpdate[] => [
+    ...pendingInvitationUpdates.map((p) => ({
+      type: 'invitation' as const,
+      id: p.id,
+      externalId: p.externalId,
+    })),
+    ...pendingCourseUserUpdates.map((p) => ({
+      type: 'course_user' as const,
+      id: p.id,
+      externalId: p.externalId,
+    })),
   ];
 
+  const applyChanges = async (): Promise<void> => {
+    setBusy(true);
+    try {
+      await dispatch(updateExternalIds(buildApplyUpdates()));
+      setApplied(true);
+    } catch (error) {
+      const id = (
+        error as { response?: { data?: { conflictingExternalId?: string } } }
+      )?.response?.data?.conflictingExternalId;
+      toast.error(t(translations.applyFailed, { id: id ?? '' }));
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  const existingInvitationRows: ExistingRow[] = normalExistingInvitations;
+  const existingCourseUserRows: ExistingRow[] = existingCourseUsers;
+
   const needsAttentionCount = failedUsers.length + failedInvitations.length;
+  const alreadyInCourseCount =
+    normalExistingInvitations.length +
+    existingCourseUsers.length +
+    pendingInvitationUpdates.length +
+    pendingCourseUserUpdates.length;
 
   const handleDialogClose = (_event: object, reason: string): void => {
     if (reason !== 'backdropClick') handleClose();
@@ -195,18 +260,24 @@ const InvitationResultDialog: FC<Props> = ({
       maxWidth="lg"
       onClose={handleDialogClose}
       open={open}
-      sx={{ top: 40, '& .MuiDialog-paper': { overflowY: 'auto' } }}
+      sx={{
+        top: 40,
+        '& .MuiDialog-paper': {
+          display: 'flex',
+          flexDirection: 'column',
+          overflowY: 'hidden',
+        },
+      }}
     >
       <DialogTitle>{t(translations.header)}</DialogTitle>
-      <DialogContent>
+      <DialogContent sx={{ flex: '1 1 auto', overflowY: 'auto' }}>
         <Typography gutterBottom variant="body2">
           {needsAttentionCount > 0 &&
             `${t(translations.summaryFailed, { count: needsAttentionCount })} `}
           {t(translations.summary, {
             newInvitations: newInvitations.length,
             newEnrollments: newCourseUsers.length,
-            alreadyInCourse:
-              existingInvitationRows.length + existingCourseUserRows.length,
+            alreadyInCourse: alreadyInCourseCount,
           })}
         </Typography>
 
@@ -237,6 +308,73 @@ const InvitationResultDialog: FC<Props> = ({
           </section>
         )}
 
+        {pendingCount > 0 && (
+          <section style={{ marginTop: 24 }}>
+            <Typography variant="h6">
+              <Tooltip title={t(translations.externalIdUpdatesInfo)}>
+                <WarningAmber
+                  color="warning"
+                  sx={{ verticalAlign: 'middle', mr: 0.5 }}
+                />
+              </Tooltip>
+              {t(translations.externalIdUpdates, { count: pendingCount })}
+            </Typography>
+
+            <Alert severity="info" sx={{ mt: 1 }}>
+              {applied
+                ? t(translations.externalIdUpdatedDone)
+                : t(translations.pendingExternalIdInfo, {
+                    count: pendingCount,
+                  })}
+            </Alert>
+            <Button
+              disabled={applied || busy}
+              onClick={applyChanges}
+              size="small"
+              sx={{ mt: 1, float: 'right' }}
+              variant="contained"
+            >
+              {applied
+                ? t(translations.changesApplied)
+                : t(translations.applyFileValues, { count: pendingCount })}
+            </Button>
+
+            {pendingInvitationUpdates.length > 0 && (
+              <>
+                <Typography component="div" sx={{ mt: 2 }} variant="subtitle2">
+                  {t(translations.invitationsSubheading, {
+                    count: pendingInvitationUpdates.length,
+                  })}
+                </Typography>
+                <ExternalIdUpdateTable
+                  applied={applied}
+                  rows={pendingInvitationUpdates}
+                  showPersonalizedTimelineFeatures={
+                    showPersonalizedTimelineFeatures
+                  }
+                />
+              </>
+            )}
+
+            {pendingCourseUserUpdates.length > 0 && (
+              <>
+                <Typography component="div" sx={{ mt: 2 }} variant="subtitle2">
+                  {t(translations.enrolledMembersSubheading, {
+                    count: pendingCourseUserUpdates.length,
+                  })}
+                </Typography>
+                <ExternalIdUpdateTable
+                  applied={applied}
+                  rows={pendingCourseUserUpdates}
+                  showPersonalizedTimelineFeatures={
+                    showPersonalizedTimelineFeatures
+                  }
+                />
+              </>
+            )}
+          </section>
+        )}
+
         {newInvitationRows.length > 0 && (
           <section style={{ marginTop: 24 }}>
             <Typography variant="h6">
@@ -272,27 +410,13 @@ const InvitationResultDialog: FC<Props> = ({
         {existingInvitationRows.length > 0 && (
           <section style={{ marginTop: 24 }}>
             <Typography variant="h6">
-              <Tooltip
-                title={[
-                  t(translations.existingInvitationsInfo),
-                  ...(updatedInvitations.length > 0
-                    ? [t(translations.externalIdUpdatedInfo)]
-                    : []),
-                ].join(' ')}
-              >
+              <Tooltip title={t(translations.existingInvitationsInfo)}>
                 <HelpIcon sx={{ fontSize: 16, mr: 0.5 }} />
               </Tooltip>
               {t(translations.existingInvitations, {
                 count: existingInvitationRows.length,
               })}
             </Typography>
-            {updatedInvitations.length > 0 && (
-              <Typography color="primary" variant="caption">
-                {t(translations.updatedSubtitle, {
-                  count: updatedInvitations.length,
-                })}
-              </Typography>
-            )}
             <InvitationResultExistingTable
               rows={existingInvitationRows}
               showPersonalizedTimelineFeatures={
@@ -305,27 +429,13 @@ const InvitationResultDialog: FC<Props> = ({
         {existingCourseUserRows.length > 0 && (
           <section style={{ marginTop: 24 }}>
             <Typography variant="h6">
-              <Tooltip
-                title={[
-                  t(translations.existingCourseUsersInfo),
-                  ...(updatedCourseUsers.length > 0
-                    ? [t(translations.externalIdUpdatedInfo)]
-                    : []),
-                ].join(' ')}
-              >
+              <Tooltip title={t(translations.existingCourseUsersInfo)}>
                 <HelpIcon sx={{ fontSize: 16, mr: 0.5 }} />
               </Tooltip>
               {t(translations.existingCourseUsers, {
                 count: existingCourseUserRows.length,
               })}
             </Typography>
-            {updatedCourseUsers.length > 0 && (
-              <Typography color="primary" variant="caption">
-                {t(translations.updatedSubtitle, {
-                  count: updatedCourseUsers.length,
-                })}
-              </Typography>
-            )}
             <InvitationResultExistingTable
               rows={existingCourseUserRows}
               showPersonalizedTimelineFeatures={
@@ -336,7 +446,7 @@ const InvitationResultDialog: FC<Props> = ({
         )}
       </DialogContent>
       <DialogActions>
-        <Button color="secondary" onClick={handleClose}>
+        <Button color="secondary" disabled={busy} onClick={handleClose}>
           {t(translations.close)}
         </Button>
       </DialogActions>
diff --git a/client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx b/client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx
deleted file mode 100644
index ff5a8277394..00000000000
--- a/client/app/bundles/course/user-invitations/components/misc/__test__/ExternalIdConflictPrompt.test.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import userEvent from '@testing-library/user-event';
-import { render, screen, waitForElementToBeRemoved } from 'test-utils';
-import { InvitationUpdatedItem } from 'types/course/userInvitations';
-
-import ExternalIdConflictPrompt from '../ExternalIdConflictPrompt';
-
-const invitationUpdate: InvitationUpdatedItem = {
-  id: 1,
-  name: 'Alice Tan',
-  email: 'alice@example.com',
-  externalId: 'NEW001',
-  previousExternalId: 'OLD001',
-  role: 'student',
-  phantom: false,
-};
-
-const courseUserUpdate: InvitationUpdatedItem = {
-  id: 2,
-  name: 'Bob Lim',
-  email: 'bob@example.com',
-  externalId: 'B042',
-  previousExternalId: null,
-  role: 'student',
-  phantom: false,
-};
-
-const noop = (): void => {};
-
-describe('ExternalIdConflictPrompt', () => {
-  it('renders the title', async () => {
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={noop}
-        onKeepExisting={noop}
-        onReplaceAll={noop}
-        pendingCourseUserUpdates={[]}
-        pendingInvitationUpdates={[invitationUpdate]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Confirm External ID Updates')).toBeInTheDocument();
-  });
-
-  it('renders the invitation updates section when non-empty', async () => {
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={noop}
-        onKeepExisting={noop}
-        onReplaceAll={noop}
-        pendingCourseUserUpdates={[]}
-        pendingInvitationUpdates={[invitationUpdate]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText(/Pending Invitation Updates/)).toBeInTheDocument();
-    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
-  });
-
-  it('does not render invitation section when empty', async () => {
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={noop}
-        onKeepExisting={noop}
-        onReplaceAll={noop}
-        pendingCourseUserUpdates={[courseUserUpdate]}
-        pendingInvitationUpdates={[]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(
-      screen.queryByText(/Pending Invitation Updates/),
-    ).not.toBeInTheDocument();
-    expect(
-      screen.getByText(/Pending Course Member Updates/),
-    ).toBeInTheDocument();
-  });
-
-  it('renders both sections when both non-empty', async () => {
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={noop}
-        onKeepExisting={noop}
-        onReplaceAll={noop}
-        pendingCourseUserUpdates={[courseUserUpdate]}
-        pendingInvitationUpdates={[invitationUpdate]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText(/Pending Invitation Updates/)).toBeInTheDocument();
-    expect(
-      screen.getByText(/Pending Course Member Updates/),
-    ).toBeInTheDocument();
-  });
-
-  it('calls onCancel when Go Back is clicked', async () => {
-    const onCancel = jest.fn();
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={onCancel}
-        onKeepExisting={noop}
-        onReplaceAll={noop}
-        pendingCourseUserUpdates={[]}
-        pendingInvitationUpdates={[invitationUpdate]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    await userEvent.click(screen.getByRole('button', { name: 'Go Back' }));
-    expect(onCancel).toHaveBeenCalledTimes(1);
-  });
-
-  it('calls onKeepExisting when Keep Existing is clicked', async () => {
-    const onKeepExisting = jest.fn();
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={noop}
-        onKeepExisting={onKeepExisting}
-        onReplaceAll={noop}
-        pendingCourseUserUpdates={[]}
-        pendingInvitationUpdates={[invitationUpdate]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    await userEvent.click(
-      screen.getByRole('button', { name: 'Keep Existing' }),
-    );
-    expect(onKeepExisting).toHaveBeenCalledTimes(1);
-  });
-
-  it('calls onReplaceAll when Replace is clicked', async () => {
-    const onReplaceAll = jest.fn();
-    render(
-      <ExternalIdConflictPrompt
-        onCancel={noop}
-        onKeepExisting={noop}
-        onReplaceAll={onReplaceAll}
-        pendingCourseUserUpdates={[]}
-        pendingInvitationUpdates={[invitationUpdate]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    await userEvent.click(screen.getByRole('button', { name: 'Replace' }));
-    expect(onReplaceAll).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx b/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx
index 2c460cf1a25..7d290a38a7e 100644
--- a/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx
+++ b/client/app/bundles/course/user-invitations/components/misc/__test__/InvitationResultDialog.test.tsx
@@ -1,4 +1,6 @@
-import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from 'test-utils';
 import { CourseUserData } from 'types/course/courseUsers';
 import {
   FailedInvitationRowData,
@@ -7,9 +9,16 @@ import {
   InvitationUpdatedItem,
 } from 'types/course/userInvitations';
 
+import * as operations from '../../../operations';
 import InvitationResultDialog from '../InvitationResultDialog';
 
+jest.mock('../../../operations', () => ({
+  ...jest.requireActual('../../../operations'),
+  updateExternalIds: jest.fn(),
+}));
+
 const CAROL_EMAIL = 'carol@example.com';
+const EXT_ID_UPDATES_1 = 'External IDs to update (1)';
 
 const carolDuplicateUser: FailedInvitationRowData = {
   id: 3,
@@ -89,6 +98,24 @@ describe('InvitationResultDialog', () => {
     expect(screen.queryByText(/Existing Course Users/)).not.toBeInTheDocument();
   });
 
+  it('does not close when backdrop is clicked', async () => {
+    const handleClose = jest.fn();
+    render(
+      <InvitationResultDialog
+        handleClose={handleClose}
+        invitationResult={{}}
+        open
+      />,
+    );
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+
+    const backdrop = document.querySelector('.MuiBackdrop-root');
+    if (backdrop) fireEvent.click(backdrop);
+
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+    expect(handleClose).not.toHaveBeenCalled();
+  });
+
   // Summary line
   it('shows summary text with correct counts', async () => {
     renderDialog({
@@ -257,38 +284,32 @@ describe('InvitationResultDialog', () => {
     expect(screen.getByText('Charlie')).toBeInTheDocument();
   });
 
-  it('hides Existing Invitations section when both existingInvitations and updatedInvitations are empty', async () => {
+  it('hides Existing Invitations section when both existingInvitations and pendingInvitationUpdates are empty', async () => {
     renderDialog({ newInvitations: [baseInvitation] });
     await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
     expect(screen.queryByText(/Existing Invitations/)).not.toBeInTheDocument();
   });
 
-  it('shows updatedSubtitle in Existing Invitations when updatedInvitations is non-empty', async () => {
-    const updatedItem: InvitationUpdatedItem = {
+  it('shows pending invitation diffs in the dedicated section, not Existing Invitations', async () => {
+    const pendingItem: InvitationUpdatedItem = {
       id: 10,
       name: 'Carol',
       email: CAROL_EMAIL,
-      externalId: 'EXT001',
-      previousExternalId: null,
+      externalId: 'NEW001',
+      previousExternalId: 'OLD001',
       role: 'student',
       phantom: false,
     };
-    renderDialog({ updatedInvitations: [updatedItem] });
+    renderDialog({ pendingInvitationUpdates: [pendingItem] });
     await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Existing Invitations (1)')).toBeInTheDocument();
-    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
-  });
-
-  it('does not show updatedSubtitle when updatedInvitations is empty', async () => {
-    renderDialog({
-      existingInvitations: [{ ...baseInvitation, id: 5, name: 'Charlie' }],
-    });
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.queryByText(/updated · shown first/)).not.toBeInTheDocument();
+    expect(screen.getByText(EXT_ID_UPDATES_1)).toBeInTheDocument();
+    expect(screen.getByText('Invitations (1)')).toBeInTheDocument();
+    expect(screen.queryByText(/Existing Invitations/)).not.toBeInTheDocument();
+    expect(screen.getByText('Carol')).toBeInTheDocument();
   });
 
-  it('shows combined count, updated rows before normal rows, and correct alreadyInCourse when both existingInvitations and updatedInvitations are present', async () => {
-    const updatedItem: InvitationUpdatedItem = {
+  it('splits pending invitation diffs out of Existing Invitations but still counts them as already in course', async () => {
+    const pendingItem: InvitationUpdatedItem = {
       id: 10,
       name: 'UpdatedAlice',
       email: 'updated@example.com',
@@ -301,23 +322,17 @@ describe('InvitationResultDialog', () => {
       existingInvitations: [
         { ...baseInvitation, id: 5, name: 'NormalCharlie' },
       ],
-      updatedInvitations: [updatedItem],
+      pendingInvitationUpdates: [pendingItem],
     });
     await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Existing Invitations (2)')).toBeInTheDocument();
-    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+    expect(screen.getByText('Existing Invitations (1)')).toBeInTheDocument();
+    expect(screen.getByText(EXT_ID_UPDATES_1)).toBeInTheDocument();
+    expect(screen.getByText('Invitations (1)')).toBeInTheDocument();
     expect(
       screen.getByText(
         /0 new invitations sent, 0 directly enrolled, 2 already in course/,
       ),
     ).toBeInTheDocument();
-    const normalRow = screen.getByText('NormalCharlie');
-    const updatedRow = screen.getByText('UpdatedAlice');
-    expect(
-      // eslint-disable-next-line no-bitwise
-      normalRow.compareDocumentPosition(updatedRow) &
-        Node.DOCUMENT_POSITION_PRECEDING,
-    ).toBeTruthy();
   });
 
   // Existing Course Users section
@@ -336,8 +351,8 @@ describe('InvitationResultDialog', () => {
     expect(screen.queryByText(/Existing Course Users/)).not.toBeInTheDocument();
   });
 
-  it('shows updatedSubtitle for Existing Course Users when updatedCourseUsers is non-empty', async () => {
-    const updatedUser = {
+  it('shows pending course-user diffs in the dedicated section, not Existing Course Users', async () => {
+    const pendingUser: InvitationUpdatedItem = {
       id: 20,
       name: 'Dana',
       email: 'dana@example.com',
@@ -346,14 +361,16 @@ describe('InvitationResultDialog', () => {
       role: 'student',
       phantom: false,
     };
-    renderDialog({ updatedCourseUsers: [updatedUser] });
+    renderDialog({ pendingCourseUserUpdates: [pendingUser] });
     await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Existing Course Users (1)')).toBeInTheDocument();
-    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+    expect(screen.getByText(EXT_ID_UPDATES_1)).toBeInTheDocument();
+    expect(screen.getByText('Enrolled members (1)')).toBeInTheDocument();
+    expect(screen.queryByText(/Existing Course Users/)).not.toBeInTheDocument();
+    expect(screen.getByText('Dana')).toBeInTheDocument();
   });
 
-  it('shows combined count, updated rows before normal rows, and correct alreadyInCourse when both existingCourseUsers and updatedCourseUsers are present', async () => {
-    const updatedUser = {
+  it('splits pending course-user diffs out of Existing Course Users but still counts them as already in course', async () => {
+    const pendingUser: InvitationUpdatedItem = {
       id: 20,
       name: 'UpdatedDana',
       email: 'updated-dana@example.com',
@@ -364,23 +381,17 @@ describe('InvitationResultDialog', () => {
     };
     renderDialog({
       existingCourseUsers: [{ ...baseCourseUser, id: 6, name: 'NormalEve' }],
-      updatedCourseUsers: [updatedUser],
+      pendingCourseUserUpdates: [pendingUser],
     });
     await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Existing Course Users (2)')).toBeInTheDocument();
-    expect(screen.getByText('1 updated · shown first')).toBeInTheDocument();
+    expect(screen.getByText('Existing Course Users (1)')).toBeInTheDocument();
+    expect(screen.getByText(EXT_ID_UPDATES_1)).toBeInTheDocument();
+    expect(screen.getByText('Enrolled members (1)')).toBeInTheDocument();
     expect(
       screen.getByText(
         /0 new invitations sent, 0 directly enrolled, 2 already in course/,
       ),
     ).toBeInTheDocument();
-    const normalRow = screen.getByText('NormalEve');
-    const updatedRow = screen.getByText('UpdatedDana');
-    expect(
-      // eslint-disable-next-line no-bitwise
-      normalRow.compareDocumentPosition(updatedRow) &
-        Node.DOCUMENT_POSITION_PRECEDING,
-    ).toBeTruthy();
   });
 
   describe('Personalized Timeline column (showPersonalizedTimelineFeatures)', () => {
@@ -436,4 +447,250 @@ describe('InvitationResultDialog', () => {
       ).not.toBeInTheDocument();
     });
   });
+
+  it('renders External IDs to update before New Invitations in DOM', async () => {
+    renderDialog({
+      newInvitations: [baseInvitation],
+      pendingInvitationUpdates: [
+        {
+          id: 10,
+          name: 'PendingPat',
+          email: 'pat@example.com',
+          externalId: 'NEW001',
+          previousExternalId: 'OLD001',
+          role: 'student',
+          phantom: false,
+        },
+      ],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    const headings = screen
+      .getAllByRole('heading')
+      .map((h) => h.textContent ?? '');
+    const updIdx = headings.findIndex((h) => h.includes('External IDs to update'));
+    const newInvIdx = headings.findIndex((h) => h.includes('New Invitations'));
+    expect(updIdx).toBeGreaterThanOrEqual(0);
+    expect(newInvIdx).toBeGreaterThanOrEqual(0);
+    expect(updIdx).toBeLessThan(newInvIdx);
+  });
+
+  it('shows a single combined count and both sub-tables when both arrays are non-empty', async () => {
+    renderDialog({
+      pendingInvitationUpdates: [
+        {
+          id: 10,
+          name: 'PendingPat',
+          email: 'pat@example.com',
+          externalId: 'NEW001',
+          previousExternalId: 'OLD001',
+          role: 'student',
+          phantom: false,
+        },
+      ],
+      pendingCourseUserUpdates: [
+        {
+          id: 20,
+          name: 'PendingDana',
+          email: 'dana@example.com',
+          externalId: 'CU001',
+          previousExternalId: 'CU000',
+          role: 'student',
+          phantom: false,
+        },
+      ],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    expect(screen.getByText('External IDs to update (2)')).toBeInTheDocument();
+    expect(screen.getByText('Invitations (1)')).toBeInTheDocument();
+    expect(screen.getByText('Enrolled members (1)')).toBeInTheDocument();
+    expect(screen.getByText('PendingPat')).toBeInTheDocument();
+    expect(screen.getByText('PendingDana')).toBeInTheDocument();
+  });
+
+  it('exposes the keep-by-default explanation as a tooltip on the section', async () => {
+    renderDialog({
+      pendingInvitationUpdates: [
+        {
+          id: 10,
+          name: 'PendingPat',
+          email: 'pat@example.com',
+          externalId: 'NEW001',
+          previousExternalId: 'OLD001',
+          role: 'student',
+          phantom: false,
+        },
+      ],
+    });
+    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+    // Tooltip text is rendered (in the accessible tree) by MUI's Tooltip title prop.
+    expect(
+      screen.getByLabelText(
+        'These users are already invited or enrolled. Their External ID changes only if you apply the file values.',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  describe('pending external-ID apply', () => {
+    const pendingResult: InvitationResult = {
+      pendingCourseUserUpdates: [
+        {
+          id: 1,
+          name: 'Alice',
+          email: 'alice@example.com',
+          externalId: 'NEW001',
+          previousExternalId: 'OLD001',
+          role: 'student',
+          phantom: false,
+        },
+      ],
+    };
+
+    beforeEach(() => {
+      (operations.updateExternalIds as jest.Mock).mockReturnValue(
+        async () => undefined,
+      );
+    });
+
+    it('shows the flagged status line and Apply button when diffs exist', async () => {
+      renderDialog(pendingResult);
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(
+        screen.getByText(/1 row has a different External ID/),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('button', { name: /Apply changes \(1\)/ }),
+      ).toBeInTheDocument();
+      expect(screen.getByText(EXT_ID_UPDATES_1)).toBeInTheDocument();
+      expect(screen.getByText('Enrolled members (1)')).toBeInTheDocument();
+    });
+
+    it('calls backend with file values, shows Changes applied button disabled and updated status line', async () => {
+      const user = userEvent.setup();
+      renderDialog(pendingResult);
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+
+      await user.click(
+        screen.getByRole('button', { name: /Apply changes \(1\)/ }),
+      );
+
+      expect(operations.updateExternalIds).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: 'course_user',
+            id: 1,
+            externalId: 'NEW001',
+          }),
+        ]),
+      );
+      expect(
+        screen.getByText(/External IDs were updated from your file/),
+      ).toBeInTheDocument();
+      const changesAppliedBtn = screen.getByRole('button', {
+        name: /Changes applied/,
+      });
+      expect(changesAppliedBtn).toBeInTheDocument();
+      expect(changesAppliedBtn).toBeDisabled();
+    });
+
+    it('shows no Apply affordance or pending-diff status text when there are no diffs', async () => {
+      renderDialog({ newInvitations: [baseInvitation] });
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(
+        screen.queryByRole('button', { name: /Apply changes/ }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByText(/different External ID/),
+      ).not.toBeInTheDocument();
+    });
+
+    it('on apply failure shows error toast and leaves button at Apply', async () => {
+      (operations.updateExternalIds as jest.Mock).mockReturnValue(async () => {
+        throw Object.assign(new Error('conflict'), {
+          response: { data: { conflictingExternalId: 'TAKEN' } },
+        });
+      });
+
+      const user = userEvent.setup();
+      renderDialog(pendingResult);
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+
+      await user.click(
+        screen.getByRole('button', { name: /Apply changes \(1\)/ }),
+      );
+
+      expect(
+        screen.getByRole('button', { name: /Apply changes \(1\)/ }),
+      ).toBeInTheDocument();
+      await screen.findByText(
+        /External ID 'TAKEN' is now used by another member/,
+      );
+    });
+
+    it('disables Apply button while request is in flight', async () => {
+      let resolveFn!: () => void;
+      const pending = new Promise<void>((res) => {
+        resolveFn = res;
+      });
+      (operations.updateExternalIds as jest.Mock).mockReturnValue(() => pending);
+
+      const user = userEvent.setup();
+      renderDialog(pendingResult);
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+
+      const applyBtn = screen.getByRole('button', { name: /Apply changes \(1\)/ });
+      const clickPromise = user.click(applyBtn);
+      await waitFor(() => expect(applyBtn).toBeDisabled());
+
+      resolveFn();
+      await clickPromise;
+      expect(
+        screen.getByRole('button', { name: /Changes applied/ }),
+      ).toBeDisabled();
+    });
+
+    it('resets to Apply button when dialog closes and reopens', async () => {
+      const user = userEvent.setup();
+
+      const ToggleWrapper: React.FC = () => {
+        const [open, setOpen] = React.useState(true);
+        return (
+          <>
+            <button onClick={() => setOpen(false)}>close</button>
+            <button onClick={() => setOpen(true)}>reopen</button>
+            <InvitationResultDialog
+              handleClose={noop}
+              invitationResult={pendingResult}
+              open={open}
+            />
+          </>
+        );
+      };
+
+      render(<ToggleWrapper />);
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+
+      await user.click(screen.getByRole('button', { name: /Apply changes \(1\)/ }));
+      expect(
+        screen.getByRole('button', { name: /Changes applied/ }),
+      ).toBeDisabled();
+
+      // These buttons are inside the aria-hidden backdrop; use fireEvent to bypass the a11y filter.
+      fireEvent.click(screen.getByRole('button', { name: 'close', hidden: true }));
+      fireEvent.click(screen.getByRole('button', { name: 'reopen', hidden: true }));
+
+      await waitFor(
+        () =>
+          expect(
+            screen.getByRole('button', { name: /Apply changes \(1\)/ }),
+          ).not.toBeDisabled(),
+        { timeout: 5000 },
+      );
+    });
+
+    it('renders no dedicated diff section when there are no diffs', async () => {
+      renderDialog({ newInvitations: [baseInvitation] });
+      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+      expect(screen.queryByText(/External IDs to update/)).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx b/client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx
deleted file mode 100644
index 972b33fd68a..00000000000
--- a/client/app/bundles/course/user-invitations/components/tables/ExternalIdConflictTable.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { FC } from 'react';
-import { defineMessages } from 'react-intl';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableRow,
-  Typography,
-} from '@mui/material';
-import { InvitationUpdatedItem } from 'types/course/userInvitations';
-
-import useTranslation from 'lib/hooks/useTranslation';
-import tableTranslations from 'lib/translations/table';
-
-interface Props {
-  rows: InvitationUpdatedItem[];
-}
-
-const translations = defineMessages({
-  currentExternalId: {
-    id: 'lib.translations.table.column.currentExternalId',
-    defaultMessage: 'Current External ID',
-  },
-  newExternalId: {
-    id: 'lib.translations.table.column.newExternalId',
-    defaultMessage: 'New External ID',
-  },
-});
-
-const ExternalIdConflictTable: FC<Props> = ({ rows }) => {
-  const { t } = useTranslation();
-
-  return (
-    <Table size="small">
-      <TableHead>
-        <TableRow>
-          <TableCell>{t(tableTranslations.name)}</TableCell>
-          <TableCell>{t(tableTranslations.email)}</TableCell>
-          <TableCell>{t(translations.currentExternalId)}</TableCell>
-          <TableCell>{t(translations.newExternalId)}</TableCell>
-        </TableRow>
-      </TableHead>
-      <TableBody>
-        {rows.map((row) => (
-          <TableRow key={row.id}>
-            <TableCell>{row.name}</TableCell>
-            <TableCell>{row.email}</TableCell>
-            <TableCell>
-              {row.previousExternalId ?? (
-                <Typography color="text.secondary" variant="body2">
-                  —
-                </Typography>
-              )}
-            </TableCell>
-            <TableCell>
-              <Typography fontWeight="bold" variant="body2">
-                {row.externalId}
-              </Typography>
-            </TableCell>
-          </TableRow>
-        ))}
-      </TableBody>
-    </Table>
-  );
-};
-
-export default ExternalIdConflictTable;
diff --git a/client/app/bundles/course/user-invitations/components/tables/ExternalIdUpdateTable.tsx b/client/app/bundles/course/user-invitations/components/tables/ExternalIdUpdateTable.tsx
new file mode 100644
index 00000000000..3e0d86bbad9
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/ExternalIdUpdateTable.tsx
@@ -0,0 +1,147 @@
+import { FC, ReactNode } from 'react';
+import { defineMessages } from 'react-intl';
+import { InvitationUpdatedItem } from 'types/course/userInvitations';
+
+import { ColumnTemplate } from 'lib/components/table';
+import Table from 'lib/components/table/Table';
+import {
+  DEFAULT_MINI_TABLE_ROWS_PER_PAGE,
+  TIMELINE_ALGORITHMS,
+} from 'lib/constants/sharedConstants';
+import useTranslation from 'lib/hooks/useTranslation';
+import roleTranslations from 'lib/translations/course/users/roles';
+import tableTranslations from 'lib/translations/table';
+
+const translations = defineMessages({
+  yes: {
+    id: 'course.userInvitations.ExternalIdUpdateTable.yes',
+    defaultMessage: 'Yes',
+  },
+  no: {
+    id: 'course.userInvitations.ExternalIdUpdateTable.no',
+    defaultMessage: 'No',
+  },
+  existingColumn: {
+    id: 'course.userInvitations.ExternalIdUpdateTable.existingColumn',
+    defaultMessage: 'Existing',
+  },
+  inFileColumn: {
+    id: 'course.userInvitations.ExternalIdUpdateTable.inFileColumn',
+    defaultMessage: 'In file',
+  },
+  currentColumn: {
+    id: 'course.userInvitations.ExternalIdUpdateTable.currentColumn',
+    defaultMessage: '{label} (current)',
+  },
+});
+
+interface Props {
+  rows: InvitationUpdatedItem[];
+  applied: boolean;
+  showPersonalizedTimelineFeatures?: boolean;
+}
+
+// The currently-live column (Existing before apply, In file after) gets a full-cell
+// blue fill; the other column is muted. Column `className` lands on the MUI TableCell,
+// so the whole cell fills cleanly (it also tints the column's header cell — intended:
+// the live column reads as one highlighted column, with a "(current)" header label).
+const LIVE_CELL_CLASS = 'bg-blue-100 font-semibold text-blue-900';
+const MUTED_CELL_CLASS = 'text-neutral-400';
+
+const ExternalIdUpdateTable: FC<Props> = ({
+  rows,
+  applied,
+  showPersonalizedTimelineFeatures,
+}) => {
+  const { t } = useTranslation();
+
+  if (rows.length === 0) return null;
+
+  const currentTitle = (label: string): string =>
+    t(translations.currentColumn, { label });
+
+  const columns: ColumnTemplate<InvitationUpdatedItem>[] = [
+    {
+      of: 'name',
+      title: t(tableTranslations.name),
+      sortable: false,
+      cell: (row) => row.name,
+      csvDownloadable: true,
+    },
+    {
+      of: 'email',
+      title: t(tableTranslations.email),
+      sortable: false,
+      cell: (row) => row.email,
+      csvDownloadable: true,
+    },
+    {
+      of: 'previousExternalId',
+      title: applied
+        ? t(translations.existingColumn)
+        : currentTitle(t(translations.existingColumn)),
+      className: applied ? MUTED_CELL_CLASS : LIVE_CELL_CLASS,
+      sortable: false,
+      cell: (row): ReactNode => row.previousExternalId ?? '—',
+      csvDownloadable: true,
+    },
+    {
+      of: 'externalId',
+      title: applied
+        ? currentTitle(t(translations.inFileColumn))
+        : t(translations.inFileColumn),
+      className: applied ? LIVE_CELL_CLASS : MUTED_CELL_CLASS,
+      sortable: false,
+      cell: (row): ReactNode => row.externalId ?? '—',
+      csvDownloadable: true,
+    },
+    {
+      of: 'role',
+      title: t(tableTranslations.role),
+      sortable: false,
+      cell: (row): ReactNode => {
+        const desc =
+          roleTranslations[row.role as keyof typeof roleTranslations];
+        return desc ? t(desc) : row.role;
+      },
+      csvDownloadable: true,
+    },
+    {
+      of: 'phantom',
+      title: t(tableTranslations.phantom),
+      sortable: false,
+      cell: (row) => (row.phantom ? t(translations.yes) : t(translations.no)),
+      csvDownloadable: true,
+    },
+    ...(showPersonalizedTimelineFeatures
+      ? ([
+          {
+            of: 'timelineAlgorithm',
+            title: t(tableTranslations.personalizedTimeline),
+            sortable: false,
+            cell: (row): ReactNode =>
+              TIMELINE_ALGORITHMS.find(
+                (tl) => tl.value === row.timelineAlgorithm,
+              )?.label ?? '-',
+            csvDownloadable: true,
+          },
+        ] as ColumnTemplate<InvitationUpdatedItem>[])
+      : []),
+  ];
+
+  return (
+    <Table
+      columns={columns}
+      data={rows}
+      getRowEqualityData={(row) => ({ ...row, applied })}
+      getRowId={(row) => String(row.id)}
+      pagination={{
+        rowsPerPage: [DEFAULT_MINI_TABLE_ROWS_PER_PAGE],
+        showAllRows: true,
+      }}
+      toolbar={{ show: false }}
+    />
+  );
+};
+
+export default ExternalIdUpdateTable;
diff --git a/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx b/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx
index d93dd09f951..625b753ddc7 100644
--- a/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx
+++ b/client/app/bundles/course/user-invitations/components/tables/InvitationResultExistingTable.tsx
@@ -1,6 +1,5 @@
 import { FC, ReactNode } from 'react';
 import { defineMessages } from 'react-intl';
-import { Tooltip } from '@mui/material';
 import { TimelineAlgorithm } from 'types/course/personalTimes';
 
 import { ColumnTemplate } from 'lib/components/table';
@@ -22,10 +21,6 @@ const translations = defineMessages({
     id: 'course.userInvitations.InvitationResultExistingTable.no',
     defaultMessage: 'No',
   },
-  previouslyLabel: {
-    id: 'course.userInvitations.InvitationResultExistingTable.previouslyLabel',
-    defaultMessage: 'Previously: {value}',
-  },
 });
 
 export interface ExistingRow {
@@ -35,7 +30,6 @@ export interface ExistingRow {
   externalId?: string | null;
   role?: string;
   phantom?: boolean;
-  previousExternalId?: string | null;
   timelineAlgorithm?: TimelineAlgorithm;
 }
 
@@ -52,15 +46,7 @@ const InvitationResultExistingTable: FC<Props> = ({
 
   if (rows.length === 0) return null;
 
-  // Updated rows (ext_id changed) first so admins notice them above unchanged existing rows
-  const orderedRows = [
-    ...rows.filter((r) => r.previousExternalId !== undefined),
-    ...rows.filter((r) => r.previousExternalId === undefined),
-  ];
-
-  const showExternalId = rows.some(
-    (r) => r.externalId != null || r.previousExternalId !== undefined,
-  );
+  const showExternalId = rows.some((r) => r.externalId != null);
 
   const columns: ColumnTemplate<ExistingRow>[] = [
     {
@@ -83,20 +69,7 @@ const InvitationResultExistingTable: FC<Props> = ({
             of: 'externalId',
             title: t(tableTranslations.externalId),
             sortable: false,
-            cell: (row): ReactNode => {
-              if (row.previousExternalId === undefined)
-                return row.externalId ?? '';
-              const previousLabel = t(translations.previouslyLabel, {
-                value: row.previousExternalId ?? '—',
-              });
-              return (
-                <Tooltip title={previousLabel}>
-                  <strong style={{ cursor: 'default' }}>
-                    {row.externalId}
-                  </strong>
-                </Tooltip>
-              );
-            },
+            cell: (row): ReactNode => row.externalId ?? '',
             csvDownloadable: true,
           },
         ] as ColumnTemplate<ExistingRow>[])
@@ -139,10 +112,7 @@ const InvitationResultExistingTable: FC<Props> = ({
   return (
     <Table
       columns={columns}
-      data={orderedRows}
-      getRowClassName={(row) =>
-        row.previousExternalId !== undefined ? 'bg-[#e3f2fd]' : ''
-      }
+      data={rows}
       getRowEqualityData={(row) => row}
       getRowId={(row) => String(row.id)}
       pagination={{
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx
deleted file mode 100644
index 48fcb1870e0..00000000000
--- a/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdConflictTable.test.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { render, screen, waitForElementToBeRemoved } from 'test-utils';
-import { InvitationUpdatedItem } from 'types/course/userInvitations';
-
-import ExternalIdConflictTable from '../ExternalIdConflictTable';
-
-const baseItem: InvitationUpdatedItem = {
-  id: 1,
-  name: 'Alice Tan',
-  email: 'alice@example.com',
-  externalId: 'NEW001',
-  previousExternalId: 'OLD001',
-  role: 'student',
-  phantom: false,
-};
-
-describe('ExternalIdConflictTable', () => {
-  it('renders Name, Email, Current External ID, New External ID columns', async () => {
-    render(<ExternalIdConflictTable rows={[baseItem]} />);
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Name')).toBeInTheDocument();
-    expect(screen.getByText('Email')).toBeInTheDocument();
-    expect(screen.getByText('Current External ID')).toBeInTheDocument();
-    expect(screen.getByText('New External ID')).toBeInTheDocument();
-  });
-
-  it('renders row data', async () => {
-    render(<ExternalIdConflictTable rows={[baseItem]} />);
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
-    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
-    expect(screen.getByText('OLD001')).toBeInTheDocument();
-    expect(screen.getByText('NEW001')).toBeInTheDocument();
-  });
-
-  it('renders — when previousExternalId is null', async () => {
-    render(
-      <ExternalIdConflictTable
-        rows={[{ ...baseItem, previousExternalId: null }]}
-      />,
-    );
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('—')).toBeInTheDocument();
-  });
-
-  it('renders multiple rows', async () => {
-    const second: InvitationUpdatedItem = {
-      ...baseItem,
-      id: 2,
-      name: 'Bob Lim',
-      email: 'bob@example.com',
-      externalId: 'B042',
-      previousExternalId: null,
-    };
-    render(<ExternalIdConflictTable rows={[baseItem, second]} />);
-    await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
-    expect(screen.getByText('Bob Lim')).toBeInTheDocument();
-  });
-});
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdUpdateTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdUpdateTable.test.tsx
new file mode 100644
index 00000000000..3f2cf024911
--- /dev/null
+++ b/client/app/bundles/course/user-invitations/components/tables/__test__/ExternalIdUpdateTable.test.tsx
@@ -0,0 +1,82 @@
+import { render, screen, waitForElementToBeRemoved } from 'test-utils';
+import { InvitationUpdatedItem } from 'types/course/userInvitations';
+
+import ExternalIdUpdateTable from '../ExternalIdUpdateTable';
+
+const baseRow: InvitationUpdatedItem = {
+  id: 1,
+  name: 'Alice Tan',
+  email: 'alice@example.com',
+  externalId: 'NEW001',
+  previousExternalId: 'OLD001',
+  role: 'student',
+  phantom: false,
+};
+
+const settle = async (): Promise<void> => {
+  await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
+};
+
+describe('ExternalIdUpdateTable', () => {
+  it('renders nothing when rows is empty', async () => {
+    render(<ExternalIdUpdateTable applied={false} rows={[]} />);
+    await settle();
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
+  });
+
+  it('shows Name, Email, both external IDs, Role and Phantom', async () => {
+    render(<ExternalIdUpdateTable applied={false} rows={[baseRow]} />);
+    await settle();
+    expect(screen.getByText('Alice Tan')).toBeInTheDocument();
+    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
+    expect(screen.getByText('In file')).toBeInTheDocument();
+    expect(screen.getByText('OLD001')).toBeInTheDocument();
+    expect(screen.getByText('NEW001')).toBeInTheDocument();
+    expect(screen.getByText('Student')).toBeInTheDocument();
+    expect(screen.getByText('No')).toBeInTheDocument();
+  });
+
+  it('marks Existing as the current column and fills its cells when not applied', async () => {
+    render(<ExternalIdUpdateTable applied={false} rows={[baseRow]} />);
+    await settle();
+    expect(screen.getByText('Existing (current)')).toBeInTheDocument();
+    expect(screen.getByText('OLD001').closest('td')).toHaveClass('bg-blue-100');
+    expect(screen.getByText('NEW001').closest('td')).toHaveClass(
+      'text-neutral-400',
+    );
+  });
+
+  it('moves the current marker and fill to In file when applied', async () => {
+    render(<ExternalIdUpdateTable applied rows={[baseRow]} />);
+    await settle();
+    expect(screen.getByText('In file (current)')).toBeInTheDocument();
+    expect(screen.getByText('NEW001').closest('td')).toHaveClass('bg-blue-100');
+    expect(screen.getByText('OLD001').closest('td')).toHaveClass(
+      'text-neutral-400',
+    );
+  });
+
+  it('renders a null previousExternalId as an em dash in the Existing column', async () => {
+    render(
+      <ExternalIdUpdateTable
+        applied={false}
+        rows={[{ ...baseRow, previousExternalId: null }]}
+      />,
+    );
+    await settle();
+    expect(screen.getByText('—')).toBeInTheDocument();
+  });
+
+  it('shows the Personalized Timeline column when the feature is on', async () => {
+    render(
+      <ExternalIdUpdateTable
+        applied={false}
+        rows={[{ ...baseRow, timelineAlgorithm: 'fomo' }]}
+        showPersonalizedTimelineFeatures
+      />,
+    );
+    await settle();
+    expect(screen.getByText('Personalized Timeline')).toBeInTheDocument();
+    expect(screen.getByText('Fomo')).toBeInTheDocument();
+  });
+});
diff --git a/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx
index c3a9545e6f7..f9accbe2620 100644
--- a/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx
+++ b/client/app/bundles/course/user-invitations/components/tables/__test__/InvitationResultExistingTable.test.tsx
@@ -1,4 +1,3 @@
-import userEvent from '@testing-library/user-event';
 import { render, screen, waitForElementToBeRemoved } from 'test-utils';
 
 import InvitationResultExistingTable from '../InvitationResultExistingTable';
@@ -59,94 +58,6 @@ describe('InvitationResultExistingTable', () => {
     expect(screen.getByText('Yes')).toBeInTheDocument();
   });
 
-  describe('updated row rendering', () => {
-    it('renders bold externalId with tooltip "Previously: —" when previousExternalId is null', async () => {
-      render(
-        <InvitationResultExistingTable
-          rows={[{ ...baseRow, externalId: 'newId', previousExternalId: null }]}
-        />,
-      );
-      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-      const cell = screen.getByText('newId');
-      expect(cell.tagName).toBe('STRONG');
-      await userEvent.hover(cell);
-      expect(await screen.findByText('Previously: —')).toBeInTheDocument();
-    });
-
-    it('renders bold externalId with tooltip "Previously: oldId" when previousExternalId is a string', async () => {
-      render(
-        <InvitationResultExistingTable
-          rows={[
-            { ...baseRow, externalId: 'newId', previousExternalId: 'oldId' },
-          ]}
-        />,
-      );
-      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-      const cell = screen.getByText('newId');
-      expect(cell.tagName).toBe('STRONG');
-      await userEvent.hover(cell);
-      expect(await screen.findByText('Previously: oldId')).toBeInTheDocument();
-    });
-
-    it('does not bold externalId for rows without previousExternalId', async () => {
-      render(<InvitationResultExistingTable rows={[baseRow]} />);
-      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-      const cell = screen.getByText('aliceExt');
-      expect(cell.tagName).not.toBe('STRONG');
-    });
-
-    it('renders updated rows before non-updated rows', async () => {
-      render(
-        <InvitationResultExistingTable
-          rows={[
-            { ...baseRow, id: 2, name: 'Normal Bob' },
-            {
-              ...baseRow,
-              id: 1,
-              name: 'Updated Alice',
-              externalId: 'newId',
-              previousExternalId: 'oldId',
-            },
-          ]}
-        />,
-      );
-      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-      const normalCell = screen.getByText('Normal Bob');
-      const updatedCell = screen.getByText('Updated Alice');
-      expect(
-        // eslint-disable-next-line no-bitwise
-        normalCell.compareDocumentPosition(updatedCell) &
-          Node.DOCUMENT_POSITION_PRECEDING,
-      ).toBeTruthy();
-    });
-
-    it('applies highlight class to updated rows', async () => {
-      const { container } = render(
-        <InvitationResultExistingTable
-          rows={[
-            { ...baseRow, externalId: 'newId', previousExternalId: 'oldId' },
-          ]}
-        />,
-      );
-      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-      const highlighted = Array.from(container.querySelectorAll('tr')).find(
-        (tr) => tr.className.includes('bg-[#e3f2fd]'),
-      );
-      expect(highlighted).toBeDefined();
-    });
-
-    it('does not apply highlight class to non-updated rows', async () => {
-      const { container } = render(
-        <InvitationResultExistingTable rows={[baseRow]} />,
-      );
-      await waitForElementToBeRemoved(() => screen.queryByRole('progressbar'));
-      const highlighted = Array.from(container.querySelectorAll('tr')).find(
-        (tr) => tr.className.includes('bg-[#e3f2fd]'),
-      );
-      expect(highlighted).toBeUndefined();
-    });
-  });
-
   describe('Personalized Timeline column', () => {
     it('shows column header and algorithm label when showPersonalizedTimelineFeatures is true', async () => {
       render(
diff --git a/client/app/bundles/course/user-invitations/operations.ts b/client/app/bundles/course/user-invitations/operations.ts
index e4668a7602e..59a95738bfb 100644
--- a/client/app/bundles/course/user-invitations/operations.ts
+++ b/client/app/bundles/course/user-invitations/operations.ts
@@ -1,11 +1,10 @@
 import { Operation } from 'store';
 import {
-  ExternalIdResolution,
+  ExternalIdUpdate,
   InvitationFileEntity,
   InvitationPostData,
   InvitationResult,
   InvitationsPostData,
-  PendingExternalIdConflict,
 } from 'types/course/userInvitations';
 
 import CourseAPI from 'api/course';
@@ -77,47 +76,30 @@ export function fetchPermissionsAndSharedData(): Operation {
 
 export function inviteUsersFromFile(
   fileEntity: InvitationFileEntity,
-  resolution?: ExternalIdResolution,
-): Operation<InvitationResult | { conflict: PendingExternalIdConflict }> {
+): Operation<InvitationResult> {
   return async (dispatch) =>
-    CourseAPI.userInvitations
-      .invite(fileEntity, resolution)
-      .then((response) => {
-        const data = response.data;
-        if ('pendingInvitationUpdates' in data) {
-          return {
-            conflict: {
-              pendingInvitationUpdates: data.pendingInvitationUpdates,
-              pendingCourseUserUpdates: data.pendingCourseUserUpdates,
-            },
-          };
-        }
-        dispatch(actions.updateInvitationCounts(data.newInvitations));
-        return JSON.parse(data.invitationResult) as InvitationResult;
-      });
+    CourseAPI.userInvitations.invite(fileEntity).then((response) => {
+      const data = response.data;
+      dispatch(actions.updateInvitationCounts(data.newInvitations));
+      return JSON.parse(data.invitationResult) as InvitationResult;
+    });
+}
+
+export function updateExternalIds(updates: ExternalIdUpdate[]): Operation {
+  return async () =>
+    CourseAPI.userInvitations.updateExternalIds(updates).then(() => undefined);
 }
 
 export function inviteUsersFromForm(
   postData: InvitationsPostData,
-  resolution?: ExternalIdResolution,
-): Operation<InvitationResult | { conflict: PendingExternalIdConflict }> {
+): Operation<InvitationResult> {
   const formattedData = formatInvitations(postData.invitations);
   return async (dispatch) =>
-    CourseAPI.userInvitations
-      .invite(formattedData, resolution)
-      .then((response) => {
-        const data = response.data;
-        if ('pendingInvitationUpdates' in data) {
-          return {
-            conflict: {
-              pendingInvitationUpdates: data.pendingInvitationUpdates,
-              pendingCourseUserUpdates: data.pendingCourseUserUpdates,
-            },
-          };
-        }
-        dispatch(actions.updateInvitationCounts(data.newInvitations));
-        return JSON.parse(data.invitationResult) as InvitationResult;
-      });
+    CourseAPI.userInvitations.invite(formattedData).then((response) => {
+      const data = response.data;
+      dispatch(actions.updateInvitationCounts(data.newInvitations));
+      return JSON.parse(data.invitationResult) as InvitationResult;
+    });
 }
 
 export function resendAllInvitations(): Operation {
diff --git a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx
index d9b9daeb577..4dedfc45ee7 100644
--- a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx
+++ b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/__test__/index.test.tsx
@@ -9,25 +9,29 @@ let capturedOnSubmit:
   | ((data: { file: InvitationFileEntity }) => Promise<void>)
   | null = null;
 
-const MockFileUploadForm = ({
-  open,
-  onSubmit,
-}: {
-  open: boolean;
-  onSubmit: (data: { file: InvitationFileEntity }) => Promise<void>;
-}): JSX.Element | null => {
-  capturedOnSubmit = onSubmit;
-  return open ? <button data-testid="mock-file-submit" type="button" /> : null;
-};
-MockFileUploadForm.displayName = 'MockFileUploadForm';
-
-jest.mock(
-  '../../../components/forms/InviteUsersFileUploadForm',
-  () => MockFileUploadForm,
-);
+// jest.mock is hoisted before variable declarations, so MockFileUploadForm must be
+// defined inside the factory (not as a module-level variable referenced in the factory).
+jest.mock('../../../components/forms/InviteUsersFileUploadForm', () => {
+  const MockFileUploadForm = ({
+    open,
+    onSubmit,
+  }: {
+    open: boolean;
+    onSubmit: (data: { file: InvitationFileEntity }) => Promise<void>;
+  }): JSX.Element | null => {
+    capturedOnSubmit = onSubmit;
+    return open ? (
+      <button data-testid="mock-file-submit" type="button" />
+    ) : null;
+  };
+  MockFileUploadForm.displayName = 'MockFileUploadForm';
+  return MockFileUploadForm;
+});
 
 const mockInviteUsersFromFile = jest.fn(
-  (): ((_dispatch: unknown) => Promise<object>) =>
+  (
+    _fileEntity: InvitationFileEntity,
+  ): ((_dispatch: unknown) => Promise<object>) =>
     (_dispatch: unknown): Promise<object> =>
       Promise.resolve({
         newInvitations: [],
@@ -35,14 +39,14 @@ const mockInviteUsersFromFile = jest.fn(
         newCourseUsers: [],
         existingCourseUsers: [],
         failedUsers: [],
-        updatedInvitations: [],
-        updatedCourseUsers: [],
+        pendingInvitationUpdates: [],
+        pendingCourseUserUpdates: [],
       }),
 );
 
 jest.mock('../../../operations', () => ({
-  inviteUsersFromFile: (...args: unknown[]): unknown =>
-    mockInviteUsersFromFile(...args),
+  inviteUsersFromFile: (fileEntity: InvitationFileEntity): unknown =>
+    mockInviteUsersFromFile(fileEntity),
   fetchInvitations: jest.fn(
     (): (() => Promise<void>) => (): Promise<void> => Promise.resolve(),
   ),
@@ -82,7 +86,7 @@ describe('<InviteUsersFileUpload />', () => {
 
     expect(mockInviteUsersFromFile).toHaveBeenCalledTimes(1);
     const firstArg = mockInviteUsersFromFile.mock
-      .calls[0][0] as InvitationFileEntity;
+      .calls[0]![0] as InvitationFileEntity;
 
     // Regression guard: the page must extract .file from the IFormInputs wrapper.
     // If the bug regresses, firstArg would be { file: InvitationFileEntity } and
diff --git a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
index 5b3bdbff333..d25abb3bf3f 100644
--- a/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
+++ b/client/app/bundles/course/user-invitations/pages/InviteUsersFileUpload/index.tsx
@@ -1,11 +1,10 @@
-import { FC, ReactNode, useRef, useState } from 'react';
+import { FC, ReactNode } from 'react';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import DownloadIcon from '@mui/icons-material/Download';
 import { Typography } from '@mui/material';
 import {
   InvitationFileEntity,
   InvitationResult,
-  PendingExternalIdConflict,
 } from 'types/course/userInvitations';
 
 import { getCourseUserInviteTemplatePath } from 'course/helper';
@@ -15,7 +14,6 @@ import toast from 'lib/hooks/toast';
 import useTranslation from 'lib/hooks/useTranslation';
 
 import FileUploadForm from '../../components/forms/InviteUsersFileUploadForm';
-import ExternalIdConflictPrompt from '../../components/misc/ExternalIdConflictPrompt';
 import { inviteUsersFromFile } from '../../operations';
 import {
   getManageCourseUserPermissions,
@@ -65,7 +63,7 @@ const translations = defineMessages({
   fileUploadInfoExternalId: {
     id: 'course.userInvitations.InviteUsersFileUpload.fileUploadInfoExternalId',
     defaultMessage:
-      'External ID is optional. If provided, it overwrites any existing external ID for the user and must be unique within the course.',
+      'External ID is optional. If provided, it must be unique within the course.',
   },
   exampleHeader: {
     id: 'course.userInvitations.InviteUsersFileUpload.exampleHeader',
@@ -106,16 +104,12 @@ const InviteUsersFileUpload: FC<Props> = (props) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
 
-  const fileRef = useRef<InvitationFileEntity | null>(null);
-  const [conflictData, setConflictData] =
-    useState<PendingExternalIdConflict | null>(null);
-
   const sharedData = useAppSelector(getManageCourseUsersSharedData);
   const permissions = useAppSelector(getManageCourseUserPermissions);
 
   const defaultTimelineAlgorithm = sharedData.defaultTimelineAlgorithm;
 
-  if (!open && !conflictData) {
+  if (!open) {
     return null;
   }
 
@@ -138,41 +132,14 @@ const InviteUsersFileUpload: FC<Props> = (props) => {
     }
   };
 
-  const submitWithResolution = (
-    fileEntity: InvitationFileEntity,
-    resolution?: 'keep_existing' | 'replace_all',
-  ): Promise<void> =>
-    dispatch(inviteUsersFromFile(fileEntity, resolution))
-      .then((response) => {
-        if ('conflict' in response) {
-          setConflictData(response.conflict);
-        } else {
-          onClose();
-          openResultDialog(response as InvitationResult);
-        }
+  const onSubmit = (data: { file: InvitationFileEntity }): Promise<void> =>
+    dispatch(inviteUsersFromFile(data.file))
+      .then((result) => {
+        onClose();
+        openResultDialog(result);
       })
       .catch(handleError);
 
-  const onSubmit = (data: { file: InvitationFileEntity }): Promise<void> => {
-    fileRef.current = data.file;
-    return submitWithResolution(data.file);
-  };
-
-  const handleKeepExisting = (): void => {
-    setConflictData(null);
-    if (fileRef.current) submitWithResolution(fileRef.current, 'keep_existing');
-  };
-
-  const handleReplaceAll = (): void => {
-    setConflictData(null);
-    if (fileRef.current) submitWithResolution(fileRef.current, 'replace_all');
-  };
-
-  const handleCancel = (): void => {
-    setConflictData(null);
-    fileRef.current = null;
-  };
-
   const formSubtitle = (
     <>
       <Typography variant="body2">{t(translations.fileUploadInfo)}</Typography>
@@ -241,23 +208,12 @@ const InviteUsersFileUpload: FC<Props> = (props) => {
   );
 
   return (
-    <>
-      {conflictData && (
-        <ExternalIdConflictPrompt
-          onCancel={handleCancel}
-          onKeepExisting={handleKeepExisting}
-          onReplaceAll={handleReplaceAll}
-          pendingCourseUserUpdates={conflictData.pendingCourseUserUpdates}
-          pendingInvitationUpdates={conflictData.pendingInvitationUpdates}
-        />
-      )}
-      <FileUploadForm
-        formSubtitle={formSubtitle}
-        onClose={onClose}
-        onSubmit={onSubmit}
-        open={open}
-      />
-    </>
+    <FileUploadForm
+      formSubtitle={formSubtitle}
+      onClose={onClose}
+      onSubmit={onSubmit}
+      open={open}
+    />
   );
 };
 
diff --git a/client/app/types/course/userInvitations.ts b/client/app/types/course/userInvitations.ts
index 691cf0b5b5d..b1ab4153174 100644
--- a/client/app/types/course/userInvitations.ts
+++ b/client/app/types/course/userInvitations.ts
@@ -28,15 +28,16 @@ export interface InvitationResult {
   existingInvitations?: InvitationListData[];
   newCourseUsers?: CourseUserData[];
   newInvitations?: InvitationListData[];
-  updatedCourseUsers?: InvitationUpdatedItem[];
-  updatedInvitations?: InvitationUpdatedItem[];
+  pendingCourseUserUpdates?: InvitationUpdatedItem[];
+  pendingInvitationUpdates?: InvitationUpdatedItem[];
 }
 
-export type ExternalIdResolution = 'keep_existing' | 'replace_all';
+export type ExternalIdUpdateType = 'course_user' | 'invitation';
 
-export interface PendingExternalIdConflict {
-  pendingInvitationUpdates: InvitationUpdatedItem[];
-  pendingCourseUserUpdates: InvitationUpdatedItem[];
+export interface ExternalIdUpdate {
+  type: ExternalIdUpdateType;
+  id: number;
+  externalId: string | null;
 }
 
 export interface InvitationSuccessRow {
diff --git a/client/locales/en.json b/client/locales/en.json
index cbcf00b1b6d..ac36849d7ce 100644
--- a/client/locales/en.json
+++ b/client/locales/en.json
@@ -1,4 +1,7 @@
 {
+  "2kgbTg": {
+    "defaultMessage": "Role-Playing Assessment"
+  },
   "announcements.GlobalAnnouncementIndex.fetchAnnouncementsFailure": {
     "defaultMessage": "Unable to fetch announcements"
   },
@@ -29,6 +32,9 @@
   "app.DashboardPage.yourCourses": {
     "defaultMessage": "Your Courses"
   },
+  "app.ErrorPage.courseSuspended": {
+    "defaultMessage": "This course is suspended."
+  },
   "app.ErrorPage.error": {
     "defaultMessage": "KABOOM, a meteor has just crashed."
   },
@@ -59,14 +65,11 @@
   "app.ErrorPage.notFoundSubtitle": {
     "defaultMessage": "Check if you've typed the correct address, try again later, or <home>go back home</home>."
   },
-  "app.ErrorPage.userSuspended": {
-    "defaultMessage": "Your access to this course has been suspended."
-  },
   "app.ErrorPage.suspendedSubtitle": {
     "defaultMessage": "Please contact your instructors or the course staff."
   },
-  "app.ErrorPage.courseSuspended": {
-    "defaultMessage": "This course is suspended."
+  "app.ErrorPage.userSuspended": {
+    "defaultMessage": "Your access to this course has been suspended."
   },
   "app.Footer.contactUs": {
     "defaultMessage": "Contact Us"
@@ -80,12 +83,12 @@
   "app.Footer.instructorsGuide": {
     "defaultMessage": "Instructors' Guide"
   },
-  "app.Footer.reportIssue": {
-    "defaultMessage": "Report an Issue"
-  },
   "app.Footer.privacyPolicy": {
     "defaultMessage": "Privacy Policy"
   },
+  "app.Footer.reportIssue": {
+    "defaultMessage": "Report an Issue"
+  },
   "app.Footer.termsOfService": {
     "defaultMessage": "Terms of Service"
   },
@@ -101,6 +104,9 @@
   "assessment.attemptLoader.errorAttemptingAssessment": {
     "defaultMessage": "An error occurred while attempting this assessment. Try again later."
   },
+  "bW7B87": {
+    "defaultMessage": "New"
+  },
   "client.video.attemptLoader.errorWatchVideo": {
     "defaultMessage": "An error occurred while attempting to watch this video. Try again later."
   },
@@ -263,23 +269,23 @@
   "course.achievement.AchievementAward.AchievementAwardManager.saveChanges": {
     "defaultMessage": "Save Changes"
   },
+  "course.achievement.AchievementAward.AchievementAwardSummary.awardedStudents": {
+    "defaultMessage": "Awarded Students"
+  },
   "course.achievement.AchievementAward.AchievementAwardSummary.name": {
     "defaultMessage": "Name"
   },
-  "course.achievement.AchievementAward.AchievementAwardSummary.userType": {
-    "defaultMessage": "User Type"
+  "course.achievement.AchievementAward.AchievementAwardSummary.normalStudent": {
+    "defaultMessage": "Normal Student"
   },
-  "course.achievement.AchievementAward.AchievementAwardSummary.awardedStudents": {
-    "defaultMessage": "Awarded Students"
+  "course.achievement.AchievementAward.AchievementAwardSummary.phantomStudent": {
+    "defaultMessage": "Phantom Student"
   },
   "course.achievement.AchievementAward.AchievementAwardSummary.revokedStudents": {
     "defaultMessage": "Revoked Students"
   },
-  "course.achievement.AchievementAward.AchievementAwardSummary.phantomStudent": {
-    "defaultMessage": "Phantom Student"
-  },
-  "course.achievement.AchievementAward.AchievementAwardSummary.normalStudent": {
-    "defaultMessage": "Normal Student"
+  "course.achievement.AchievementAward.AchievementAwardSummary.userType": {
+    "defaultMessage": "User Type"
   },
   "course.achievement.AchievementAward.awardAchievement": {
     "defaultMessage": "Award Achievement"
@@ -353,26 +359,26 @@
   "course.achievement.AchievementShow.studentsWithAchievement": {
     "defaultMessage": "Students with this achievement"
   },
-  "course.achievement.AchievementTable.noAchievement": {
-    "defaultMessage": "No achievement"
+  "course.achievement.AchievementTable.actions": {
+    "defaultMessage": "Actions"
   },
   "course.achievement.AchievementTable.badge": {
     "defaultMessage": "Badge"
   },
-  "course.achievement.AchievementTable.title": {
-    "defaultMessage": "Title"
-  },
   "course.achievement.AchievementTable.description": {
     "defaultMessage": "Description"
   },
-  "course.achievement.AchievementTable.requirements": {
-    "defaultMessage": "Requirements"
+  "course.achievement.AchievementTable.noAchievement": {
+    "defaultMessage": "No achievement"
   },
   "course.achievement.AchievementTable.published": {
     "defaultMessage": "Published"
   },
-  "course.achievement.AchievementTable.actions": {
-    "defaultMessage": "Actions"
+  "course.achievement.AchievementTable.requirements": {
+    "defaultMessage": "Requirements"
+  },
+  "course.achievement.AchievementTable.title": {
+    "defaultMessage": "Title"
   },
   "course.achievement.AchievementsIndex.achievements": {
     "defaultMessage": "Achievements"
@@ -515,45 +521,6 @@
   "course.admin.AssessmentSettings.toTab": {
     "defaultMessage": "to {tab}"
   },
-  "course.admin.CodaveriSettings.codaveriModel": {
-    "defaultMessage": "Model"
-  },
-  "course.admin.CodaveriSettings.codaveriModelDescription": {
-    "defaultMessage": "The AI model used by Codaveri to generate help conversations with students for programming questions."
-  },
-  "course.admin.CodaveriSettings.codaveriSystemPromptDescription": {
-    "defaultMessage": "You may customize the behavior of the Codaveri model by providing instructions here. {br} When assisting students, these instructions will be followed in addition to any you have set on the question itself.{br}To reference question-specific details, you may use the following variables within the prompt, writing them with brackets as shown below:"
-  },
-  "course.admin.CodaveriSettings.codaveriSystemPromptProblemDescriptionLine": {
-    "defaultMessage": "{problemDescriptionVar} : The full description of the coding problem."
-  },
-  "course.admin.CodaveriSettings.codaveriSystemPromptStudentFilePathsLine": {
-    "defaultMessage": "{studentFilePathsVar} : A comma-separated list of file paths the student is working on."
-  },
-  "course.admin.CodaveriSettings.codaveriSettings": {
-    "defaultMessage": "Codaveri settings"
-  },
-  "course.admin.CodaveriSettings.codaveriSettingsSubtitle": {
-    "defaultMessage": "This is currently an experimental feature. Codaveri provides code evaluation and automated code feedback services for students' codes."
-  },
-  "course.admin.CodaveriSettings.feedbackWorkflow": {
-    "defaultMessage": "Automatic Post-Submission Comments"
-  },
-  "course.admin.CodaveriSettings.feedbackWorkflowDescription": {
-    "defaultMessage": "When a submission with programming question is finalised,"
-  },
-  "course.admin.CodaveriSettings.feedbackWorkflowNone": {
-    "defaultMessage": "Generate no feedback"
-  },
-  "course.admin.CodaveriSettings.feedbackWorkflowDraft": {
-    "defaultMessage": "Generate feedback as a draft requiring approval from staff"
-  },
-  "course.admin.CodaveriSettings.feedbackWorkflowPublish": {
-    "defaultMessage": "Publish feedback directly to student"
-  },
-  "course.admin.CodaveriSettings.error": {
-    "defaultMessage": "An error occurred while updating the codaveri setting."
-  },
   "course.admin.CodaveriSettings.Some": {
     "defaultMessage": "Some"
   },
@@ -569,32 +536,80 @@
   "course.admin.CodaveriSettings.codaveriEngineDescription": {
     "defaultMessage": "Type of codaveri engine used to generate programming code feedback"
   },
+  "course.admin.CodaveriSettings.codaveriEvaluatorSettings": {
+    "defaultMessage": "Codaveri Evaluator"
+  },
+  "course.admin.CodaveriSettings.codaveriModel": {
+    "defaultMessage": "Model"
+  },
+  "course.admin.CodaveriSettings.codaveriModelDescription": {
+    "defaultMessage": "The AI model used by Codaveri to generate help conversations with students for programming questions."
+  },
   "course.admin.CodaveriSettings.codaveriOverrideSystemPrompt": {
     "defaultMessage": "Use a custom system prompt"
   },
   "course.admin.CodaveriSettings.codaveriOverrideSystemPromptDescription": {
     "defaultMessage": "When assisting students, these instructions will be followed in addition to any you have set on the question itself. To reference question-specific details, you may use these variables within the prompt, writing them with brackets as shown below:"
   },
+  "course.admin.CodaveriSettings.codaveriSettings": {
+    "defaultMessage": "Codaveri settings"
+  },
+  "course.admin.CodaveriSettings.codaveriSettingsSubtitle": {
+    "defaultMessage": "This is currently an experimental feature. Codaveri provides code evaluation and automated code feedback services for students' codes."
+  },
   "course.admin.CodaveriSettings.codaveriSystemPrompt": {
     "defaultMessage": "System Prompt"
   },
+  "course.admin.CodaveriSettings.codaveriSystemPromptDescription": {
+    "defaultMessage": "The Codaveri system prompt controls AI behavior when interacting with students."
+  },
+  "course.admin.CodaveriSettings.codaveriSystemPromptProblemDescriptionLine": {
+    "defaultMessage": "{problemDescriptionVar} : The full description of the coding problem."
+  },
+  "course.admin.CodaveriSettings.codaveriSystemPromptStudentFilePathsLine": {
+    "defaultMessage": "{studentFilePathsVar} : A comma-separated list of file paths the student is working on."
+  },
   "course.admin.CodaveriSettings.codaveriUseDefaultSystemPrompt": {
     "defaultMessage": "Use the default system prompt"
   },
+  "course.admin.CodaveriSettings.enableDisableButton": {
+    "defaultMessage": "{enabled, select, true {Enable} other {Disable}}"
+  },
+  "course.admin.CodaveriSettings.enableDisableEvaluator": {
+    "defaultMessage": "{enabled, select, true {Enable } other {Disable }} Codaveri Evaluator for {questionCount} programming questions in {title}?"
+  },
+  "course.admin.CodaveriSettings.enableDisableEvaluatorDescription": {
+    "defaultMessage": "{questionCount} programming questions in this {type} will use {enabled, select, true {Codaveri } other {Default }} evaluator"
+  },
+  "course.admin.CodaveriSettings.enableDisableLiveFeedback": {
+    "defaultMessage": "{enabled, select, true {Enable } other {Disable }} Get Help for {questionCount} programming questions in {title}?"
+  },
+  "course.admin.CodaveriSettings.errorOccurredWhenUpdatingCodaveriEvaluatorSettings": {
+    "defaultMessage": "An error occurred while updating the codaveri evaluator settings."
+  },
+  "course.admin.CodaveriSettings.errorOccurredWhenUpdatingLiveFeedbackSettings": {
+    "defaultMessage": "An error occurred while updating the Get Help settings."
+  },
   "course.admin.CodaveriSettings.evaluatorUpdateSuccess": {
     "defaultMessage": "{question} is now using {evaluator} evaluator"
   },
   "course.admin.CodaveriSettings.expandAll": {
     "defaultMessage": "Expand All Questions"
   },
-  "course.admin.CodaveriSettings.programmingQuestionSettings": {
-    "defaultMessage": "Programming Question Settings"
+  "course.admin.CodaveriSettings.feedbackWorkflow": {
+    "defaultMessage": "Automatic Post-Submission Comments"
   },
-  "course.admin.CodaveriSettings.programmingQuestionSettingsSubtitle": {
-    "defaultMessage": "Enable/disable Codaveri as evaluator for programming questions in various assessments."
+  "course.admin.CodaveriSettings.feedbackWorkflowDescription": {
+    "defaultMessage": "When a submission with programming question is finalised,"
   },
-  "course.admin.CodaveriSettings.succesfulUpdateAllEvaluator": {
-    "defaultMessage": "Successfully updated all questions to use {evaluator} evaluator"
+  "course.admin.CodaveriSettings.feedbackWorkflowDraft": {
+    "defaultMessage": "Generate feedback as a draft requiring approval from staff"
+  },
+  "course.admin.CodaveriSettings.feedbackWorkflowNone": {
+    "defaultMessage": "Generate no feedback"
+  },
+  "course.admin.CodaveriSettings.feedbackWorkflowPublish": {
+    "defaultMessage": "Publish feedback directly to student"
   },
   "course.admin.CodaveriSettings.getHelpUsageLimit": {
     "defaultMessage": "Limit Get Help messages per student"
@@ -602,35 +617,23 @@
   "course.admin.CodaveriSettings.getHelpUsageLimitDescription": {
     "defaultMessage": "If enabled, students will only be able to send a limited number of messages per question. Students will be able to see this limit and how many messages they have left."
   },
-  "course.admin.CodaveriSettings.maxGetHelpUserMessages": {
-    "defaultMessage": "Maximum messages per question"
-  },
-  "course.admin.CodaveriSettings.errorOccurredWhenUpdatingCodaveriEvaluatorSettings": {
-    "defaultMessage": "An error occurred while updating the codaveri evaluator settings."
-  },
-  "course.admin.CodaveriSettings.codaveriEvaluatorSettings": {
-    "defaultMessage": "Codaveri Evaluator"
+  "course.admin.CodaveriSettings.liveFeedbackEnabledUpdateSuccess": {
+    "defaultMessage": "Get Help for {question} is now {liveFeedbackEnabled, select, true {enabled} other {disabled}}"
   },
   "course.admin.CodaveriSettings.liveFeedbackSettings": {
     "defaultMessage": "Get Help"
   },
-  "course.admin.CodaveriSettings.errorOccurredWhenUpdatingLiveFeedbackSettings": {
-    "defaultMessage": "An error occurred while updating the Get Help settings."
-  },
-  "course.admin.CodaveriSettings.enableDisableButton": {
-    "defaultMessage": "{enabled, select, true {Enable} other {Disable}}"
-  },
-  "course.admin.CodaveriSettings.enableDisableEvaluator": {
-    "defaultMessage": "{enabled, select, true {Enable } other {Disable }} Codaveri Evaluator for {questionCount} programming questions in {title}?"
+  "course.admin.CodaveriSettings.maxGetHelpUserMessages": {
+    "defaultMessage": "Maximum messages per question"
   },
-  "course.admin.CodaveriSettings.enableDisableLiveFeedback": {
-    "defaultMessage": "{enabled, select, true {Enable } other {Disable }} Get Help for {questionCount} programming questions in {title}?"
+  "course.admin.CodaveriSettings.programmingQuestionSettings": {
+    "defaultMessage": "Programming Question Settings"
   },
-  "course.admin.CodaveriSettings.enableDisableEvaluatorDescription": {
-    "defaultMessage": "{questionCount} programming questions in this {type} will use {enabled, select, true {Codaveri } other {Default }} evaluator"
+  "course.admin.CodaveriSettings.programmingQuestionSettingsSubtitle": {
+    "defaultMessage": "Enable/disable Codaveri as evaluator for programming questions in various assessments."
   },
-  "course.admin.CodaveriSettings.liveFeedbackEnabledUpdateSuccess": {
-    "defaultMessage": "Get Help for {question} is now {liveFeedbackEnabled, select, true {enabled} other {disabled}}"
+  "course.admin.CodaveriSettings.succesfulUpdateAllEvaluator": {
+    "defaultMessage": "Successfully updated all questions to use {evaluator} evaluator"
   },
   "course.admin.CodaveriSettings.successfulUpdateAllLiveFeedbackEnabled": {
     "defaultMessage": "Successfully {liveFeedbackEnabled, select, true {enabled} other {disabled}} Get Help for all questions"
@@ -647,9 +650,15 @@
   "course.admin.ComponentSettings.errorOccurredWhenUpdatingComponents": {
     "defaultMessage": "An error occurred while updating the component settings."
   },
+  "course.admin.ComponentSettings.settingUpComponent": {
+    "defaultMessage": "Setting up component for this course"
+  },
   "course.admin.CourseSettings.allowUsersToSendEnrolmentRequests": {
     "defaultMessage": "Allow users to send enrolment requests"
   },
+  "course.admin.CourseSettings.autoApproveEnrolmentRequests": {
+    "defaultMessage": "Automatically approve enrolment requests"
+  },
   "course.admin.CourseSettings.clearChanges": {
     "defaultMessage": "Clear changes"
   },
@@ -677,6 +686,12 @@
   "course.admin.CourseSettings.courseSettings": {
     "defaultMessage": "Course settings"
   },
+  "course.admin.CourseSettings.courseSuspensionMessage": {
+    "defaultMessage": "Course suspension message"
+  },
+  "course.admin.CourseSettings.courseSuspensionMessageDescription": {
+    "defaultMessage": "This message will be shown to users while this course is suspended. Leave blank to show a default message."
+  },
   "course.admin.CourseSettings.daysInAdvance": {
     "defaultMessage": "Days in advance"
   },
@@ -764,23 +779,14 @@
   "course.admin.CourseSettings.stragglersDescription": {
     "defaultMessage": "Leave no one behind; subsequent closing reference timings will be pushed back if students complete their assessments late."
   },
-  "course.admin.CourseSettings.suspension": {
-    "defaultMessage": "Access suspension"
-  },
   "course.admin.CourseSettings.suspendCourse": {
     "defaultMessage": "Suspend course"
   },
   "course.admin.CourseSettings.suspendCourseDescription": {
     "defaultMessage": "A suspended course is inaccessible to all students. Instructors can still access the course and all student data will be retained."
   },
-  "course.admin.CourseSettings.unsuspendCourse": {
-    "defaultMessage": "Unsuspend course"
-  },
-  "course.admin.CourseSettings.courseSuspensionMessage": {
-    "defaultMessage": "Course suspension message"
-  },
-  "course.admin.CourseSettings.courseSuspensionMessageDescription": {
-    "defaultMessage": "This message will be shown to users while this course is suspended. Leave blank to show a default message."
+  "course.admin.CourseSettings.suspendCourseFailure": {
+    "defaultMessage": "An error occurred while suspending this course."
   },
   "course.admin.CourseSettings.suspendCoursePromptText": {
     "defaultMessage": "Are you sure you want to suspend this course? All students will not be able to access it until it is unsuspended."
@@ -788,20 +794,8 @@
   "course.admin.CourseSettings.suspendCourseSuccess": {
     "defaultMessage": "This course has been suspended."
   },
-  "course.admin.CourseSettings.suspendCourseFailure": {
-    "defaultMessage": "An error occurred while suspending this course."
-  },
-  "course.admin.CourseSettings.unsuspendCourseSuccess": {
-    "defaultMessage": "This course has been unsuspended."
-  },
-  "course.admin.CourseSettings.unsuspendCourseFailure": {
-    "defaultMessage": "An error occurred while unsuspending this course."
-  },
-  "course.admin.CourseSettings.userSuspensionMessage": {
-    "defaultMessage": "User suspension message"
-  },
-  "course.admin.CourseSettings.userSuspensionMessageDescription": {
-    "defaultMessage": "This message will be shown to individual users whose access to this course has been suspended. Leave blank to show a default message."
+  "course.admin.CourseSettings.suspension": {
+    "defaultMessage": "Access suspension"
   },
   "course.admin.CourseSettings.timeSettings": {
     "defaultMessage": "Time settings"
@@ -812,12 +806,27 @@
   "course.admin.CourseSettings.titleRequired": {
     "defaultMessage": "Course name is required."
   },
+  "course.admin.CourseSettings.unsuspendCourse": {
+    "defaultMessage": "Unsuspend course"
+  },
+  "course.admin.CourseSettings.unsuspendCourseFailure": {
+    "defaultMessage": "An error occurred while unsuspending this course."
+  },
+  "course.admin.CourseSettings.unsuspendCourseSuccess": {
+    "defaultMessage": "This course has been unsuspended."
+  },
   "course.admin.CourseSettings.uploadANewImage": {
     "defaultMessage": "Choose a new image"
   },
   "course.admin.CourseSettings.uploadingLogo": {
     "defaultMessage": "Uploading your new logo..."
   },
+  "course.admin.CourseSettings.userSuspensionMessage": {
+    "defaultMessage": "User suspension message"
+  },
+  "course.admin.CourseSettings.userSuspensionMessageDescription": {
+    "defaultMessage": "This message will be shown to individual users whose access to this course has been suspended. Leave blank to show a default message."
+  },
   "course.admin.CourseSettingst.confirmDeletePlaceholder": {
     "defaultMessage": "This is your last chance to go back!"
   },
@@ -924,7 +933,10 @@
     "defaultMessage": "Component Item Settings"
   },
   "course.admin.LessonPlanSettings.lessonPlanItemSettings": {
-    "defaultMessage": "Lesson Plan Item Settings"
+    "defaultMessage": "Item Settings"
+  },
+  "course.admin.LessonPlanSettings.lessonPlanSettings": {
+    "defaultMessage": "Lesson Plan Settings"
   },
   "course.admin.LessonPlanSettings.noLessonPlanItems": {
     "defaultMessage": "There are no lesson plan items to configure for lesson plan display."
@@ -941,11 +953,14 @@
   "course.admin.MaterialSettings.materialsSettings": {
     "defaultMessage": "Materials settings"
   },
+  "course.admin.NotificationSettings.component": {
+    "defaultMessage": "Component"
+  },
   "course.admin.NotificationSettings.description": {
     "defaultMessage": "Description"
   },
   "course.admin.NotificationSettings.emailSettings": {
-    "defaultMessage": "Email Settings"
+    "defaultMessage": "Email settings"
   },
   "course.admin.NotificationSettings.noEmailSettings": {
     "defaultMessage": "None of the enabled components have email settings."
@@ -1058,32 +1073,152 @@
   "course.admin.NotificationSettings.updateSuccess": {
     "defaultMessage": "The email setting \"{setting}\" for {user} users has been {action}."
   },
-  "course.admin.SidebarSettings.errorOccurredWhenUpdatingSidebar": {
-    "defaultMessage": "An error occurred while updating the sidebar ordering."
+  "course.admin.RagWiseSettings.ForumKnowledgeBaseSwitch.addFailure": {
+    "defaultMessage": "{forum} could not be added to knowledge base."
   },
-  "course.admin.SidebarSettings.sidebarSettings": {
-    "defaultMessage": "Student's sidebar ordering"
+  "course.admin.RagWiseSettings.ForumKnowledgeBaseSwitch.addSuccess": {
+    "defaultMessage": "{forum} {n, plural, one {has} other {have}} been added to knowledge base."
   },
-  "course.admin.SidebarSettings.sidebarSettingsSubtitle": {
-    "defaultMessage": "Drag and drop the sidebar items to rearrange."
+  "course.admin.RagWiseSettings.ForumKnowledgeBaseSwitch.pendingImport": {
+    "defaultMessage": "Please wait as your request to import forums into knowledge base is being processed. You may close this window while importing is in progress."
   },
-  "course.admin.SidebarSettings.sidebarSettingsUpdated": {
-    "defaultMessage": "The new sidebar ordering has been applied. Refresh to see the latest changes."
+  "course.admin.RagWiseSettings.ForumKnowledgeBaseSwitch.removeFailure": {
+    "defaultMessage": "{forum} could not be removed from knowledge base."
   },
-  "course.admin.VideosSettings.addATab": {
-    "defaultMessage": "Add a tab"
+  "course.admin.RagWiseSettings.ForumKnowledgeBaseSwitch.removeSuccess": {
+    "defaultMessage": "{forum} {n, plural, one {has} other {have}} been removed from knowledge base."
   },
-  "course.admin.VideosSettings.deleteTabPromptAction": {
-    "defaultMessage": "Delete {title} tab"
+  "course.admin.RagWiseSettings.KnowledgeBaseSwitch.addFailure": {
+    "defaultMessage": "{material} could not be added to knowledge base."
   },
-  "course.admin.VideosSettings.deleteTabPromptMessage": {
-    "defaultMessage": "Deleting this tab will delete all its associated videos and statistics. This action is irreversible."
+  "course.admin.RagWiseSettings.KnowledgeBaseSwitch.addSuccess": {
+    "defaultMessage": "{material} {n, plural, one {has} other {have}} been added to knowledge base."
   },
-  "course.admin.VideosSettings.deleteTabPromptTitle": {
-    "defaultMessage": "Delete {title} tab?"
+  "course.admin.RagWiseSettings.KnowledgeBaseSwitch.pendingAdd": {
+    "defaultMessage": "Please wait as your request to add materials into knowledge base is being processed. You may close this window while adding is in progress."
   },
-  "course.admin.VideosSettings.errorOccurredWhenCreatingTab": {
-    "defaultMessage": "An error occurred while creating a tab."
+  "course.admin.RagWiseSettings.KnowledgeBaseSwitch.removeFailure": {
+    "defaultMessage": "{material} could not be removed from knowledge base."
+  },
+  "course.admin.RagWiseSettings.KnowledgeBaseSwitch.removeSuccess": {
+    "defaultMessage": "{material} {n, plural, one {has} other {have}} been removed from knowledge base."
+  },
+  "course.admin.RagWiseSettings.expandAll": {
+    "defaultMessage": "Expand all {object}"
+  },
+  "course.admin.RagWiseSettings.forumSectionSubtitle": {
+    "defaultMessage": "Manage the inclusion or exclusion of forum data from related courses in the knowledge base, allowing users to control its availability to the LLM for generating responses."
+  },
+  "course.admin.RagWiseSettings.forumSectionTitle": {
+    "defaultMessage": "No related courses found."
+  },
+  "course.admin.RagWiseSettings.knowledgeBaseStatusSettings": {
+    "defaultMessage": "Knowledge Base"
+  },
+  "course.admin.RagWiseSettings.materialsSectionSubtitle": {
+    "defaultMessage": "Add/remove pdf/docx/ipynb/txt files in knowledge base, allowing users to control its availability to the LLM for generating responses."
+  },
+  "course.admin.RagWiseSettings.materialsSectionTitle": {
+    "defaultMessage": "Materials"
+  },
+  "course.admin.RagWiseSettings.ragWiseSettings": {
+    "defaultMessage": "RagWise settings"
+  },
+  "course.admin.RagWiseSettings.ragWiseSettingsSubtitle": {
+    "defaultMessage": "This is currently an experimental feature. RagWise uses Retrieval-Augmented Generation to generate contextually aware responses to student's query on forum."
+  },
+  "course.admin.RagWiseSettings.responseWorkflowAuto": {
+    "defaultMessage": "Automatically respond"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowDescription": {
+    "defaultMessage": "When students post a question on forum,"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowDraft": {
+    "defaultMessage": "Always draft"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowDraftDescription": {
+    "defaultMessage": "Generated response will be drafted."
+  },
+  "course.admin.RagWiseSettings.responseWorkflowHighTrust": {
+    "defaultMessage": "High trust"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowLowTrust": {
+    "defaultMessage": "Low trust"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowLowTrustDescription": {
+    "defaultMessage": "Generated response will be conditionally published with {trust}% trust."
+  },
+  "course.admin.RagWiseSettings.responseWorkflowNoAuto": {
+    "defaultMessage": "Do not automatically respond"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowPublish": {
+    "defaultMessage": "Always publish"
+  },
+  "course.admin.RagWiseSettings.responseWorkflowPublishDescription": {
+    "defaultMessage": "Generated response will be immediately published."
+  },
+  "course.admin.RagWiseSettings.responseWorkflowTitle": {
+    "defaultMessage": "Automatic Forum Response"
+  },
+  "course.admin.RagWiseSettings.roleplayCharacter": {
+    "defaultMessage": "Specified Character Prompt"
+  },
+  "course.admin.RagWiseSettings.roleplayCharacterLabel": {
+    "defaultMessage": "Character prompt (Max 200 Characters)"
+  },
+  "course.admin.RagWiseSettings.roleplayDeadpool": {
+    "defaultMessage": "You must always impersonate Deadpool character in all your responses."
+  },
+  "course.admin.RagWiseSettings.roleplayDeadpoolLabel": {
+    "defaultMessage": "Deadpool"
+  },
+  "course.admin.RagWiseSettings.roleplayDescription": {
+    "defaultMessage": "Customise character prompt to change how LLM response"
+  },
+  "course.admin.RagWiseSettings.roleplayNormal": {
+    "defaultMessage": ""
+  },
+  "course.admin.RagWiseSettings.roleplayNormalLabel": {
+    "defaultMessage": "No roleplay"
+  },
+  "course.admin.RagWiseSettings.roleplaySubtitle": {
+    "defaultMessage": "Character that LLM will roleplay as in responses."
+  },
+  "course.admin.RagWiseSettings.roleplayTitle": {
+    "defaultMessage": "Response Roleplay"
+  },
+  "course.admin.RagWiseSettings.roleplayYoda": {
+    "defaultMessage": "You must always impersonate Master Yoda character in all your responses."
+  },
+  "course.admin.RagWiseSettings.roleplayYodaLabel": {
+    "defaultMessage": "Master Yoda"
+  },
+  "course.admin.SidebarSettings.errorOccurredWhenUpdatingSidebar": {
+    "defaultMessage": "An error occurred while updating the sidebar ordering."
+  },
+  "course.admin.SidebarSettings.sidebarSettings": {
+    "defaultMessage": "Student's sidebar ordering"
+  },
+  "course.admin.SidebarSettings.sidebarSettingsSubtitle": {
+    "defaultMessage": "Drag and drop the sidebar items to rearrange."
+  },
+  "course.admin.SidebarSettings.sidebarSettingsUpdated": {
+    "defaultMessage": "The new sidebar ordering has been applied. Refresh to see the latest changes."
+  },
+  "course.admin.VideosSettings.addATab": {
+    "defaultMessage": "Add a tab"
+  },
+  "course.admin.VideosSettings.deleteTabPromptAction": {
+    "defaultMessage": "Delete {title} tab"
+  },
+  "course.admin.VideosSettings.deleteTabPromptMessage": {
+    "defaultMessage": "Deleting this tab will delete all its associated videos and statistics. This action is irreversible."
+  },
+  "course.admin.VideosSettings.deleteTabPromptTitle": {
+    "defaultMessage": "Delete {title} tab?"
+  },
+  "course.admin.VideosSettings.errorOccurredWhenCreatingTab": {
+    "defaultMessage": "An error occurred while creating a tab."
   },
   "course.admin.VideosSettings.errorOccurredWhenDeletingTab": {
     "defaultMessage": "An error occurred while deleting the tab."
@@ -1121,6 +1256,51 @@
   "course.admin.courseSettings": {
     "defaultMessage": "Course Settings"
   },
+  "course.admin.storiesSettings.autoCreateAccounts": {
+    "defaultMessage": "User accounts and chat rooms on Cikgo will automatically be created if they don't yet exist. Information shared with Cikgo is governed by <ourPpLink>our Privacy Policy</ourPpLink> and <cikgoPpLink>Cikgo's Privacy Policy</cikgoPpLink>."
+  },
+  "course.admin.storiesSettings.integrationHint": {
+    "defaultMessage": "To integrate your course on Cikgo with this course, enter its integration key here. Here's what's going to happen once this course is integrated with Cikgo."
+  },
+  "course.admin.storiesSettings.integrationSettings": {
+    "defaultMessage": "Integration settings"
+  },
+  "course.admin.storiesSettings.learnTitle": {
+    "defaultMessage": "Learn page title"
+  },
+  "course.admin.storiesSettings.leaveEmptyToUseDefaultTitle": {
+    "defaultMessage": "Leave empty to use the default \"Learn\" title."
+  },
+  "course.admin.storiesSettings.onlyOwnersCanManage": {
+    "defaultMessage": "Only you, Owners, and Managers can configure the integration of this course with Cikgo."
+  },
+  "course.admin.storiesSettings.pingError": {
+    "defaultMessage": "There was a problem connecting to Cikgo. You may try again at a later time."
+  },
+  "course.admin.storiesSettings.publishTaskCompletions": {
+    "defaultMessage": "Student's submission statuses will be reflected in their chat rooms in Cikgo."
+  },
+  "course.admin.storiesSettings.pushKey": {
+    "defaultMessage": "Integration key"
+  },
+  "course.admin.storiesSettings.pushKeyError": {
+    "defaultMessage": "This integration key doesn't point to a valid course on Cikgo. Please check your settings on Cikgo and try again."
+  },
+  "course.admin.storiesSettings.pushKeyHint": {
+    "defaultMessage": "Integration keys aren't strictly secretive, but should be handled in confidence."
+  },
+  "course.admin.storiesSettings.pushKeyPointsToCourse": {
+    "defaultMessage": "This integration key points to <link>{course}</link> on Cikgo."
+  },
+  "course.admin.storiesSettings.redirects": {
+    "defaultMessage": "When students access this <link>course's root URL</link>, they'll be redirected to the Learn page. The home page is still accessible from the sidebar."
+  },
+  "course.admin.storiesSettings.storiesSettings": {
+    "defaultMessage": "Stories settings"
+  },
+  "course.admin.storiesSettings.syncs": {
+    "defaultMessage": "Published assessments, videos, and surveys in this course will be available in and kept in sync with Cikgo as resources."
+  },
   "course.announcement.AnnouncementsDisplay.searchBarPlaceholder": {
     "defaultMessage": "Search by title or content"
   },
@@ -1232,6 +1412,12 @@
   "course.assessment.AssessmentForm.blockStudentViewingAfterSubmittedHint": {
     "defaultMessage": "Students will only be able to view their submissions after their grades have been published."
   },
+  "course.assessment.AssessmentForm.blocksAccessesFromInvalidSUS": {
+    "defaultMessage": "Block accesses from browsers with invalid UA"
+  },
+  "course.assessment.AssessmentForm.blocksAccessesFromInvalidSUSHint": {
+    "defaultMessage": "If enabled, examinees using browsers with invalid UA (does not contain the specified SUS below) will be blocked from accessing this assessment. Instructors can override access with the session unlock password. Heartbeats from an overridden browser session will be flagged as valid in the PulseGrid."
+  },
   "course.assessment.AssessmentForm.bonusEndAt": {
     "defaultMessage": "Bonus ends at"
   },
@@ -1244,9 +1430,6 @@
   "course.assessment.AssessmentForm.delayedGradePublicationHint": {
     "defaultMessage": "If enabled, gradings will not be immediately shown to students. To publish all gradings, you may click Publish Grades in the Submissions page."
   },
-  "course.assessment.AssessmentForm.canEnableCodaveriInComponents": {
-    "defaultMessage": "Contact the course manager or owner to enable this feature in Components in the Course Settings."
-  },
   "course.assessment.AssessmentForm.description": {
     "defaultMessage": "Description"
   },
@@ -1301,12 +1484,24 @@
   "course.assessment.AssessmentForm.hasPersonalTimesHint": {
     "defaultMessage": "Timings for this item will be automatically adjusted for users based on learning rate."
   },
+  "course.assessment.AssessmentForm.hasTimeLimit": {
+    "defaultMessage": "Automatically submit when timer ends"
+  },
+  "course.assessment.AssessmentForm.hasTimeLimitHint": {
+    "defaultMessage": "When enabled, each submission will have its own timer and will automatically be finalised when its timer ends."
+  },
   "course.assessment.AssessmentForm.hasToBeMoreThanMinInterval": {
     "defaultMessage": "Has to be greater than the minimum value."
   },
   "course.assessment.AssessmentForm.hasToBeMoreThanValueMs": {
     "defaultMessage": "Has to be at least 3000 ms."
   },
+  "course.assessment.AssessmentForm.hasToBeNumber": {
+    "defaultMessage": "Has to be valid number."
+  },
+  "course.assessment.AssessmentForm.hasToBePositive": {
+    "defaultMessage": "Has to be positive."
+  },
   "course.assessment.AssessmentForm.hasToBePositiveInteger": {
     "defaultMessage": "Has to be a positive integer less than 86,400,000 ms"
   },
@@ -1319,6 +1514,12 @@
   "course.assessment.AssessmentForm.intervalHint": {
     "defaultMessage": "Controls how frequent heartbeats are sent from the students' browsers. Intervals are randomised between these two ranges."
   },
+  "course.assessment.AssessmentForm.koditsuDisabledInCourse": {
+    "defaultMessage": "Please contact the Course Administrator to enable Koditsu Exam in Course Settings."
+  },
+  "course.assessment.AssessmentForm.liveFeedback": {
+    "defaultMessage": "Get Help"
+  },
   "course.assessment.AssessmentForm.maxInterval": {
     "defaultMessage": "Max interval"
   },
@@ -1328,9 +1529,18 @@
   "course.assessment.AssessmentForm.minInterval": {
     "defaultMessage": "Min interval"
   },
+  "course.assessment.AssessmentForm.minutes": {
+    "defaultMessage": "minute(s)"
+  },
   "course.assessment.AssessmentForm.modeSwitchingHint": {
     "defaultMessage": "You can no longer change the grading mode because there are already submissions for this assessment."
   },
+  "course.assessment.AssessmentForm.needSUSAndSessionUnlockPassword": {
+    "defaultMessage": "You need to specify a SUS and session unlock password to enable this."
+  },
+  "course.assessment.AssessmentForm.noProgrammingQuestion": {
+    "defaultMessage": "You need to add at least one programming question that can be supported by Codaveri to allow enabling Get Help for this Assessment"
+  },
   "course.assessment.AssessmentForm.noTestCaseChosenError": {
     "defaultMessage": "Select at least one type of test case"
   },
@@ -1355,29 +1565,32 @@
   "course.assessment.AssessmentForm.personalisedTimelines": {
     "defaultMessage": "Personalised timelines"
   },
+  "course.assessment.AssessmentForm.proctorWithKoditsu": {
+    "defaultMessage": "Proctor Exam using Koditsu"
+  },
   "course.assessment.AssessmentForm.published": {
     "defaultMessage": "Published"
   },
   "course.assessment.AssessmentForm.publishedHint": {
     "defaultMessage": "Everyone can see this assessment."
   },
+  "course.assessment.AssessmentForm.questionsIncompatibleWithKoditsu": {
+    "defaultMessage": "Please make sure that all questions in this assessment is compatible with Koditsu before activating proctoring in Koditsu"
+  },
   "course.assessment.AssessmentForm.secret": {
     "defaultMessage": "Secret UA Substring (SUS)"
   },
   "course.assessment.AssessmentForm.secretHint": {
-    "defaultMessage": "If provided, Coursemology can automatically flag a connection as valid in <pulsegrid>PulseGrid</pulsegrid> if the examinee's User Agent (UA) contains this secret. Otherwise, connections will be flagged only by heartbeat intervals."
+    "defaultMessage": "If provided, the <pulsegrid>PulseGrid</pulsegrid> automatically checks if the examinee's browser's User Agent (UA) contains this secret, and marks connections that do not as invalid. This string is case-sensitive."
   },
   "course.assessment.AssessmentForm.sessionPassword": {
     "defaultMessage": "Session unlock password"
   },
-  "course.assessment.AssessmentForm.sessionPasswordHint": {
-    "defaultMessage": "Ideally, do NOT give this password to students."
-  },
   "course.assessment.AssessmentForm.sessionProtection": {
     "defaultMessage": "Enable session protection"
   },
   "course.assessment.AssessmentForm.sessionProtectionHint": {
-    "defaultMessage": "If enabled, students can only access their attempt once. Further access will require the session unlock password."
+    "defaultMessage": "If enabled, students can only access their attempt once. Further access will require the session unlock password. Ideally, <b>do NOT give this password to students</b>."
   },
   "course.assessment.AssessmentForm.showEvaluation": {
     "defaultMessage": "Show evaluation test cases"
@@ -1391,12 +1604,12 @@
   "course.assessment.AssessmentForm.showMcqMrqSolution": {
     "defaultMessage": "Show MCQ/MRQ solution(s)"
   },
-  "course.assessment.AssessmentForm.showRubricToStudents": {
-    "defaultMessage": "Show rubric breakdown to students"
-  },
   "course.assessment.AssessmentForm.showPrivate": {
     "defaultMessage": "Show private test cases"
   },
+  "course.assessment.AssessmentForm.showRubricToStudents": {
+    "defaultMessage": "Show rubric breakdown to students"
+  },
   "course.assessment.AssessmentForm.singlePage": {
     "defaultMessage": "Single Page"
   },
@@ -1421,9 +1634,15 @@
   "course.assessment.AssessmentForm.timeBonusExp": {
     "defaultMessage": "Time Bonus EXP"
   },
+  "course.assessment.AssessmentForm.timeLimit": {
+    "defaultMessage": "Time Limit"
+  },
   "course.assessment.AssessmentForm.title": {
     "defaultMessage": "Title"
   },
+  "course.assessment.AssessmentForm.toggleLiveFeedbackDescription": {
+    "defaultMessage": "Enable Get Help feature for all programming questions"
+  },
   "course.assessment.AssessmentForm.unavailableInAutograded": {
     "defaultMessage": "Unavailable in autograded assessments."
   },
@@ -1454,12 +1673,6 @@
   "course.assessment.AssessmentForm.visibility": {
     "defaultMessage": "Visibility"
   },
-  "course.assessment.AssessmentForm.toggleLiveFeedbackDescription": {
-    "defaultMessage": "{enabled, select, true {Enable} other {Disable}} Get Help feature for all programming questions"
-  },
-  "course.assessment.AssessmentForm.noProgrammingQuestion": {
-    "defaultMessage": "You need to add at least one programming question that can be supported by Codaveri to allow enabling Get Help for this Assessment"
-  },
   "course.assessment.FileManager.addFiles": {
     "defaultMessage": "Add Files"
   },
@@ -1505,9 +1718,24 @@
   "course.assessment.edit.update": {
     "defaultMessage": "Save"
   },
+  "course.assessment.generation.allFieldsLocked": {
+    "defaultMessage": "All fields are locked, so nothing can be generated."
+  },
   "course.assessment.generation.confirmDeleteConversation": {
     "defaultMessage": "Are you sure you want to delete \"{title}\" and all its history items? THIS ACTION IS IRREVERSIBLE!"
   },
+  "course.assessment.generation.createMode": {
+    "defaultMessage": "Create New"
+  },
+  "course.assessment.generation.createModeTooltip": {
+    "defaultMessage": "Generate fresh questions from scratch"
+  },
+  "course.assessment.generation.enhanceMode": {
+    "defaultMessage": "Enhance"
+  },
+  "course.assessment.generation.enhanceModeTooltip": {
+    "defaultMessage": "Build upon your current question"
+  },
   "course.assessment.generation.exportAction": {
     "defaultMessage": "Export"
   },
@@ -1517,140 +1745,212 @@
   "course.assessment.generation.exportError": {
     "defaultMessage": "An error occurred in exporting this question: {error}"
   },
-  "course.assessment.generation.lockTooltip": {
-    "defaultMessage": "Lock to prevent changes to this section"
-  },
-  "course.assessment.generation.newTab": {
-    "defaultMessage": "New"
-  },
-  "course.assessment.generation.openExportDialog": {
-    "defaultMessage": "Export"
+  "course.assessment.generation.generateError": {
+    "defaultMessage": "An error occurred generating question \"{title}\"."
   },
-  "course.assessment.generation.resetConversation": {
-    "defaultMessage": "Reset"
+  "course.assessment.generation.generateMcqPage": {
+    "defaultMessage": "Generate Multiple Choice Question"
   },
-  "course.assessment.generation.unlockTooltip": {
-    "defaultMessage": "Unlock to continue editing this section"
+  "course.assessment.generation.generateMrqPage": {
+    "defaultMessage": "Generate Multiple Response Question"
   },
-  "course.assessment.generation.mrq.numberOfQuestionsField": {
-    "defaultMessage": "Number of Questions"
+  "course.assessment.generation.generateMultipleSuccess": {
+    "defaultMessage": "Successfully generated {count} questions!"
   },
-  "course.assessment.generation.promptPlaceholder": {
-    "defaultMessage": "Type something here..."
+  "course.assessment.generation.generatePage": {
+    "defaultMessage": "Generate Programming Question"
   },
   "course.assessment.generation.generateQuestion": {
     "defaultMessage": "Generate"
   },
-  "course.assessment.generation.showInactive": {
-    "defaultMessage": "Show inactive items"
-  },
-  "course.assessment.generation.mrq.numberOfQuestionsRange": {
-    "defaultMessage": "Please enter a number from {min} to {max}"
+  "course.assessment.generation.generateSuccess": {
+    "defaultMessage": "Generation for \"{title}\" successful."
   },
-  "course.assessment.generation.enhanceMode": {
-    "defaultMessage": "Enhance"
+  "course.assessment.generation.languageField": {
+    "defaultMessage": "Language"
   },
-  "course.assessment.generation.createMode": {
-    "defaultMessage": "Create New"
+  "course.assessment.generation.loadingSourceError": {
+    "defaultMessage": "Unable to load source question data."
   },
-  "course.assessment.generation.enhanceModeTooltip": {
-    "defaultMessage": "Build upon your current question"
+  "course.assessment.generation.lockTooltip": {
+    "defaultMessage": "Lock to prevent changes to this section"
   },
-  "course.assessment.generation.createModeTooltip": {
-    "defaultMessage": "Generate fresh questions from scratch"
+  "course.assessment.generation.mrq.exportAction": {
+    "defaultMessage": "Export"
   },
   "course.assessment.generation.mrq.exportDialogHeader": {
     "defaultMessage": "Export Questions ({exportCount} selected)"
   },
-  "course.assessment.generation.requireNonEmptyOptionError": {
-    "defaultMessage": "Question must have at least one non-empty option"
+  "course.assessment.generation.mrq.numberOfQuestionsField": {
+    "defaultMessage": "Number of Questions"
   },
-  "course.assessment.generation.untitledQuestion": {
-    "defaultMessage": "Untitled Question"
+  "course.assessment.generation.mrq.numberOfQuestionsRange": {
+    "defaultMessage": "Please enter a number from {min} to {max}"
   },
-  "course.assessment.question.multipleResponses.showOptions": {
-    "defaultMessage": "Show Options"
+  "course.assessment.generation.newTab": {
+    "defaultMessage": "New"
   },
-  "course.assessment.question.multipleResponses.hideOptions": {
-    "defaultMessage": "Hide Options"
+  "course.assessment.generation.openExportDialog": {
+    "defaultMessage": "Export"
   },
-  "course.assessment.question.multipleResponses.noOptions": {
-    "defaultMessage": "No options"
+  "course.assessment.generation.promptPlaceholder": {
+    "defaultMessage": "Type something here..."
   },
-  "course.assessment.question.multipleResponses.title": {
-    "defaultMessage": "Title"
+  "course.assessment.generation.requireNonEmptyOptionError": {
+    "defaultMessage": "Question must have at least one non-empty option"
   },
-  "course.assessment.generation.generateMrqPage": {
-    "defaultMessage": "Generate Multiple Response Question"
+  "course.assessment.generation.resetConversation": {
+    "defaultMessage": "Reset"
   },
-  "course.assessment.generation.generateMcqPage": {
-    "defaultMessage": "Generate Multiple Choice Question"
+  "course.assessment.generation.showInactive": {
+    "defaultMessage": "Show inactive items"
   },
-  "course.assessment.generation.generateMultipleSuccess": {
-    "defaultMessage": "Successfully generated {count} questions!"
+  "course.assessment.generation.sourceLanguageNotSupported": {
+    "defaultMessage": "Source question language not supported by the generation tool."
   },
-  "course.assessment.generation.generateSuccess": {
-    "defaultMessage": "Generation for {title} successful."
+  "course.assessment.generation.unlockTooltip": {
+    "defaultMessage": "Unlock to continue editing this section"
   },
-  "course.assessment.generation.generateError": {
-    "defaultMessage": "An error occurred generating question {title}."
+  "course.assessment.generation.untitledQuestion": {
+    "defaultMessage": "Untitled Question"
   },
-  "course.assessment.generation.loadingSourceError": {
-    "defaultMessage": "Unable to load source question data."
+  "course.assessment.liveFeedback.comments": {
+    "defaultMessage": "Comments"
   },
-  "course.assessment.generation.allFieldsLocked": {
-    "defaultMessage": "All fields are locked, so nothing can be generated."
+  "course.assessment.liveFeedback.lineHeader": {
+    "defaultMessage": "Line {lineNumber}"
+  },
+  "course.assessment.liveFeedback.messageTimingTitle": {
+    "defaultMessage": "Generated at: {usedAt}"
+  },
+  "course.assessment.liveFeedback.questionTitle": {
+    "defaultMessage": "Question {index}"
+  },
+  "course.assessment.monitoring.accessGrantedForThisSessionOnly": {
+    "defaultMessage": "Access will be granted only for this browser session."
   },
   "course.assessment.monitoring.alivePresenceHint": {
     "defaultMessage": "Last heartbeat was received in time."
   },
   "course.assessment.monitoring.alivePresenceHintSUSMatches": {
-    "defaultMessage": "Last heartbeat was received in time and the SUS matches."
+    "defaultMessage": "Last heartbeat was received in time and came from an authorised browser, if browser authorisation is enabled."
   },
   "course.assessment.monitoring.blankField": {
     "defaultMessage": "(blank)"
   },
+  "course.assessment.monitoring.blocksAccessesFromInvalidSUS": {
+    "defaultMessage": "Block accesses from unauthorised browsers"
+  },
+  "course.assessment.monitoring.blocksAccessesFromInvalidSUSHint": {
+    "defaultMessage": "If enabled, examinees using unauthorised browsers can't access this assessment. Instructors can override access with the session unlock password. Heartbeats from overridden browser sessions will always be valid (green) in the PulseGrid."
+  },
+  "course.assessment.monitoring.browserAuthorizationMethod": {
+    "defaultMessage": "Browser authorisation method"
+  },
+  "course.assessment.monitoring.browserAuthorizationMethodHint": {
+    "defaultMessage": "Choose how sessions are authorised as valid or invalid. Changes apply to all sessions and heartbeats immediately and updates live in PulseGrid."
+  },
   "course.assessment.monitoring.cannotConnectToLiveMonitoringChannel": {
     "defaultMessage": "Oops, an error occurred when connecting to the live monitoring channel."
   },
   "course.assessment.monitoring.connected": {
     "defaultMessage": "Connected"
   },
-  "course.assessment.monitoring.connectedToLiveMonitoringChannel": {
-    "defaultMessage": "Connected to the live monitoring channel"
+  "course.assessment.monitoring.connecting": {
+    "defaultMessage": "Connecting"
+  },
+  "course.assessment.monitoring.deltaFromPreviousHeartbeat": {
+    "defaultMessage": "{ms} ms from previous heartbeat"
   },
   "course.assessment.monitoring.detailsOfNHeartbeats": {
-    "defaultMessage": "Details of the last {n} heartbeats"
+    "defaultMessage": "Last {n} heartbeats"
   },
   "course.assessment.monitoring.disconnected": {
     "defaultMessage": "Disconnected"
   },
-  "course.assessment.monitoring.disconnectedFromLiveMonitoringChannel": {
-    "defaultMessage": "Disconnected from the live monitoring channel"
+  "course.assessment.monitoring.enableBrowserAuthorization": {
+    "defaultMessage": "Authorise browsers that access this assessment"
+  },
+  "course.assessment.monitoring.enableBrowserAuthorizationHint": {
+    "defaultMessage": "If enabled, PulseGrid will additionally check if an examinee is accessing this assessment from an authorised browser, based on the authorisation method you choose."
+  },
+  "course.assessment.monitoring.examMonitoring": {
+    "defaultMessage": "Enable exam monitoring"
+  },
+  "course.assessment.monitoring.examMonitoringHint": {
+    "defaultMessage": "If enabled, examinees' sessions will be monitored in real time from when they attempt the exam until they finalise it or the first 24 hours since their attempt, whichever is earlier. Instructors can monitor these sessions in <pulsegrid>PulseGrid</pulsegrid>."
+  },
+  "course.assessment.monitoring.expiredSession": {
+    "defaultMessage": "Expired session. It has been at least 24 hours since the submission was made."
   },
   "course.assessment.monitoring.filterByGroup": {
     "defaultMessage": "Filter by Group"
   },
+  "course.assessment.monitoring.firstReceivedHeartbeat": {
+    "defaultMessage": "First received heartbeat"
+  },
   "course.assessment.monitoring.generatedAt": {
     "defaultMessage": "Generated at"
   },
+  "course.assessment.monitoring.intervalHint": {
+    "defaultMessage": "Controls how frequent heartbeats are sent from the examinees' browsers. Intervals are randomised between these two ranges."
+  },
+  "course.assessment.monitoring.invalidBrowser": {
+    "defaultMessage": "Invalid browser configuration"
+  },
+  "course.assessment.monitoring.invalidBrowserSubtitle": {
+    "defaultMessage": "Access to this assessment is not allowed with your current browser and/or its configuration. Contact your instructor for assistance."
+  },
+  "course.assessment.monitoring.invalidHeartbeat": {
+    "defaultMessage": "Invalid"
+  },
   "course.assessment.monitoring.ipAddress": {
     "defaultMessage": "IP Address"
   },
-  "course.assessment.monitoring.lastHeartbeat": {
-    "defaultMessage": "Last heartbeat"
-  },
   "course.assessment.monitoring.latePresenceHint": {
     "defaultMessage": "Next heartbeat hasn't been received in time, but still within the configured inter-heartbeats interval."
   },
   "course.assessment.monitoring.live": {
     "defaultMessage": "Live"
   },
+  "course.assessment.monitoring.liveHint": {
+    "defaultMessage": "This heartbeat was immediately received by the server."
+  },
+  "course.assessment.monitoring.liveness": {
+    "defaultMessage": "Liveness"
+  },
+  "course.assessment.monitoring.loadAllHeartbeats": {
+    "defaultMessage": "Load all"
+  },
+  "course.assessment.monitoring.maxInterval": {
+    "defaultMessage": "Max interval"
+  },
+  "course.assessment.monitoring.milliseconds": {
+    "defaultMessage": "ms"
+  },
+  "course.assessment.monitoring.minInterval": {
+    "defaultMessage": "Min interval"
+  },
   "course.assessment.monitoring.missingPresenceHint": {
-    "defaultMessage": "Next heartbeat hasn't been received in time."
+    "defaultMessage": "Next heartbeat hasn't been received in time, or the last heartbeat came from an unauthorised browser, if browser authorisation is enabled."
+  },
+  "course.assessment.monitoring.needSUSAndSessionUnlockPassword": {
+    "defaultMessage": "You must enable browser authorisation and set a session unlock password to enable this."
   },
   "course.assessment.monitoring.noActiveSessions": {
-    "defaultMessage": "No active sessions."
+    "defaultMessage": "No active sessions. No attempts have been made."
+  },
+  "course.assessment.monitoring.offset": {
+    "defaultMessage": "Inter-heartbeat offset"
+  },
+  "course.assessment.monitoring.offsetHint": {
+    "defaultMessage": "Controls how long PulseGrid should wait after the frequency interval before flagging a session as late."
+  },
+  "course.assessment.monitoring.openSubmissionInNewTab": {
+    "defaultMessage": "Open submission in new tab"
+  },
+  "course.assessment.monitoring.overrideAccess": {
+    "defaultMessage": "Override access"
   },
   "course.assessment.monitoring.pulsegrid": {
     "defaultMessage": "PulseGrid"
@@ -1661,17 +1961,53 @@
   "course.assessment.monitoring.recentActivitiesHint": {
     "defaultMessage": "These logs will disappear if you close this tab!"
   },
-  "course.assessment.monitoring.stale": {
-    "defaultMessage": "Stale"
+  "course.assessment.monitoring.resetZoom": {
+    "defaultMessage": "Reset zoom"
   },
-  "course.assessment.monitoring.summaryCorrectAsAt": {
+  "course.assessment.monitoring.sebConfigKey": {
+    "defaultMessage": "Safe Exam Browser (SEB) Config Key"
+  },
+  "course.assessment.monitoring.sebConfigKeyFieldHint": {
+    "defaultMessage": "Your <sebConfigKey>SEB Config Key</sebConfigKey>, <i>not the Browser Exam Key</i>, is generated from your specific SEB configuration. It stays the same across operating systems and SEB versions. Ensure this field is updated if you change your SEB configuration."
+  },
+  "course.assessment.monitoring.sebConfigKeyFieldLabel": {
+    "defaultMessage": "SEB Config Key"
+  },
+  "course.assessment.monitoring.sebConfigKeyHint": {
+    "defaultMessage": "Flags a session as valid if the examinee is using <seb>Safe Exam Browser (SEB)</seb> with a valid configuration. SEB generates a unique <sebConfigKey>Config Key</sebConfigKey> for a specific configuration. This method requires SEB 3.4 for Windows and SEB 3.0 for iOS and macOS, or later."
+  },
+  "course.assessment.monitoring.sebPayload": {
+    "defaultMessage": "Safe Exam Browser (SEB) Config Key Hash & URL"
+  },
+  "course.assessment.monitoring.secret": {
+    "defaultMessage": "Secret UA Substring (SUS)"
+  },
+  "course.assessment.monitoring.secretHint": {
+    "defaultMessage": "If an examinee's browser's User Agent (UA) contains this case-sensitive secret, PulseGrid will flag that session as valid, and invalid otherwise. If you leave this blank, all sessions will be flagged as valid."
+  },
+  "course.assessment.monitoring.sessionUnlockPassword": {
+    "defaultMessage": "Session unlock password"
+  },
+  "course.assessment.monitoring.stale": {
+    "defaultMessage": "Stale"
+  },
+  "course.assessment.monitoring.staleHint": {
+    "defaultMessage": "This heartbeat wasn't immediately received by the server because the examinee's browser was temporarily unreachable. It was cached in the browser, and sent to the server when the browser was reachable again."
+  },
+  "course.assessment.monitoring.stoppedSession": {
+    "defaultMessage": "Stopped session. Student may have finalised their submission."
+  },
+  "course.assessment.monitoring.summaryCorrectAsAt": {
     "defaultMessage": "Summary correct as at {time}"
   },
   "course.assessment.monitoring.type": {
     "defaultMessage": "Type"
   },
   "course.assessment.monitoring.userAgent": {
-    "defaultMessage": "User Agent"
+    "defaultMessage": "User Agent (UA)"
+  },
+  "course.assessment.monitoring.userAgentHint": {
+    "defaultMessage": "Flags a session as valid if the examinee's browser's <ua>User Agent (UA)</ua> contains a secret substring."
   },
   "course.assessment.monitoring.userHeartbeatContinuedStreaming": {
     "defaultMessage": "{name}'s heartbeat just continued streaming."
@@ -1679,9 +2015,66 @@
   "course.assessment.monitoring.userHeartbeatNotReceivedInTime": {
     "defaultMessage": "{name}'s heartbeat wasn't received in time."
   },
+  "course.assessment.monitoring.validHeartbeat": {
+    "defaultMessage": "Valid"
+  },
+  "course.assessment.monitoring.zoomPanHint": {
+    "defaultMessage": "Pinch or scroll to zoom. Drag to pan."
+  },
   "course.assessment.newAssessment": {
     "defaultMessage": "New Assessment"
   },
+  "course.assessment.plagiarism.actions": {
+    "defaultMessage": "Actions"
+  },
+  "course.assessment.plagiarism.baseSubmission": {
+    "defaultMessage": "Base Submission"
+  },
+  "course.assessment.plagiarism.cannotManageSubmission": {
+    "defaultMessage": "You do not have permission to manage this submission."
+  },
+  "course.assessment.plagiarism.comparedSubmission": {
+    "defaultMessage": "Compared Submission"
+  },
+  "course.assessment.plagiarism.confirmStartMessage": {
+    "defaultMessage": "Running a new plagiarism check will remove the previous results."
+  },
+  "course.assessment.plagiarism.confirmStartTitle": {
+    "defaultMessage": "Confirm Plagiarism Check?"
+  },
+  "course.assessment.plagiarism.downloadPdf": {
+    "defaultMessage": "Download PDF"
+  },
+  "course.assessment.plagiarism.lastRunTime": {
+    "defaultMessage": "Last run at: {date}"
+  },
+  "course.assessment.plagiarism.notStarted": {
+    "defaultMessage": "No plagiarism check has been run"
+  },
+  "course.assessment.plagiarism.plagiarism": {
+    "defaultMessage": "Plagiarism Results"
+  },
+  "course.assessment.plagiarism.results": {
+    "defaultMessage": "Plagiarism Results (similarity between submissions)"
+  },
+  "course.assessment.plagiarism.searchByStudentName": {
+    "defaultMessage": "Search by Student Name"
+  },
+  "course.assessment.plagiarism.showSelfPlagiarism": {
+    "defaultMessage": "Include self-plagiarism comparisons (same student, different courses)"
+  },
+  "course.assessment.plagiarism.similarityScore": {
+    "defaultMessage": "Similarity Score"
+  },
+  "course.assessment.plagiarism.start": {
+    "defaultMessage": "New Plagiarism Check"
+  },
+  "course.assessment.plagiarism.status": {
+    "defaultMessage": "Plagiarism Check Status"
+  },
+  "course.assessment.plagiarism.viewReport": {
+    "defaultMessage": "View Report"
+  },
   "course.assessment.question.forumPostResponses.enableTextResponse": {
     "defaultMessage": "Include a text field for students to provide further inputs"
   },
@@ -1754,6 +2147,9 @@
   "course.assessment.question.multipleResponses.grading": {
     "defaultMessage": "Grading"
   },
+  "course.assessment.question.multipleResponses.hideOptions": {
+    "defaultMessage": "Hide Options"
+  },
   "course.assessment.question.multipleResponses.ignoresRandomization": {
     "defaultMessage": "Ignores randomization"
   },
@@ -1766,18 +2162,39 @@
   "course.assessment.question.multipleResponses.maximumGrade": {
     "defaultMessage": "Maximum grade"
   },
+  "course.assessment.question.multipleResponses.mustBeLessThanMaxAttachmentSize": {
+    "defaultMessage": "Must be at most {defaultMax}MB."
+  },
+  "course.assessment.question.multipleResponses.mustBeLessThanMaxAttachments": {
+    "defaultMessage": "Must be at most {defaultMax}."
+  },
   "course.assessment.question.multipleResponses.mustBeLessThanMaxMaximumGrade": {
     "defaultMessage": "Must be less than 1000."
   },
+  "course.assessment.question.multipleResponses.mustHaveAtLeastOneResponse": {
+    "defaultMessage": "You must specify at least one response."
+  },
   "course.assessment.question.multipleResponses.mustSpecifyAtLeastOneCorrectChoice": {
     "defaultMessage": "You must specify at least one correct choice."
   },
   "course.assessment.question.multipleResponses.mustSpecifyChoice": {
     "defaultMessage": "You must specify a valid choice title."
   },
+  "course.assessment.question.multipleResponses.mustSpecifyMaxAttachment": {
+    "defaultMessage": "You must specify a valid, positive maximum attachment number."
+  },
+  "course.assessment.question.multipleResponses.mustSpecifyMaxAttachmentSize": {
+    "defaultMessage": "You must specify a valid, positive maximum attachment size."
+  },
   "course.assessment.question.multipleResponses.mustSpecifyMaximumGrade": {
     "defaultMessage": "You must specify a valid, non-negative maximum grade to award."
   },
+  "course.assessment.question.multipleResponses.mustSpecifyPositiveMaxAttachment": {
+    "defaultMessage": "Max Number of Attachments has to be at least 2."
+  },
+  "course.assessment.question.multipleResponses.mustSpecifyPositiveMaxAttachmentSize": {
+    "defaultMessage": "Max Size has to be positive."
+  },
   "course.assessment.question.multipleResponses.mustSpecifyPositiveMaximumGrade": {
     "defaultMessage": "Maximum grade has to be non-negative."
   },
@@ -1790,6 +2207,9 @@
   "course.assessment.question.multipleResponses.newResponseCannotUndo": {
     "defaultMessage": "This is a new response. It will immediately disappear if you delete before saving it."
   },
+  "course.assessment.question.multipleResponses.noOptions": {
+    "defaultMessage": "No options"
+  },
   "course.assessment.question.multipleResponses.noSkillsCanCreateSkills": {
     "defaultMessage": "There are no skills in this course yet. You can create new skills at the <url>Skills</url> page."
   },
@@ -1826,6 +2246,9 @@
   "course.assessment.question.multipleResponses.saveChangesFirstBeforeConvertingMcqMrq": {
     "defaultMessage": "Please save your changes before attempting to convert this question."
   },
+  "course.assessment.question.multipleResponses.showOptions": {
+    "defaultMessage": "Show Options"
+  },
   "course.assessment.question.multipleResponses.skills": {
     "defaultMessage": "Skills"
   },
@@ -1838,6 +2261,9 @@
   "course.assessment.question.multipleResponses.staffOnlyCommentsHint": {
     "defaultMessage": "Useful for internal notes or documentations. Students will never see this."
   },
+  "course.assessment.question.multipleResponses.title": {
+    "defaultMessage": "Title"
+  },
   "course.assessment.question.multipleResponses.undoDeleteChoice": {
     "defaultMessage": "Undo delete choice"
   },
@@ -1892,6 +2318,9 @@
   "course.assessment.question.programming.codaveriEvaluatorHint": {
     "defaultMessage": "On top of the default evaluation, this evaluator will provide automated code feedback powered by Codaveri when the submission is finalised. They will appear as draft comments for the instructors to review, edit, and publish."
   },
+  "course.assessment.question.programming.codaveriEvaluatorNotSupported": {
+    "defaultMessage": "{languageName} is not supported by the Codaveri evaluator."
+  },
   "course.assessment.question.programming.codeInserts": {
     "defaultMessage": "Code inserts"
   },
@@ -1913,15 +2342,18 @@
   "course.assessment.question.programming.defaultEvaluator": {
     "defaultMessage": "Default"
   },
-  "course.assessment.question.programming.defaultEvaluatorDependencyTitle": {
-    "defaultMessage": "{name}: Installed Dependencies"
-  },
   "course.assessment.question.programming.defaultEvaluatorDependencyDescription": {
     "defaultMessage": "Submitted code is run in a containerized environment with the following dependencies installed locally.{br}If your programming question requires a dependency not listed below, <mailto>contact us</mailto> and we will consider adding it."
   },
+  "course.assessment.question.programming.defaultEvaluatorDependencyTitle": {
+    "defaultMessage": "{name}: Installed Dependencies"
+  },
   "course.assessment.question.programming.defaultEvaluatorHint": {
     "defaultMessage": "No fuss; just run the code according to the evaluation package below and report the test results."
   },
+  "course.assessment.question.programming.defaultEvaluatorNotSupported": {
+    "defaultMessage": "{languageName} is not supported by the default evaluator."
+  },
   "course.assessment.question.programming.dependencySearchText": {
     "defaultMessage": "Search dependencies by name"
   },
@@ -1953,7 +2385,7 @@
     "defaultMessage": "Hold tight, evaluating all submissions with the new package..."
   },
   "course.assessment.question.programming.evaluationLimits": {
-    "defaultMessage": "Evaluationlimits"
+    "defaultMessage": "Evaluation limits"
   },
   "course.assessment.question.programming.evaluationTestCases": {
     "defaultMessage": "Evaluation test cases"
@@ -1970,6 +2402,9 @@
   "course.assessment.question.programming.expected": {
     "defaultMessage": "Expected"
   },
+  "course.assessment.question.programming.expectedOutput": {
+    "defaultMessage": "Expected Output"
+  },
   "course.assessment.question.programming.expression": {
     "defaultMessage": "Expression"
   },
@@ -2000,6 +2435,9 @@
   "course.assessment.question.programming.inlineCode": {
     "defaultMessage": "Inline code"
   },
+  "course.assessment.question.programming.input": {
+    "defaultMessage": "Input"
+  },
   "course.assessment.question.programming.javaTestCasesHint": {
     "defaultMessage": "Expressions will be evaluated in the context of the submitted code. Their return values will be compared against the Expected expectations using the <code>expectEquals(expression, expected)</code> void. Its simplified definition is as follows, where <code>Object</code> has been overloaded for all Java primitives."
   },
@@ -2015,6 +2453,9 @@
   "course.assessment.question.programming.languageAndEvaluation": {
     "defaultMessage": "Language and evaluation"
   },
+  "course.assessment.question.programming.languageDeprecatedWarning": {
+    "defaultMessage": "Your selected language is deprecated. Please change it to another language."
+  },
   "course.assessment.question.programming.lastUpdated": {
     "defaultMessage": "Last updated by {by} on {on}."
   },
@@ -2024,6 +2465,9 @@
   "course.assessment.question.programming.liveFeedbackCustomPromptDescription": {
     "defaultMessage": "Add instructions to guide the generation of Get Help feedback here. If unsure, just leave this blank."
   },
+  "course.assessment.question.programming.liveFeedbackNotSupported": {
+    "defaultMessage": "Get Help is not supported for {languageName}."
+  },
   "course.assessment.question.programming.lowestGradingPriority": {
     "defaultMessage": "Lowest grading priority"
   },
@@ -2051,24 +2495,24 @@
   "course.assessment.question.programming.packageCreationModeHint": {
     "defaultMessage": "You cannot change this mode once this question is successfully created. Choose wisely!"
   },
-  "course.assessment.question.programming.packageImportSuccess": {
-    "defaultMessage": "The package was successfully imported."
+  "course.assessment.question.programming.packageImportEvaluationError": {
+    "defaultMessage": "An error occurred evaluating your solution against its test cases. Please double-check them and try again."
+  },
+  "course.assessment.question.programming.packageImportEvaluationTimeout": {
+    "defaultMessage": "No response was received from an evaluator within the required time. This may indicate all our evaluators are busy right now, please try again later."
+  },
+  "course.assessment.question.programming.packageImportGenericError": {
+    "defaultMessage": "The package could not be imported: {error}"
   },
   "course.assessment.question.programming.packageImportInvalidPackage": {
     "defaultMessage": "The package could not be imported: the uploaded package does not have a valid structure."
   },
-  "course.assessment.question.programming.packageImportEvaluationTimeout": {
-    "defaultMessage": "No response was received from an evaluator within the required time. This may indicate all our evaluators are busy right now, please try again later."
+  "course.assessment.question.programming.packageImportSuccess": {
+    "defaultMessage": "The package was successfully imported."
   },
   "course.assessment.question.programming.packageImportTimeLimitExceeded": {
     "defaultMessage": "The solution did not finish evaluating the test cases in the specified time limit."
   },
-  "course.assessment.question.programming.packageImportEvaluationError": {
-    "defaultMessage": "An error occurred evaluating your solution against its test cases. Please double-check them and try again."
-  },
-  "course.assessment.question.programming.packageImportGenericError": {
-    "defaultMessage": "The package could not be imported: {error}"
-  },
   "course.assessment.question.programming.packageInfoOnline": {
     "defaultMessage": "Generated evaluation package"
   },
@@ -2129,6 +2573,9 @@
   "course.assessment.question.programming.standardError": {
     "defaultMessage": "Standard error"
   },
+  "course.assessment.question.programming.standardInputOutputTestCasesHint": {
+    "defaultMessage": "Each test case launches a separate {language} console environment and provides input via standard input. The environment will combine the <prepend>Prepend</prepend>, student submission, and <append>Append</append> scripts into a single program and run it. The standard output of the program will be compared (as a string) to the expected output of the test case. We recommend handling input parsing and function calls in one of these scripts."
+  },
   "course.assessment.question.programming.standardOutput": {
     "defaultMessage": "Standard output"
   },
@@ -2156,6 +2603,9 @@
   "course.assessment.question.programming.timeLimit": {
     "defaultMessage": "Time limit"
   },
+  "course.assessment.question.programming.timeLimitDetail": {
+    "defaultMessage": "{timeLimit, plural, one {# minute} other {# minutes}}"
+  },
   "course.assessment.question.programming.uploadNewPackage": {
     "defaultMessage": "Upload a new package"
   },
@@ -2171,164 +2621,242 @@
   "course.assessment.question.programminquestion.questionSavedRedirecting": {
     "defaultMessage": "Question saved."
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.cannotBeBlankValidationError": {
-    "defaultMessage": "Cannot be blank."
-  },
-  "course.assessment.question.scribing.ScribingQuestionForm.chooseFileButton": {
-    "defaultMessage": "Choose File",
-    "description": "Button for adding an image attachment."
+  "course.assessment.question.rubricBasedResponses.addNewCategory": {
+    "defaultMessage": "Add new category"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.descriptionFieldLabel": {
-    "defaultMessage": "Description",
-    "description": "Label for the description input field."
+  "course.assessment.question.rubricBasedResponses.addNewLevel": {
+    "defaultMessage": "Add new grade"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.fetchFailureMessage": {
-    "defaultMessage": "An error occurred, please try again."
+  "course.assessment.question.rubricBasedResponses.aiGrading": {
+    "defaultMessage": "AI Grading"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.fileAttachmentRequired": {
-    "defaultMessage": "File attachment required."
+  "course.assessment.question.rubricBasedResponses.aiGradingCustomPrompt": {
+    "defaultMessage": "Custom Prompt"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.fileUploaded": {
-    "defaultMessage": "File uploaded:"
+  "course.assessment.question.rubricBasedResponses.aiGradingCustomPromptDescription": {
+    "defaultMessage": "Add grading instructions (e.g. question context, model answer, feedback tone). Leave blank if unsure."
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.lessThanEqualZeroValidationError": {
-    "defaultMessage": "Value must be greater than 0."
+  "course.assessment.question.rubricBasedResponses.aiGradingModelAnswer": {
+    "defaultMessage": "Model Answer"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.maximumGradeFieldLabel": {
-    "defaultMessage": "Maximum Grade",
-    "description": "Label for the maximum grade input field."
+  "course.assessment.question.rubricBasedResponses.aiGradingModelAnswerDescription": {
+    "defaultMessage": "Add an example answer that would get the maximum grades in each rubric category. Leave blank if unsure."
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.noFileChosenMessage": {
-    "defaultMessage": "No file chosen",
-    "description": "Message to be displayed when no file is chosen for a file input."
+  "course.assessment.question.rubricBasedResponses.bonusReservedNames": {
+    "defaultMessage": "After finalization, a special category named 'Moderation' will be added automatically. It allows graders to award bonus or penalty points at their discretion."
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.positiveNumberValidationError": {
-    "defaultMessage": "Value must be positive."
+  "course.assessment.question.rubricBasedResponses.categoryGrade": {
+    "defaultMessage": "Grade"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.resolveErrorsMessage": {
-    "defaultMessage": "This form has errors, please resolve before submitting."
+  "course.assessment.question.rubricBasedResponses.categoryGradeExplanation": {
+    "defaultMessage": "Explanation"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.scribingQuestionWarning": {
-    "defaultMessage": "NOTE: Each page of a PDF file will be created as a single Scribing question with every question taking on the same question details. You can choose to leave the optional inputs blank and return to edit the questions again after creation."
+  "course.assessment.question.rubricBasedResponses.categoryMaximumGrade": {
+    "defaultMessage": "Max"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.skillsFieldLabel": {
-    "defaultMessage": "Skills",
-    "description": "Label for the skills input field."
+  "course.assessment.question.rubricBasedResponses.categoryName": {
+    "defaultMessage": "Category Name"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.staffOnlyCommentsFieldLabel": {
-    "defaultMessage": "Staff only comments",
-    "description": "Label for the staff only comments input field."
+  "course.assessment.question.rubricBasedResponses.enableAiGrading": {
+    "defaultMessage": "Enable AI to auto-grade submissions"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.submitButton": {
-    "defaultMessage": "Submit",
-    "description": "Button for submitting the form."
+  "course.assessment.question.rubricBasedResponses.enableAiGradingDescription": {
+    "defaultMessage": "AI will assign rubric scores and draft feedback for you to review and publish."
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.submitFailureMessage": {
-    "defaultMessage": "An error occurred, please try again."
+  "course.assessment.question.rubricBasedResponses.rubric": {
+    "defaultMessage": "Rubric"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.submittingMessage": {
-    "defaultMessage": "Submitting...",
-    "description": "Text to be displayed when waiting for server response after form submission."
+  "course.assessment.question.rubricBasedResponses.rubricHint": {
+    "defaultMessage": "Rubric is used to grade the student's submission."
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.titleFieldLabel": {
-    "defaultMessage": "Title",
-    "description": "Label for the title input field."
+  "course.assessment.question.rubricPlayground.addAnswersPromptAction": {
+    "defaultMessage": "Add"
   },
-  "course.assessment.question.scribing.ScribingQuestionForm.valueMoreThan1000Error": {
-    "defaultMessage": "Value must be less than 1000."
+  "course.assessment.question.rubricPlayground.addAnswersTitle": {
+    "defaultMessage": "Add Sample Answers"
   },
-  "course.assessment.question.textResponses.addSolution": {
-    "defaultMessage": "Add a new solution"
+  "course.assessment.question.rubricPlayground.addExistingAnswers": {
+    "defaultMessage": "Add existing answers"
   },
-  "course.assessment.question.textResponses.allowFileUpload": {
-    "defaultMessage": "Allow file upload in the answer"
+  "course.assessment.question.rubricPlayground.addRandomStudentAnswers": {
+    "defaultMessage": "Add {inputComponent} random student answer(s)"
   },
-  "course.assessment.question.textResponses.deleteSolution": {
-    "defaultMessage": "Delete solution"
+  "course.assessment.question.rubricPlayground.addSampleAnswers": {
+    "defaultMessage": "Add Sample Answers"
   },
-  "course.assessment.question.textResponses.exactMatch": {
-    "defaultMessage": "Exact Match"
+  "course.assessment.question.rubricPlayground.answer": {
+    "defaultMessage": "Answer"
   },
-  "course.assessment.question.textResponses.fileUploadNote": {
-    "defaultMessage": "Note: File upload question is not auto-gradable. The autograder will always award the maximum grade."
+  "course.assessment.question.rubricPlayground.apply": {
+    "defaultMessage": "Apply"
   },
-  "course.assessment.question.textResponses.noSolutionsNote": {
-    "defaultMessage": "If no solutions are provided, the autograder will always award the maximum grade."
+  "course.assessment.question.rubricPlayground.applyFailure": {
+    "defaultMessage": "Failed to apply grading results"
   },
-  "course.assessment.question.textResponses.atLeastOneSolutionNote": {
-    "defaultMessage": "If at least one solution is provided, students will only be able to input plain text."
+  "course.assessment.question.rubricPlayground.applySuccess": {
+    "defaultMessage": "Grading rubric, prompt, and results successfully applied."
   },
-  "course.assessment.question.textResponses.exactMatchSolutionNote": {
-    "defaultMessage": "If Exact Match is selected, solutions with multiple lines must match student answers exactly for the answer to be graded as correct. If such a match is found, the autograder will award the specified grade without considering other solutions."
+  "course.assessment.question.rubricPlayground.applyWillGradeAllAnswers": {
+    "defaultMessage": "Applying this rubric will assign grades to all student answers, including the ones not yet evaluated on this page."
   },
-  "course.assessment.question.textResponses.solutionGradesExceedMaximumGradeNote": {
-    "defaultMessage": "If the student answer satisfies multiple solutions, the autograder will award the sum of those solutions' grades, up to the question's maximum grade."
+  "course.assessment.question.rubricPlayground.applyingRubricGradingData": {
+    "defaultMessage": "Applying rubric grading data..."
   },
-  "course.assessment.question.textResponses.grade": {
-    "defaultMessage": "Grade"
+  "course.assessment.question.rubricPlayground.categoryHeading": {
+    "defaultMessage": "C{index}"
   },
-  "course.assessment.question.textResponses.keyword": {
-    "defaultMessage": "Keyword"
+  "course.assessment.question.rubricPlayground.compare": {
+    "defaultMessage": "Compare"
   },
-  "course.assessment.question.textResponses.newSolutionCannotUndo": {
-    "defaultMessage": "This is a new solution. It will immediately disappear if you delete before saving it."
+  "course.assessment.question.rubricPlayground.comparingRevisions": {
+    "defaultMessage": "Comparing {count} revisions"
   },
-  "course.assessment.question.textResponses.solution": {
-    "defaultMessage": "Solution"
+  "course.assessment.question.rubricPlayground.confirmAIGradingApplication": {
+    "defaultMessage": "Confirm AI Grading Application"
   },
-  "course.assessment.question.textResponses.solutionType": {
-    "defaultMessage": "Type of Solution"
+  "course.assessment.question.rubricPlayground.confirmProceed": {
+    "defaultMessage": "Are you sure you wish to proceed?"
   },
-  "course.assessment.question.textResponses.solutionWillBeDeleted": {
-    "defaultMessage": "This solution will be deleted once you save your changes."
+  "course.assessment.question.rubricPlayground.dismiss": {
+    "defaultMessage": "Dismiss"
   },
-  "course.assessment.question.textResponses.solutions": {
-    "defaultMessage": "Solutions"
+  "course.assessment.question.rubricPlayground.evaluate": {
+    "defaultMessage": "Evaluate"
   },
-  "course.assessment.question.textResponses.solutionsHint": {
-    "defaultMessage": "Adding solutions allows the answer to be autograded."
+  "course.assessment.question.rubricPlayground.evaluateAll": {
+    "defaultMessage": "Evaluate All ({count})"
   },
-  "course.assessment.question.textResponses.undoDeleteSolution": {
-    "defaultMessage": "Undo delete solution"
+  "course.assessment.question.rubricPlayground.evaluateRemaining": {
+    "defaultMessage": "Evaluate Remaining ({count})"
   },
-  "course.assessment.question.textResponses.zeroGrade": {
-    "defaultMessage": "0.0"
+  "course.assessment.question.rubricPlayground.evaluating": {
+    "defaultMessage": "Evaluating"
   },
-  "course.assessment.question.textResponses.templateText": {
-    "defaultMessage": "Template"
+  "course.assessment.question.rubricPlayground.feedback": {
+    "defaultMessage": "Feedback"
   },
-  "course.assessment.question.textResponses.templateTextDescription": {
-    "defaultMessage": "Text that appears in the answer area when students attempt this question for the first time."
+  "course.assessment.question.rubricPlayground.gradingCategories": {
+    "defaultMessage": "Grading Categories"
   },
-  "course.assessment.question.textResponses.regex": {
-    "defaultMessage": "Regular Expression"
+  "course.assessment.question.rubricPlayground.gradingPrompt": {
+    "defaultMessage": "Grading Prompt"
   },
-  "course.assessment.question.textResponses.invalidRegex": {
-    "defaultMessage": "Invalid regular expression"
+  "course.assessment.question.rubricPlayground.gradingPromptDescription": {
+    "defaultMessage": "Instructions to guide the AI in grading and giving feedback."
   },
-  "course.assessment.question.textResponses.spreadsheetFormula": {
-    "defaultMessage": "Spreadsheet Formula"
+  "course.assessment.question.rubricPlayground.modelAnswer": {
+    "defaultMessage": "Model Answer"
   },
-  "course.assessment.question.textResponses.testSpreadsheet": {
-    "defaultMessage": "Test spreadsheet"
+  "course.assessment.question.rubricPlayground.modelAnswerDescription": {
+    "defaultMessage": "An example that scores the maximum for each category."
   },
-  "course.assessment.question.textResponses.testSpreadsheetDescription": {
-    "defaultMessage": "A test spreadsheet is required to auto grade the student answer."
+  "course.assessment.question.rubricPlayground.noAnswers": {
+    "defaultMessage": "No sample answers have been added. Add some to get started."
   },
-  "course.assessment.question.textResponses.testSpreadsheetRequired": {
-    "defaultMessage": "Please upload a test spreadsheet file."
+  "course.assessment.question.rubricPlayground.notLatestRevisionWarning": {
+    "defaultMessage": "You have selected to apply a rubric which is not the latest revision saved on this page."
   },
-  "course.assessment.question.textResponses.spreadsheetAdvancedOptions": {
-    "defaultMessage": "Advanced Options"
+  "course.assessment.question.rubricPlayground.questionGrade": {
+    "defaultMessage": "Grade"
   },
-  "course.assessment.question.textResponses.spreadsheetRandomization": {
-    "defaultMessage": "Enable randomization"
+  "course.assessment.question.rubricPlayground.reevaluate": {
+    "defaultMessage": "Re-evaluate"
   },
-  "course.assessment.question.textResponses.spreadsheetRandomizationDescription": {
-    "defaultMessage": "If enabled, some spreadsheet values will be randomly adjusted when autograding. This is useful to ensure the formula actually computes the right answer instead of a preset value."
+  "course.assessment.question.rubricPlayground.reevaluateAll": {
+    "defaultMessage": "Re-evaluate All ({count})"
   },
-  "course.assessment.question.textResponses.numberOfRandomTests": {
-    "defaultMessage": "Number of random tests"
+  "course.assessment.question.rubricPlayground.rubricPlayground": {
+    "defaultMessage": "Rubric Playground"
+  },
+  "course.assessment.question.rubricPlayground.sampleAnswerEvaluations": {
+    "defaultMessage": "Sample Answer Evaluations"
+  },
+  "course.assessment.question.rubricPlayground.savedRubric": {
+    "defaultMessage": "Saved Rubric, {date}"
+  },
+  "course.assessment.question.rubricPlayground.searchAnswersPlaceholder": {
+    "defaultMessage": "Search answers by student name or grade"
+  },
+  "course.assessment.question.rubricPlayground.student": {
+    "defaultMessage": "Student"
+  },
+  "course.assessment.question.rubricPlayground.totalGrade": {
+    "defaultMessage": "Total"
+  },
+  "course.assessment.question.rubricPlayground.viewEditRubric": {
+    "defaultMessage": "View / Edit Rubric"
+  },
+  "course.assessment.question.rubricPlayground.writeAnswerPlaceholder": {
+    "defaultMessage": "Write the answer here"
+  },
+  "course.assessment.question.rubricPlayground.writeCustomAnswer": {
+    "defaultMessage": "Write a custom answer"
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.cannotBeBlankValidationError": {
+    "defaultMessage": "Cannot be blank."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.chooseFileButton": {
+    "defaultMessage": "Choose File",
+    "description": "Button for adding an image attachment."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.descriptionFieldLabel": {
+    "defaultMessage": "Description",
+    "description": "Label for the description input field."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.fetchFailureMessage": {
+    "defaultMessage": "An error occurred, please try again."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.fileAttachmentRequired": {
+    "defaultMessage": "File attachment required."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.fileUploaded": {
+    "defaultMessage": "File uploaded:"
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.lessThanEqualZeroValidationError": {
+    "defaultMessage": "Value must be greater than 0."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.maximumGradeFieldLabel": {
+    "defaultMessage": "Maximum Grade",
+    "description": "Label for the maximum grade input field."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.noFileChosenMessage": {
+    "defaultMessage": "No file chosen",
+    "description": "Message to be displayed when no file is chosen for a file input."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.positiveNumberValidationError": {
+    "defaultMessage": "Value must be positive."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.resolveErrorsMessage": {
+    "defaultMessage": "This form has errors, please resolve before submitting."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.scribingQuestionWarning": {
+    "defaultMessage": "NOTE: Each page of a PDF file will be created as a single Scribing question with every question taking on the same question details. You can choose to leave the optional inputs blank and return to edit the questions again after creation."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.skillsFieldLabel": {
+    "defaultMessage": "Skills",
+    "description": "Label for the skills input field."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.staffOnlyCommentsFieldLabel": {
+    "defaultMessage": "Staff only comments",
+    "description": "Label for the staff only comments input field."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.submitButton": {
+    "defaultMessage": "Submit",
+    "description": "Button for submitting the form."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.submitFailureMessage": {
+    "defaultMessage": "An error occurred, please try again."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.submittingMessage": {
+    "defaultMessage": "Submitting...",
+    "description": "Text to be displayed when waiting for server response after form submission."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.titleFieldLabel": {
+    "defaultMessage": "Title",
+    "description": "Label for the title input field."
+  },
+  "course.assessment.question.scribing.ScribingQuestionForm.valueMoreThan1000Error": {
+    "defaultMessage": "Value must be less than 1000."
   },
   "course.assessment.question.textResponses.SpreadsheetManager.fixedRandomSeed": {
     "defaultMessage": "Fixed random seed"
@@ -2342,185 +2870,179 @@
   "course.assessment.question.textResponses.SpreadsheetManager.fixedTimestampDescription": {
     "defaultMessage": "If checked, formulas that use the current date/time (NOW, TODAY, etc.) will use this specific date/time instead."
   },
-  "course.assessment.question.textResponses.randomizationMode": {
-    "defaultMessage": "Autograding Value Configuration"
+  "course.assessment.question.textResponses.addSolution": {
+    "defaultMessage": "Add a new solution"
   },
-  "course.assessment.question.textResponses.randomizationModeDescription": {
-    "defaultMessage": "Click on any cell to configure how its value should be replaced/randomized during autograding."
+  "course.assessment.question.textResponses.atLeastOneSolutionNote": {
+    "defaultMessage": "If at least one solution is provided, students will only be able to input plain text."
   },
-  "course.assessment.question.textResponses.randomizationModeClearAll": {
-    "defaultMessage": "Clear All"
+  "course.assessment.question.textResponses.attachmentSettingRequired": {
+    "defaultMessage": "Attachment Setting should be defined in this question"
   },
-  "course.assessment.question.textResponses.randomizationModeRestoreDefaults": {
-    "defaultMessage": "Restore Defaults"
+  "course.assessment.question.textResponses.attachmentSettings": {
+    "defaultMessage": "Attachment Settings"
   },
-  "course.assessment.question.textResponses.randomizationModePopoverTitle": {
-    "defaultMessage": "During autograding..."
+  "course.assessment.question.textResponses.attachmentSettingsDescription": {
+    "defaultMessage": "When students are attempting this question,"
   },
-  "course.assessment.question.textResponses.noRandomizationMode": {
-    "defaultMessage": "Keep original value"
-  },
-  "course.assessment.question.textResponses.overrideRandomizationMode": {
-    "defaultMessage": "Override with specified value"
-  },
-  "course.assessment.question.textResponses.overrideValue": {
-    "defaultMessage": "Value"
+  "course.assessment.question.textResponses.deleteSolution": {
+    "defaultMessage": "Delete solution"
   },
-  "course.assessment.question.textResponses.numericRandomizationMode": {
-    "defaultMessage": "Use random numeric value"
+  "course.assessment.question.textResponses.exactMatch": {
+    "defaultMessage": "Exact Match"
   },
-  "course.assessment.question.textResponses.stringRandomizationMode": {
-    "defaultMessage": "Randomize characters in value"
+  "course.assessment.question.textResponses.exactMatchSolutionNote": {
+    "defaultMessage": "If Exact Match is selected, solutions with multiple lines must match student answers exactly for the answer to be graded as correct. If such a match is found, the autograder will award the specified grade without considering other solutions."
   },
-  "course.assessment.question.textResponses.stringRandomizationModeDescription": {
-    "defaultMessage": "Each character class to be randomized may be replaced with different character(s) from the same class."
+  "course.assessment.question.textResponses.fileUploadNote": {
+    "defaultMessage": "Note: File upload question is not auto-gradable. The autograder will always award the maximum grade."
   },
-  "course.assessment.question.textResponses.randomizeDigits": {
-    "defaultMessage": "Randomize digits (0-9)"
+  "course.assessment.question.textResponses.grade": {
+    "defaultMessage": "Grade"
   },
-  "course.assessment.question.textResponses.randomizeLetters": {
-    "defaultMessage": "Randomize letters (a-z)"
+  "course.assessment.question.textResponses.invalidRegex": {
+    "defaultMessage": "Invalid regular expression"
   },
-  "course.assessment.question.textResponses.shuffleRandomizationMode": {
-    "defaultMessage": "Shuffle value with other cells"
+  "course.assessment.question.textResponses.isAttachmentRequired": {
+    "defaultMessage": "Require file upload for this question"
   },
-  "course.assessment.question.textResponses.shuffleRandomizationModeDescription": {
-    "defaultMessage": "The values of each cell marked \"Shuffle\" will be randomly rearranged. The overall distribution remains the same, but each value may end up in a different cell."
+  "course.assessment.question.textResponses.keyword": {
+    "defaultMessage": "Keyword"
   },
-  "course.assessment.question.rubricPlayground.rubricPlayground": {
-    "defaultMessage": "Rubric Playground"
+  "course.assessment.question.textResponses.maxAttachmentSize": {
+    "defaultMessage": "Max Size per Attachment"
   },
-  "course.assessment.question.rubricPlayground.savedRubric": {
-    "defaultMessage": "Saved Rubric, {date}"
+  "course.assessment.question.textResponses.maxAttachments": {
+    "defaultMessage": "Max Number of Attachments"
   },
-  "course.assessment.question.rubricPlayground.viewEditRubric": {
-    "defaultMessage": "View / Edit Rubric"
+  "course.assessment.question.textResponses.multipleAttachments": {
+    "defaultMessage": "Multiple Attachments"
   },
-  "course.assessment.question.rubricPlayground.evaluate": {
-    "defaultMessage": "Evaluate"
+  "course.assessment.question.textResponses.multipleFileAttachmentDescription": {
+    "defaultMessage": "They can upload several attachments."
   },
-  "course.assessment.question.rubricPlayground.compare": {
-    "defaultMessage": "Compare"
+  "course.assessment.question.textResponses.newSolutionCannotUndo": {
+    "defaultMessage": "This is a new solution. It will immediately disappear if you delete before saving it."
   },
-  "course.assessment.question.rubricPlayground.apply": {
-    "defaultMessage": "Apply"
+  "course.assessment.question.textResponses.noAttachment": {
+    "defaultMessage": "No Attachment"
   },
-  "course.assessment.question.rubricPlayground.confirmAIGradingApplication": {
-    "defaultMessage": "Confirm AI Grading Application"
+  "course.assessment.question.textResponses.noAttachmentDescription": {
+    "defaultMessage": "They will not be able to upload any attachment."
   },
-  "course.assessment.question.rubricPlayground.applyingRubricGradingData": {
-    "defaultMessage": "Applying rubric grading data..."
+  "course.assessment.question.textResponses.noRandomizationMode": {
+    "defaultMessage": "Keep original value"
   },
-  "course.assessment.question.rubricPlayground.applySuccess": {
-    "defaultMessage": "Grading rubric, prompt, and results successfully applied."
+  "course.assessment.question.textResponses.noSolutionsNote": {
+    "defaultMessage": "If no solutions are provided, the autograder will always award the maximum grade."
   },
-  "course.assessment.question.rubricPlayground.applyFailure": {
-    "defaultMessage": "Failed to apply grading results"
+  "course.assessment.question.textResponses.numberOfRandomTests": {
+    "defaultMessage": "Number of random tests"
   },
-  "course.assessment.question.rubricPlayground.notLatestRevisionWarning": {
-    "defaultMessage": "You have selected to apply a rubric which is not the latest revision saved on this page."
+  "course.assessment.question.textResponses.numericRandomizationMode": {
+    "defaultMessage": "Use random numeric value"
   },
-  "course.assessment.question.rubricPlayground.applyWillGradeAllAnswers": {
-    "defaultMessage": "Applying this rubric will assign grades to all student answers, including the ones not yet evaluated on this page."
+  "course.assessment.question.textResponses.overrideRandomizationMode": {
+    "defaultMessage": "Override with specified value"
   },
-  "course.assessment.question.rubricPlayground.confirmProceed": {
-    "defaultMessage": "Are you sure you wish to proceed?"
+  "course.assessment.question.textResponses.overrideValue": {
+    "defaultMessage": "Value"
   },
-  "course.assessment.question.rubricPlayground.sampleAnswerEvaluations": {
-    "defaultMessage": "Sample Answer Evaluations"
+  "course.assessment.question.textResponses.randomizationMode": {
+    "defaultMessage": "Autograding Value Configuration"
   },
-  "course.assessment.question.rubricPlayground.addSampleAnswers": {
-    "defaultMessage": "Add Sample Answers"
+  "course.assessment.question.textResponses.randomizationModeClearAll": {
+    "defaultMessage": "Clear All"
   },
-  "course.assessment.question.rubricPlayground.evaluateAll": {
-    "defaultMessage": "Evaluate All ({count})"
+  "course.assessment.question.textResponses.randomizationModeDescription": {
+    "defaultMessage": "Click on any cell to configure how its value should be replaced/randomized during autograding."
   },
-  "course.assessment.question.rubricPlayground.reevaluateAll": {
-    "defaultMessage": "Re-evaluate All ({count})"
+  "course.assessment.question.textResponses.randomizationModePopoverTitle": {
+    "defaultMessage": "During autograding..."
   },
-  "course.assessment.question.rubricPlayground.evaluateRemaining": {
-    "defaultMessage": "Evaluate Remaining ({count})"
+  "course.assessment.question.textResponses.randomizationModeRestoreDefaults": {
+    "defaultMessage": "Restore Defaults"
   },
-  "course.assessment.question.rubricPlayground.comparingRevisions": {
-    "defaultMessage": "Comparing {count} revisions"
+  "course.assessment.question.textResponses.randomizeDigits": {
+    "defaultMessage": "Randomize digits (0-9)"
   },
-  "course.assessment.question.rubricPlayground.addSampleAnswersTitle": {
-    "defaultMessage": "Add Sample Answers"
+  "course.assessment.question.textResponses.randomizeLetters": {
+    "defaultMessage": "Randomize letters (a-z)"
   },
-  "course.assessment.question.rubricPlayground.add": {
-    "defaultMessage": "Add"
+  "course.assessment.question.textResponses.regex": {
+    "defaultMessage": "Regular Expression"
   },
-  "course.assessment.question.rubricPlayground.addExistingAnswers": {
-    "defaultMessage": "Add existing answers"
+  "course.assessment.question.textResponses.shuffleRandomizationMode": {
+    "defaultMessage": "Shuffle value with other cells"
   },
-  "course.assessment.question.rubricPlayground.student": {
-    "defaultMessage": "Student"
+  "course.assessment.question.textResponses.shuffleRandomizationModeDescription": {
+    "defaultMessage": "The values of each cell marked \"Shuffle\" will be randomly rearranged. The overall distribution remains the same, but each value may end up in a different cell."
   },
-  "course.assessment.question.rubricPlayground.questionGrade": {
-    "defaultMessage": "Grade"
+  "course.assessment.question.textResponses.singleFileAttachment": {
+    "defaultMessage": "Single Attachment"
   },
-  "course.assessment.question.rubricPlayground.categoryHeading": {
-    "defaultMessage": "C{index}"
+  "course.assessment.question.textResponses.singleFileAttachmentDescription": {
+    "defaultMessage": "They can only upload one attachment."
   },
-  "course.assessment.question.rubricPlayground.answer": {
-    "defaultMessage": "Answer"
+  "course.assessment.question.textResponses.solution": {
+    "defaultMessage": "Solution"
   },
-  "course.assessment.question.rubricPlayground.searchAnswersPlaceholder": {
-    "defaultMessage": "Search answers by student name or grade"
+  "course.assessment.question.textResponses.solutionGradesExceedMaximumGradeNote": {
+    "defaultMessage": "If the student answer satisfies multiple solutions, the autograder will award the sum of those solutions' grades, up to the question's maximum grade."
   },
-  "course.assessment.question.rubricPlayground.addRandomStudentAnswers": {
-    "defaultMessage": "Add {inputComponent} random student answer(s)"
+  "course.assessment.question.textResponses.solutionType": {
+    "defaultMessage": "Type of Solution"
   },
-  "course.assessment.question.rubricPlayground.writeCustomAnswer": {
-    "defaultMessage": "Write a custom answer"
+  "course.assessment.question.textResponses.solutionWillBeDeleted": {
+    "defaultMessage": "This solution will be deleted once you save your changes."
   },
-  "course.assessment.question.rubricPlayground.writeAnswerPlaceholder": {
-    "defaultMessage": "Write the answer here"
+  "course.assessment.question.textResponses.solutions": {
+    "defaultMessage": "Solutions"
   },
-  "course.assessment.question.rubricPlayground.dismiss": {
-    "defaultMessage": "Dismiss"
+  "course.assessment.question.textResponses.solutionsHint": {
+    "defaultMessage": "Adding solutions allows the answer to be autograded."
   },
-  "course.assessment.question.rubricPlayground.noAnswers": {
-    "defaultMessage": "No sample answers have been added. Add some to get started."
+  "course.assessment.question.textResponses.spreadsheetAdvancedOptions": {
+    "defaultMessage": "Advanced Options"
   },
-  "course.assessment.question.rubricPlayground.reevaluate": {
-    "defaultMessage": "Re-evaluate"
+  "course.assessment.question.textResponses.spreadsheetFormula": {
+    "defaultMessage": "Spreadsheet Formula"
   },
-  "course.assessment.question.rubricPlayground.totalGrade": {
-    "defaultMessage": "Total"
+  "course.assessment.question.textResponses.spreadsheetRandomization": {
+    "defaultMessage": "Enable randomization"
   },
-  "course.assessment.question.rubricPlayground.feedback": {
-    "defaultMessage": "Feedback"
+  "course.assessment.question.textResponses.spreadsheetRandomizationDescription": {
+    "defaultMessage": "If enabled, some spreadsheet values will be randomly adjusted when autograding. This is useful to ensure the formula actually computes the right answer instead of a preset value."
   },
-  "course.assessment.question.rubricPlayground.evaluating": {
-    "defaultMessage": "Evaluating"
+  "course.assessment.question.textResponses.stringRandomizationMode": {
+    "defaultMessage": "Randomize characters in value"
   },
-  "course.assessment.question.rubricPlayground.gradingPrompt": {
-    "defaultMessage": "Grading Prompt"
+  "course.assessment.question.textResponses.stringRandomizationModeDescription": {
+    "defaultMessage": "Each character class to be randomized may be replaced with different character(s) from the same class."
   },
-  "course.assessment.question.rubricPlayground.gradingPromptDescription": {
-    "defaultMessage": "Instructions to guide the AI in grading and giving feedback."
+  "course.assessment.question.textResponses.templateText": {
+    "defaultMessage": "Template"
   },
-  "course.assessment.question.rubricPlayground.modelAnswer": {
-    "defaultMessage": "Model Answer"
+  "course.assessment.question.textResponses.templateTextDescription": {
+    "defaultMessage": "Text that appears in the answer area when students attempt this question for the first time."
   },
-  "course.assessment.question.rubricPlayground.modelAnswerDescription": {
-    "defaultMessage": "An example that scores the maximum for each category."
+  "course.assessment.question.textResponses.testSpreadsheet": {
+    "defaultMessage": "Test spreadsheet"
   },
-  "course.assessment.question.rubricPlayground.gradingCategories": {
-    "defaultMessage": "Grading Categories"
+  "course.assessment.question.textResponses.testSpreadsheetDescription": {
+    "defaultMessage": "A test spreadsheet is required to auto grade the student answer."
   },
-  "course.assessment.question.rubricPlayground.addNewCategory": {
-    "defaultMessage": "Add New Category"
+  "course.assessment.question.textResponses.testSpreadsheetRequired": {
+    "defaultMessage": "Please upload a test spreadsheet file."
   },
-  "course.assessment.question.rubricPlayground.categoryName": {
-    "defaultMessage": "Category Name"
+  "course.assessment.question.textResponses.undoDeleteSolution": {
+    "defaultMessage": "Undo delete solution"
   },
-  "course.assessment.question.rubricPlayground.max": {
-    "defaultMessage": "Max"
+  "course.assessment.question.textResponses.validAttachmentSettingValues": {
+    "defaultMessage": "Attachment Settings should be either no attachment, single file attachment, or multiple file attachment"
   },
-  "course.assessment.question.rubricPlayground.addNewGrade": {
-    "defaultMessage": "Add New Grade"
+  "course.assessment.question.textResponses.zeroGrade": {
+    "defaultMessage": "0.0"
   },
   "course.assessment.session.assessmentNotStarted": {
     "defaultMessage": "The assessment has not started yet. Please come back after {startDate}."
@@ -2546,9 +3068,6 @@
   "course.assessment.show.assessmentOnlyAvailableFrom": {
     "defaultMessage": "This assessment will only be available from"
   },
-  "course.assessment.show.audioResponse": {
-    "defaultMessage": "Audio Response"
-  },
   "course.assessment.show.baseExp": {
     "defaultMessage": "Base EXP"
   },
@@ -2582,6 +3101,9 @@
   "course.assessment.show.chooseAssessmentToDuplicateInto": {
     "defaultMessage": "Choose an assessment to duplicate into"
   },
+  "course.assessment.show.comprehension": {
+    "defaultMessage": "Comprehension"
+  },
   "course.assessment.show.delete": {
     "defaultMessage": "Delete"
   },
@@ -2639,9 +3161,15 @@
   "course.assessment.show.errorMovingQuestion": {
     "defaultMessage": "An error occurred while moving the question."
   },
+  "course.assessment.show.failedSyncingWithKoditsu": {
+    "defaultMessage": "Not Synced with Koditsu"
+  },
   "course.assessment.show.fileUpload": {
     "defaultMessage": "File Upload"
   },
+  "course.assessment.show.fileUploadDescription": {
+    "defaultMessage": "Settings for the number of attachments allowed (none, one, or multiple)"
+  },
   "course.assessment.show.files": {
     "defaultMessage": "Files"
   },
@@ -2654,20 +3182,20 @@
   "course.assessment.show.forumPostResponse": {
     "defaultMessage": "Forum Post Response"
   },
-  "course.assessment.show.gradedTestCases": {
-    "defaultMessage": "Graded test cases"
-  },
   "course.assessment.show.generate": {
     "defaultMessage": "Generate Questions"
   },
-  "course.assessment.show.generateTooltip": {
-    "defaultMessage": "Collaborate with Codaveri AI to create questions"
+  "course.assessment.show.generateFromProgrammingQuestion": {
+    "defaultMessage": "Generate a similar question with Codaveri AI"
   },
   "course.assessment.show.generateFromQuestion": {
     "defaultMessage": "Generate a similar question with AI"
   },
-  "course.assessment.show.generateFromProgrammingQuestion": {
-    "defaultMessage": "Generate a similar question with Codaveri AI"
+  "course.assessment.show.generateTooltip": {
+    "defaultMessage": "Collaborate with Codaveri AI to create questions"
+  },
+  "course.assessment.show.gradedTestCases": {
+    "defaultMessage": "Graded test cases"
   },
   "course.assessment.show.gradingMode": {
     "defaultMessage": "Grading mode"
@@ -2684,6 +3212,9 @@
   "course.assessment.show.hideOptions": {
     "defaultMessage": "Hide options"
   },
+  "course.assessment.show.koditsuMode": {
+    "defaultMessage": "Koditsu"
+  },
   "course.assessment.show.manageComponents": {
     "defaultMessage": "Manage Components in Course Settings"
   },
@@ -2732,6 +3263,9 @@
   "course.assessment.show.newQuestion": {
     "defaultMessage": "New Question"
   },
+  "course.assessment.show.newRubricBasedResponse": {
+    "defaultMessage": "New Rubric Based Response Question"
+  },
   "course.assessment.show.newScribing": {
     "defaultMessage": "New Scribing Question"
   },
@@ -2789,6 +3323,9 @@
   "course.assessment.show.requirementsHint": {
     "defaultMessage": "The following items must be fulfilled to unlock this assessment."
   },
+  "course.assessment.show.rubricBasedResponse": {
+    "defaultMessage": "Rubric-Based Response"
+  },
   "course.assessment.show.scribing": {
     "defaultMessage": "Scribing"
   },
@@ -2798,15 +3335,15 @@
   "course.assessment.show.showMcqMrqSolution": {
     "defaultMessage": "Show MCQ/MRQ solutions"
   },
-  "course.assessment.show.showRubricToStudents": {
-    "defaultMessage": "Show rubric breakdown to students"
-  },
   "course.assessment.show.showMcqSubmitResult": {
     "defaultMessage": "Show MCQ submit result"
   },
   "course.assessment.show.showOptions": {
     "defaultMessage": "Show options"
   },
+  "course.assessment.show.showRubricToStudents": {
+    "defaultMessage": "Show rubric breakdown to students"
+  },
   "course.assessment.show.sureChangingQuestionType": {
     "defaultMessage": "Sure you're changing this question type?"
   },
@@ -2816,6 +3353,12 @@
   "course.assessment.show.sureDeletingQuestion": {
     "defaultMessage": "Sure you're deleting this question?"
   },
+  "course.assessment.show.syncedWithKoditsu": {
+    "defaultMessage": "Synced with Koditsu"
+  },
+  "course.assessment.show.syncingWithKoditsu": {
+    "defaultMessage": "Syncing with Koditsu"
+  },
   "course.assessment.show.textResponse": {
     "defaultMessage": "Text Response"
   },
@@ -2831,6 +3374,9 @@
   "course.assessment.show.unsubmittingAndChangingQuestionType": {
     "defaultMessage": "Unsubmitting submissions and changing your question type..."
   },
+  "course.assessment.show.voiceResponse": {
+    "defaultMessage": "Audio Response"
+  },
   "course.assessment.show.whileHoldingToCancelMoving": {
     "defaultMessage": "while holding to cancel moving."
   },
@@ -2933,120 +3479,114 @@
   "course.assessment.skills.SkillsTable.uncategorised": {
     "defaultMessage": "Uncategorised Skills"
   },
-  "course.assessment.liveFeedback.questionTitle": {
-    "defaultMessage": "Question {index}"
-  },
-  "course.assessment.liveFeedback.messageTimingTitle": {
-    "defaultMessage": "Generated at: {usedAt}"
-  },
-  "course.assessment.liveFeedback.liveFeedbackName": {
-    "defaultMessage": "Get Help"
-  },
-  "course.assessment.liveFeedback.comments": {
-    "defaultMessage": "Comments"
-  },
-  "course.assessment.liveFeedback.lineHeader": {
-    "defaultMessage": "Line {lineNumber}"
-  },
-  "course.assessment.submission.GetHelpChatPage.chatInputText": {
-    "defaultMessage": "How can we help you?"
-  },
-  "course.assessment.submission.GetHelpChatPage.chatMessagesRemaining": {
-    "defaultMessage": "{numMessages} / {maxMessages} {numMessages, plural, one {message} other {messages}} remaining"
-  },
-  "course.assessment.submission.GetHelpChatPage.noChatMessagesRemaining": {
-    "defaultMessage": "You have reached the message limit for this question."
-  },
-  "course.assessment.submission.GetHelpChatPage.codeUpdated": {
-    "defaultMessage": "Code Updated"
-  },
-  "course.assessment.submission.GetHelpChatPage.ConversationArea.lineNumber": {
-    "defaultMessage": "Line {lineNumber}"
-  },
-  "course.assessment.submission.GetHelpChatPage.ConversationArea.fileNameAndLineNumber": {
-    "defaultMessage": "{filename}:{lineNumber}"
-  },
-  "course.assessment.submission.GetHelpChatPage.ConversationArea.threadExpired": {
-    "defaultMessage": "The chat above has ended. Start a new chat?"
-  },
-  "course.assessment.plagiarism.plagiarism": {
-    "defaultMessage": "Plagiarism Results"
+  "course.assessment.statistics.ancestorFail": {
+    "defaultMessage": "Failed to fetch past iterations of this assessment."
   },
-  "course.assessment.plagiarism.status": {
-    "defaultMessage": "Plagiarism Check Status"
+  "course.assessment.statistics.ancestorSelect.current": {
+    "defaultMessage": "Current"
   },
-  "course.assessment.plagiarism.lastRunTime": {
-    "defaultMessage": "Last run at: {date}"
+  "course.assessment.statistics.ancestorSelect.fromCourse": {
+    "defaultMessage": "From {courseTitle}"
   },
-  "course.assessment.plagiarism.start": {
-    "defaultMessage": "New Plagiarism Check"
+  "course.assessment.statistics.ancestorSelect.subtitle": {
+    "defaultMessage": "Compare against past versions of this assessment:"
   },
-  "course.assessment.plagiarism.notStarted": {
-    "defaultMessage": "No plagiarism check has been run"
+  "course.assessment.statistics.ancestorSelect.title": {
+    "defaultMessage": "Duplication History"
   },
-  "course.assessment.plagiarism.confirmStartTitle": {
-    "defaultMessage": "Confirm Plagiarism Check?"
+  "course.assessment.statistics.ancestorStatisticsFail": {
+    "defaultMessage": "Failed to fetch ancestor's statistics."
   },
-  "course.assessment.plagiarism.confirmStartMessage": {
-    "defaultMessage": "Running a new plagiarism check will remove the previous results."
+  "course.assessment.statistics.answers": {
+    "defaultMessage": "Answers"
   },
-  "course.assessment.plagiarism.results": {
-    "defaultMessage": "Plagiarism Results (similarity between submissions)"
+  "course.assessment.statistics.attemptCount": {
+    "defaultMessage": "Attempt Count"
   },
-  "course.assessment.plagiarism.baseSubmission": {
-    "defaultMessage": "Base Submission"
+  "course.assessment.statistics.attempts.filename": {
+    "defaultMessage": "Question-level Attempt Statistics for {assessment}"
   },
-  "course.assessment.plagiarism.comparedSubmission": {
-    "defaultMessage": "Compared Submission"
+  "course.assessment.statistics.attempts.greenCellLegend": {
+    "defaultMessage": "Correct"
   },
-  "course.assessment.plagiarism.similarityScore": {
-    "defaultMessage": "Similarity Score"
+  "course.assessment.statistics.attempts.redCellLegend": {
+    "defaultMessage": "Incorrect"
   },
-  "course.assessment.plagiarism.actions": {
-    "defaultMessage": "Actions"
+  "course.assessment.statistics.closePrompt": {
+    "defaultMessage": "Close"
   },
-  "course.assessment.plagiarism.viewReport": {
-    "defaultMessage": "View Report"
+  "course.assessment.statistics.comments": {
+    "defaultMessage": "Comments"
   },
-  "course.assessment.plagiarism.downloadPdf": {
-    "defaultMessage": "Download PDF"
+  "course.assessment.statistics.duplicationHistory": {
+    "defaultMessage": "Duplication History"
   },
-  "course.assessment.plagiarism.searchByStudentName": {
-    "defaultMessage": "Search by Student Name"
+  "course.assessment.statistics.email": {
+    "defaultMessage": "Email"
   },
-  "course.assessment.plagiarism.showSelfPlagiarism": {
-    "defaultMessage": "Include self-plagiarism comparisons (same student, different courses)"
+  "course.assessment.statistics.fail": {
+    "defaultMessage": "Failed to fetch statistics."
   },
-  "course.assessment.statistics.answers": {
-    "defaultMessage": "Answers"
+  "course.assessment.statistics.gradeDisplay": {
+    "defaultMessage": "Grade: {grade} / {maxGrade}"
   },
-  "course.assessment.statistics.attempts.filename": {
-    "defaultMessage": "Question-level Attempt Statistics for {assessment}"
+  "course.assessment.statistics.gradeDistribution": {
+    "defaultMessage": "Grade Distribution"
   },
-  "course.assessment.statistics.attempts.greenCellLegend": {
-    "defaultMessage": "Correct"
+  "course.assessment.statistics.gradeDistribution.datasetLabel": {
+    "defaultMessage": "Distribution"
   },
-  "course.assessment.statistics.attempts.redCellLegend": {
-    "defaultMessage": "Incorrect"
+  "course.assessment.statistics.gradeDistribution.xAxisLabel": {
+    "defaultMessage": "Grades"
   },
-  "course.assessment.statistics.closePrompt": {
-    "defaultMessage": "Close"
+  "course.assessment.statistics.gradeDistribution.yAxisLabel": {
+    "defaultMessage": "Submissions"
   },
   "course.assessment.statistics.grader": {
     "defaultMessage": "Grader"
   },
+  "course.assessment.statistics.gradesPerQuestion": {
+    "defaultMessage": "Grades Per Question"
+  },
   "course.assessment.statistics.grayCellLegend": {
     "defaultMessage": "Undecided (question is Non-autogradable)"
   },
   "course.assessment.statistics.group": {
     "defaultMessage": "Group"
   },
-  "course.assessment.statistics.legendHigherusage": {
-    "defaultMessage": "Higher Usage"
+  "course.assessment.statistics.header": {
+    "defaultMessage": "Statistics for {title}"
+  },
+  "course.assessment.statistics.includePhantom": {
+    "defaultMessage": "Include Phantom Student"
+  },
+  "course.assessment.statistics.legendHigherLabelGrade": {
+    "defaultMessage": "Higher Grade"
+  },
+  "course.assessment.statistics.legendHigherLabelGradeDiff": {
+    "defaultMessage": "More Improvement"
   },
-  "course.assessment.statistics.legendLowerUsage": {
+  "course.assessment.statistics.legendLowerLabelGrade": {
+    "defaultMessage": "Lower Grade"
+  },
+  "course.assessment.statistics.legendLowerLabelGradeDiff": {
+    "defaultMessage": "Less Improvement"
+  },
+  "course.assessment.statistics.legendLowerLabelMessagesSent": {
     "defaultMessage": "Lower Usage"
   },
+  "course.assessment.statistics.legendLowerLabelWordCount": {
+    "defaultMessage": "Lower Word Count"
+  },
+  "course.assessment.statistics.legendUpperLabelMessagesSent": {
+    "defaultMessage": "Higher Usage"
+  },
+  "course.assessment.statistics.legendUpperLabelWordCount": {
+    "defaultMessage": "Higher Word Count"
+  },
+  "course.assessment.statistics.liveFeedback": {
+    "defaultMessage": "Get Help"
+  },
   "course.assessment.statistics.liveFeedback.filename": {
     "defaultMessage": "Question-level Get Help Statistics for {assessment}"
   },
@@ -3071,78 +3611,30 @@
   "course.assessment.statistics.nameGroupsSearchText": {
     "defaultMessage": "Search by Name or Groups"
   },
+  "course.assessment.statistics.noIncludePhantom": {
+    "defaultMessage": "*All statistics in this duplicated assessments does not include Phantom Students"
+  },
   "course.assessment.statistics.noSubmission": {
     "defaultMessage": "No submission yet"
   },
   "course.assessment.statistics.onlyForAutogradableAssessment": {
     "defaultMessage": "This table is only displayed for Assessment with at least one Autograded Questions"
   },
+  "course.assessment.statistics.pastAnswerTitle": {
+    "defaultMessage": "Submitted At: {submittedAt}"
+  },
   "course.assessment.statistics.questionDisplayTitle": {
     "defaultMessage": "Q{index} for {student}"
   },
   "course.assessment.statistics.questionIndex": {
     "defaultMessage": "Q{index}"
   },
-  "course.assessment.statistics.total": {
-    "defaultMessage": "Total"
-  },
-  "course.assessment.statistics.workflowState": {
-    "defaultMessage": "Status"
-  },
-  "course.assessment.statistics.ancestorFail": {
-    "defaultMessage": "Failed to fetch past iterations of this assessment."
-  },
-  "course.assessment.statistics.ancestorStatisticsFail": {
-    "defaultMessage": "Failed to fetch ancestor's statistics."
-  },
-  "course.assessment.statistics.fail": {
-    "defaultMessage": "Failed to fetch statistics."
-  },
-  "course.assessment.statistics.gradeDistribution": {
-    "defaultMessage": "Grade Distribution"
-  },
-  "course.assessment.statistics.gradeViolin.datasetLabel": {
-    "defaultMessage": "Distribution"
-  },
-  "course.assessment.statistics.gradeViolin.xAxisLabel": {
-    "defaultMessage": "Grades"
-  },
-  "course.assessment.statistics.gradeViolin.yAxisLabel": {
-    "defaultMessage": "Submissions"
-  },
-  "course.assessment.statistics.ancestorSelect.current": {
-    "defaultMessage": "Current"
-  },
-  "course.assessment.statistics.ancestorSelect.fromCourse": {
-    "defaultMessage": "From {courseTitle}"
-  },
-  "course.assessment.statistics.ancestorSelect.subtitle": {
-    "defaultMessage": "Compare against past versions of this assessment:"
-  },
-  "course.assessment.statistics.ancestorSelect.title": {
-    "defaultMessage": "Duplication History"
-  },
-  "course.assessment.statistics.attemptCount": {
-    "defaultMessage": "Attempt Count"
-  },
-  "course.assessment.statistics.duplicationHistory": {
-    "defaultMessage": "Duplication History"
-  },
-  "course.assessment.statistics.gradesPerQuestion": {
-    "defaultMessage": "Grades Per Question"
-  },
-  "course.assessment.statistics.includePhantom": {
-    "defaultMessage": "Include Phantom Student"
-  },
-  "course.assessment.statistics.liveFeedback": {
-    "defaultMessage": "Get Help"
-  },
-  "course.assessment.statistics.header": {
-    "defaultMessage": "Statistics for {title}"
-  },
   "course.assessment.statistics.statistics": {
     "defaultMessage": "Statistics"
   },
+  "course.assessment.statistics.submissionPage": {
+    "defaultMessage": "Go to Answer Page"
+  },
   "course.assessment.statistics.submissionStatuses": {
     "defaultMessage": "Submission Statuses"
   },
@@ -3161,9 +3653,18 @@
   "course.assessment.statistics.submissionTimeGradeChart.xAxisLabel.withoutDeadline": {
     "defaultMessage": "Submission Date"
   },
+  "course.assessment.statistics.total": {
+    "defaultMessage": "Total"
+  },
+  "course.assessment.statistics.workflowState": {
+    "defaultMessage": "Status"
+  },
   "course.assessment.submission.Annotations.comment": {
     "defaultMessage": "Add Comment"
   },
+  "course.assessment.submission.Answer.rendererNotImplemented": {
+    "defaultMessage": "The display for this question type has not been implemented yet."
+  },
   "course.assessment.submission.CodaveriFeedbackStatus.codaveriFeedbackStatus": {
     "defaultMessage": "Codaveri Feedback Status"
   },
@@ -3182,14 +3683,77 @@
   "course.assessment.submission.EvaluatorErrorPanel.emailSubject": {
     "defaultMessage": "[Bug Report] Evaluator Error"
   },
+  "course.assessment.submission.FileInput.exactlyOneFileUploadAllowed": {
+    "defaultMessage": "*You must upload EXACTLY 1 file for this question"
+  },
+  "course.assessment.submission.FileInput.fileName": {
+    "defaultMessage": "{index}. {name}"
+  },
+  "course.assessment.submission.FileInput.fileTooLargeErrorMessage": {
+    "defaultMessage": "The following files have size larger than allowed ({maxAttachmentSize} MB)"
+  },
+  "course.assessment.submission.FileInput.fileUploadErrorTitle": {
+    "defaultMessage": "Error in Uploading Files"
+  },
+  "course.assessment.submission.FileInput.onlyOneFileUploadAllowed": {
+    "defaultMessage": "*You can only upload AT MOST {maxAttachments} file for this question"
+  },
+  "course.assessment.submission.FileInput.requiredUploadLimitedNumberOfFiles": {
+    "defaultMessage": "*You can upload AT LEAST 1 and AT MOST {maxAttachments} files for this question"
+  },
+  "course.assessment.submission.FileInput.tooManyFilesErrorMessage": {
+    "defaultMessage": "You have attempted to upload {numFiles} files, but ONLY {maxAttachmentsAllowed} {maxAttachmentsAllowed, plural, one {file} other {files}} can be uploaded {numAttachments, plural, =0 {} one {since 1 file has been uploaded before} other {since {numAttachments} files has been uploaded before}}"
+  },
   "course.assessment.submission.FileInput.uploadDisabled": {
     "defaultMessage": "File upload disabled"
   },
   "course.assessment.submission.FileInput.uploadLabel": {
     "defaultMessage": "Drag and drop or click to upload files"
   },
+  "course.assessment.submission.GetHelpChatPage": {
+    "defaultMessage": "Get Help"
+  },
+  "course.assessment.submission.GetHelpChatPage.ConversationArea.fileNameAndLineNumber": {
+    "defaultMessage": "{filename}:{lineNumber}"
+  },
+  "course.assessment.submission.GetHelpChatPage.ConversationArea.lineNumber": {
+    "defaultMessage": "Line {lineNumber}"
+  },
+  "course.assessment.submission.GetHelpChatPage.ConversationArea.threadExpired": {
+    "defaultMessage": "The chat above has ended. Start a new chat?"
+  },
+  "course.assessment.submission.GetHelpChatPage.chatInputText": {
+    "defaultMessage": "How can we help you?"
+  },
+  "course.assessment.submission.GetHelpChatPage.chatMessagesRemaining": {
+    "defaultMessage": "{numMessages} / {maxMessages} {numMessages, plural, one {message} other {messages}} remaining"
+  },
+  "course.assessment.submission.GetHelpChatPage.codeUpdated": {
+    "defaultMessage": "Code Updated"
+  },
+  "course.assessment.submission.GetHelpChatPage.endOfConversation": {
+    "defaultMessage": "View code after conversation"
+  },
+  "course.assessment.submission.GetHelpChatPage.failedSyncingWithCodaveri": {
+    "defaultMessage": "Unavailable"
+  },
+  "course.assessment.submission.GetHelpChatPage.noChatMessagesRemaining": {
+    "defaultMessage": "You have reached the message limit for this question."
+  },
+  "course.assessment.submission.GetHelpChatPage.syncedWithCodaveri": {
+    "defaultMessage": "Ready"
+  },
+  "course.assessment.submission.GetHelpChatPage.syncingWithCodaveri": {
+    "defaultMessage": "Preparing"
+  },
+  "course.assessment.submission.ImportedFileView.delete": {
+    "defaultMessage": "Delete"
+  },
   "course.assessment.submission.ImportedFileView.deleteConfirmation": {
-    "defaultMessage": "Are you sure you want to delete this file?"
+    "defaultMessage": "Are you sure you want to delete \"{fileName}\"?"
+  },
+  "course.assessment.submission.ImportedFileView.deleteTitle": {
+    "defaultMessage": "Delete File"
   },
   "course.assessment.submission.ImportedFileView.noFiles": {
     "defaultMessage": "No files uploaded."
@@ -3197,17 +3761,44 @@
   "course.assessment.submission.ImportedFileView.uploadedFiles": {
     "defaultMessage": "Uploaded Files:"
   },
-  "course.assessment.submission.Answer.missingAnswer": {
-    "defaultMessage": "There is no answer submitted for this question - this might be caused by the addition of this question after the submission is submitted."
+  "course.assessment.submission.ResultView.expected": {
+    "defaultMessage": "Expected"
   },
-  "course.assessment.submission.answers.AnswerHeader.noPastAnswers": {
-    "defaultMessage": "No past answers."
+  "course.assessment.submission.ResultView.output": {
+    "defaultMessage": "Output"
   },
-  "course.assessment.submission.Answer.rendererNotImplemented": {
-    "defaultMessage": "The display for this question type has not been implemented yet."
+  "course.assessment.submission.ResultView.solution": {
+    "defaultMessage": "Solution"
   },
-  "course.assessment.submission.SubmissionAnswer.viewPastAnswers": {
-    "defaultMessage": "Past Answers"
+  "course.assessment.submission.ResultView.solutionHeaders.exactMatch": {
+    "defaultMessage": "Answer matches exactly {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionHeaders.keyword": {
+    "defaultMessage": "Answer contains keyword {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionHeaders.regex": {
+    "defaultMessage": "Answer matches regular expression {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionHeaders.spreadsheetFormula": {
+    "defaultMessage": "Answer formula equivalent to {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionInvertedHeaders.exactMatch": {
+    "defaultMessage": "Answer is not exactly {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionInvertedHeaders.keyword": {
+    "defaultMessage": "Answer does not contain keyword {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionInvertedHeaders.regex": {
+    "defaultMessage": "Answer does not match regular expression {solution}"
+  },
+  "course.assessment.submission.ResultView.solutionInvertedHeaders.spreadsheetFormula": {
+    "defaultMessage": "Answer formula not equivalent to {solution}"
+  },
+  "course.assessment.submission.SubmissionEditIndex.TimeLimitBanner.hoursMinutesSeconds": {
+    "defaultMessage": "{hrs, plural, one {# hour} other {# hours}} {mins, plural, =0 {} one {# minute} other {# minutes}} {secs, plural, =0 {} one {# second} other {# seconds}}"
+  },
+  "course.assessment.submission.SubmissionEditIndex.TimeLimitBanner.minutesSeconds": {
+    "defaultMessage": "{secs, plural, one {# second} other {# seconds}}"
   },
   "course.assessment.submission.SubmissionsIndex.accessLogs": {
     "defaultMessage": "Access Logs"
@@ -3242,6 +3833,9 @@
   "course.assessment.submission.SubmissionsIndex.experiencePoints": {
     "defaultMessage": "EXP Awarded"
   },
+  "course.assessment.submission.SubmissionsIndex.fetchFromKoditsu": {
+    "defaultMessage": "Fetch Submissions from Koditsu"
+  },
   "course.assessment.submission.SubmissionsIndex.forceSubmit": {
     "defaultMessage": "Force Submit Remaining"
   },
@@ -3254,12 +3848,12 @@
   "course.assessment.submission.SubmissionsIndex.includePhantoms": {
     "defaultMessage": "Include phantom users"
   },
-  "lib.translations.myStudents": {
-    "defaultMessage": "My Students"
-  },
   "course.assessment.submission.SubmissionsIndex.phantom": {
     "defaultMessage": "Phantom User"
   },
+  "course.assessment.submission.SubmissionsIndex.publishAutoFeedback": {
+    "defaultMessage": "Publish Automated Programming Feedback ({count})"
+  },
   "course.assessment.submission.SubmissionsIndex.publishGrades": {
     "defaultMessage": "Publish Grades"
   },
@@ -3269,21 +3863,6 @@
   "course.assessment.submission.SubmissionsIndex.remind": {
     "defaultMessage": "Send Reminder Emails"
   },
-  "lib.translations.staff": {
-    "defaultMessage": "Staff"
-  },
-  "lib.translations.students": {
-    "defaultMessage": "Students"
-  },
-  "lib.translations.myStudentsIncludingPhantoms": {
-    "defaultMessage": "My Students (Including Phantoms)"
-  },
-  "lib.translations.studentsIncludingPhantoms": {
-    "defaultMessage": "Students (Including Phantoms)"
-  },
-  "lib.translations.staffIncludingPhantoms": {
-    "defaultMessage": "Staff (Including Phantoms)"
-  },
   "course.assessment.submission.SubmissionsIndex.submissionStatus": {
     "defaultMessage": "Status"
   },
@@ -3299,6 +3878,9 @@
   "course.assessment.submission.SubmissionsIndex.userName": {
     "defaultMessage": "Name"
   },
+  "course.assessment.submission.TestCaseView.allFailed": {
+    "defaultMessage": "All failed"
+  },
   "course.assessment.submission.TestCaseView.allPassed": {
     "defaultMessage": "All passed"
   },
@@ -3338,8 +3920,17 @@
   "course.assessment.submission.TestCaseView.standardOutput": {
     "defaultMessage": "Standard Output"
   },
+  "course.assessment.submission.TestCaseView.testCasesPassed": {
+    "defaultMessage": "{numPassed}/{numTestCases} passed"
+  },
   "course.assessment.submission.UploadedFileView.deleteConfirmation": {
-    "defaultMessage": "Are you sure you want to delete this attachment?"
+    "defaultMessage": "Are you sure you want to delete {fileName}?"
+  },
+  "course.assessment.submission.UploadedFileView.deleteTitle": {
+    "defaultMessage": "Delete File"
+  },
+  "course.assessment.submission.UploadedFileView.deleting": {
+    "defaultMessage": "Delete"
   },
   "course.assessment.submission.UploadedFileView.noFiles": {
     "defaultMessage": "No files uploaded."
@@ -3348,7 +3939,7 @@
     "defaultMessage": "Uploaded Files"
   },
   "course.assessment.submission.VoiceResponseAnswer.chooseVoiceFileExplain": {
-    "defaultMessage": "Drag your audio file here, or click to select an audio file. Only wav and mp3 formats are supported. Alternatively, you may use the recorder below to record your response"
+    "defaultMessage": "Drag and drop or click to upload your WAV / MP3 files. Alternatively, use the recorder below to record your response"
   },
   "course.assessment.submission.VoiceResponseAnswer.pleaseRecordYourVoice": {
     "defaultMessage": "Please record your voice"
@@ -3473,6 +4064,24 @@
   "course.assessment.submission.answerSubmitted": {
     "defaultMessage": "Answer Submitted"
   },
+  "course.assessment.submission.answerTooLarge": {
+    "defaultMessage": "Answer Too Large"
+  },
+  "course.assessment.submission.answerTooLargeError": {
+    "defaultMessage": "Your answer must be less than 2 MB."
+  },
+  "course.assessment.submission.answers.AnswerHeader.noPastAnswers": {
+    "defaultMessage": "No past answers."
+  },
+  "course.assessment.submission.answers.AnswerHeader.viewAllAnswers": {
+    "defaultMessage": "All Answers ({count})"
+  },
+  "course.assessment.submission.answers.AnswerHeader.viewGetHelpHistory": {
+    "defaultMessage": "Get Help History ({count})"
+  },
+  "course.assessment.submission.answers.AnswerHeader.viewPastAnswers": {
+    "defaultMessage": "Past Answers ({count})"
+  },
   "course.assessment.submission.answers.ForumPostResponse.ForumCard.forumCardTitleTypeNoneSelected": {
     "defaultMessage": "Forum"
   },
@@ -3545,17 +4154,11 @@
   "course.assessment.submission.answers.ForumPostResponse.TopicCard.viewTopicInNewTab": {
     "defaultMessage": "View Topic"
   },
-  "course.assessment.submission.answers.Programming.ProgrammingFile.downloadFile": {
-    "defaultMessage": "Download File"
-  },
   "course.assessment.submission.answers.Programming.ProgrammingFile.sizeTooBig": {
     "defaultMessage": "The file is too big and cannot be displayed."
   },
-  "course.assessment.submission.answerTooLarge": {
-    "defaultMessage": "Answer Too Large"
-  },
-  "course.assessment.submission.answerTooLargeError": {
-    "defaultMessage": "Your answer must be less than 2 MB."
+  "course.assessment.submission.attachmentRequired": {
+    "defaultMessage": "*please upload AT LEAST 1 file for this question"
   },
   "course.assessment.submission.attemptedAt": {
     "defaultMessage": "Attempted At"
@@ -3578,14 +4181,17 @@
   "course.assessment.submission.bonusEndAt": {
     "defaultMessage": "Bonus End At"
   },
-  "course.assessment.submission.codaveriAutogradeFailure": {
-    "defaultMessage": "There is an error while evaluating your code in Codaveri. Try submitting your code again in a couple of minutes or check the error message in the network response."
+  "course.assessment.submission.category": {
+    "defaultMessage": "Category"
   },
-  "course.assessment.submission.liveFeedbackNoneGenerated": {
-    "defaultMessage": "Question {questionIndex}: No feedback generated."
+  "course.assessment.submission.checkAnswer": {
+    "defaultMessage": "Check Answer"
   },
-  "course.assessment.submission.liveFeedbackSuccess": {
-    "defaultMessage": "Question {questionIndex}: Feedback successfully generated."
+  "course.assessment.submission.checkAnswerWithLimit": {
+    "defaultMessage": "Check Answer ({attemptsLeft, plural, one {# attempt} other {# attempts}} left)"
+  },
+  "course.assessment.submission.codaveriAutogradeFailure": {
+    "defaultMessage": "There is an error while evaluating your code in Codaveri. Try submitting your code again in a couple of minutes or check the error message in the network response."
   },
   "course.assessment.submission.comment.CodaveriCommentCard.finalise": {
     "defaultMessage": "Finalise and Post Feedback"
@@ -3611,14 +4217,14 @@
   "course.assessment.submission.comment.CommentCard.deleteConfirmation": {
     "defaultMessage": "Are you sure you want to delete this comment?"
   },
-  "course.assessment.submission.comment.CommentCard.save": {
-    "defaultMessage": "Save"
+  "course.assessment.submission.comment.CommentCard.isAiGenerated": {
+    "defaultMessage": "AI Generated Comment"
   },
   "course.assessment.submission.comment.CommentCard.publish": {
     "defaultMessage": "Publish"
   },
-  "course.assessment.submission.comment.CommentCard.isAiGenerated": {
-    "defaultMessage": "AI Generated Comment"
+  "course.assessment.submission.comment.CommentCard.save": {
+    "defaultMessage": "Save"
   },
   "course.assessment.submission.comment.CommentField.comment": {
     "defaultMessage": "Comment"
@@ -3635,18 +4241,6 @@
   "course.assessment.submission.comments": {
     "defaultMessage": "Comments"
   },
-  "course.assessment.submission.answers.Programming.ProgrammingFiles.liveFeedbackItemDelete": {
-    "defaultMessage": "Dismiss"
-  },
-  "course.assessment.submission.answers.Programming.ProgrammingFiles.liveFeedbackItemDislike": {
-    "defaultMessage": "Dislike"
-  },
-  "course.assessment.submission.answers.Programming.ProgrammingFiles.liveFeedbackItemLike": {
-    "defaultMessage": "Like"
-  },
-  "course.assessment.submission.answers.Programming.ProgrammingFiles.liveFeedbackItemLineHeading": {
-    "defaultMessage": "Line {linenum}"
-  },
   "course.assessment.submission.continue": {
     "defaultMessage": "Continue"
   },
@@ -3692,6 +4286,9 @@
   "course.assessment.submission.emptyAssessment": {
     "defaultMessage": "This assessment currently has no questions."
   },
+  "course.assessment.submission.errorUnknown": {
+    "defaultMessage": "Error is Unknown"
+  },
   "course.assessment.submission.examDialogMessage": {
     "defaultMessage": "Please do not sign out or close the browser, otherwise you may have trouble continuing the exam."
   },
@@ -3701,6 +4298,18 @@
   "course.assessment.submission.expAwarded": {
     "defaultMessage": "EXP Awarded"
   },
+  "course.assessment.submission.explanation": {
+    "defaultMessage": "Explanation"
+  },
+  "course.assessment.submission.fetchSubmissionsFromKoditsuConfirmation": {
+    "defaultMessage": "Are you sure you want to fetch all submissions from Koditsu? all the existing answers here will be overwritten by the newer one. NOTE THAT THIS ACTION IS IRREVERSIBLE!"
+  },
+  "course.assessment.submission.fetchSubmissionsFromKoditsuPending": {
+    "defaultMessage": "Please wait as the submissions are currently being fetched from Koditsu."
+  },
+  "course.assessment.submission.fetchSubmissionsFromKoditsuSuccess": {
+    "defaultMessage": "All submissions have been fetched successfully from Koditsu"
+  },
   "course.assessment.submission.finalise": {
     "defaultMessage": "Finalise all answers"
   },
@@ -3731,6 +4340,9 @@
   "course.assessment.submission.grade": {
     "defaultMessage": "Grade"
   },
+  "course.assessment.submission.gradeDisplay": {
+    "defaultMessage": "Grade: {grade}"
+  },
   "course.assessment.submission.gradePrefilled": {
     "defaultMessage": "Pre-filled"
   },
@@ -3743,9 +4355,6 @@
   "course.assessment.submission.gradeSummary": {
     "defaultMessage": "Grade Summary"
   },
-  "course.assessment.submission.gradeUnsaved": {
-    "defaultMessage": "Unsaved"
-  },
   "course.assessment.submission.gradeUnsavedHint": {
     "defaultMessage": "This grade is not yet saved. Click Save Grade at the end of the page to save all grade changes."
   },
@@ -3761,6 +4370,12 @@
   "course.assessment.submission.group": {
     "defaultMessage": "Group"
   },
+  "course.assessment.submission.history.questionTitle": {
+    "defaultMessage": "Question Details"
+  },
+  "course.assessment.submission.history.title": {
+    "defaultMessage": "Submission by {studentName}, Question {number}"
+  },
   "course.assessment.submission.importFilesFailure": {
     "defaultMessage": "File uploads failed: {errors}"
   },
@@ -3770,9 +4385,24 @@
   "course.assessment.submission.invalidFileUpload": {
     "defaultMessage": "File uploads failed: Only java files can be uploaded"
   },
+  "course.assessment.submission.isSaved": {
+    "defaultMessage": "Saved"
+  },
+  "course.assessment.submission.isSaving": {
+    "defaultMessage": "Saving"
+  },
+  "course.assessment.submission.isUnsaved": {
+    "defaultMessage": "Unsaved"
+  },
   "course.assessment.submission.lateSubmission": {
     "defaultMessage": "This submission is LATE! You may want to penalize the student for late submission."
   },
+  "course.assessment.submission.liveFeedbackHistory.codeHistory": {
+    "defaultMessage": "Code History"
+  },
+  "course.assessment.submission.liveFeedbackNoneGenerated": {
+    "defaultMessage": "No feedback generated."
+  },
   "course.assessment.submission.loadingComment": {
     "defaultMessage": "Loading comment field..."
   },
@@ -3809,6 +4439,9 @@
   "course.assessment.submission.mark": {
     "defaultMessage": "Submit for Publishing"
   },
+  "course.assessment.submission.max": {
+    "defaultMessage": "Max"
+  },
   "course.assessment.submission.maximumGroupGrade": {
     "defaultMessage": "Maximum Grade for this Group"
   },
@@ -3821,6 +4454,9 @@
   "course.assessment.submission.ok": {
     "defaultMessage": "OK"
   },
+  "course.assessment.submission.onlyOneAttachmentAllowed": {
+    "defaultMessage": "*ONLY 1 file is allowed for this question"
+  },
   "course.assessment.submission.pastAnswers": {
     "defaultMessage": "Past Answers"
   },
@@ -3863,14 +4499,20 @@
   "course.assessment.submission.question": {
     "defaultMessage": "Question"
   },
-  "course.assessment.submission.questionNumber": {
-    "defaultMessage": "Q{number}"
+  "course.assessment.submission.questionAnswer": {
+    "defaultMessage": "Answer"
   },
   "course.assessment.submission.questionDescription": {
     "defaultMessage": "Description"
   },
-  "course.assessment.submission.questionAnswer": {
-    "defaultMessage": "Answer"
+  "course.assessment.submission.questionHeading": {
+    "defaultMessage": "Question {number}"
+  },
+  "course.assessment.submission.questionHeadingWithTitle": {
+    "defaultMessage": "Question {number}: {title}"
+  },
+  "course.assessment.submission.questionNumber": {
+    "defaultMessage": "Q{number}"
   },
   "course.assessment.submission.readOnlyEditor.expandComments": {
     "defaultMessage": "Expand all comments"
@@ -3881,6 +4523,12 @@
   "course.assessment.submission.reevaluate": {
     "defaultMessage": "Re-evaluate Answer"
   },
+  "course.assessment.submission.remainingBufferTime": {
+    "defaultMessage": "Finalising in: {timeLimit}"
+  },
+  "course.assessment.submission.remainingTime": {
+    "defaultMessage": "Time Remaining: {timeLimit}"
+  },
   "course.assessment.submission.rendererNotImplemented": {
     "defaultMessage": "The display for this question type has not been implemented yet."
   },
@@ -3893,14 +4541,8 @@
   "course.assessment.submission.resetConfirmation": {
     "defaultMessage": "Are you sure you want to reset your answer? This action is irreversible and you will lose all your current work for this question."
   },
-  "course.assessment.submission.checkAnswer": {
-    "defaultMessage": "Check Answer"
-  },
-  "course.assessment.submission.checkAnswerWithLimit": {
-    "defaultMessage": "Check Answer ({attemptsLeft, plural, one {# attempt} other {# attempts}} left)"
-  },
-  "course.assessment.submission.submitWithLimit": {
-    "defaultMessage": "Submit ({attemptsLeft, plural, one {# attempt} other {# attempts}} left)"
+  "course.assessment.submission.rubricScores": {
+    "defaultMessage": "Rubric Grades"
   },
   "course.assessment.submission.saveDraft": {
     "defaultMessage": "Save Draft"
@@ -3908,6 +4550,15 @@
   "course.assessment.submission.saveGrade": {
     "defaultMessage": "Save Grade"
   },
+  "course.assessment.submission.saved": {
+    "defaultMessage": "Saved"
+  },
+  "course.assessment.submission.saving": {
+    "defaultMessage": "Saving"
+  },
+  "course.assessment.submission.savingFailed": {
+    "defaultMessage": "Saving Failed"
+  },
   "course.assessment.submission.sendReminderEmailConfirmation": {
     "defaultMessage": "Send reminder emails to {unattempted} unattempted and {attempting} attempting user(s) ({selectedUsers}) who have not completed the assessment?"
   },
@@ -3944,6 +4595,9 @@
   "course.assessment.submission.submissionBy": {
     "defaultMessage": "Submission by {name}"
   },
+  "course.assessment.submission.submissionError": {
+    "defaultMessage": "There is a problem in submitting question for {questions}"
+  },
   "course.assessment.submission.submissionsHeader": {
     "defaultMessage": "Submissions: {assessment}"
   },
@@ -3956,14 +4610,47 @@
   "course.assessment.submission.submitShortcut": {
     "defaultMessage": "(Ctrl+Enter) or (⌘+Enter)"
   },
+  "course.assessment.submission.submitWithLimit": {
+    "defaultMessage": "Submit ({attemptsLeft, plural, one {# attempt} other {# attempts}} left)"
+  },
   "course.assessment.submission.submitted": {
     "defaultMessage": "Submitted"
   },
   "course.assessment.submission.submittedAt": {
     "defaultMessage": "Submitted At"
   },
-  "course.assessment.submission.unknown": {
-    "defaultMessage": "Unknown status, please contact administrator"
+  "course.assessment.submission.suggestions.howDoIFixThis": {
+    "defaultMessage": "How do I fix this?"
+  },
+  "course.assessment.submission.suggestions.iAmStuck": {
+    "defaultMessage": "I am stuck"
+  },
+  "course.assessment.submission.suggestions.looksWrong": {
+    "defaultMessage": "This looks wrong"
+  },
+  "course.assessment.submission.suggestions.optimizeThisCode": {
+    "defaultMessage": "Review my code"
+  },
+  "course.assessment.submission.suggestions.questionUnclear": {
+    "defaultMessage": "Explain the question"
+  },
+  "course.assessment.submission.suggestions.whereAmIWrong": {
+    "defaultMessage": "Where am I wrong?"
+  },
+  "course.assessment.submission.timeIsUp": {
+    "defaultMessage": "Time is Up!"
+  },
+  "course.assessment.submission.timedAssessmentDialogMessage": {
+    "defaultMessage": "{stillSomeTimeRemaining, select, true {Once the time is up, the assessment will be automatically finalised.} other {Finalising the submission now!}}"
+  },
+  "course.assessment.submission.timedAssessmentDialogTitle": {
+    "defaultMessage": "{stillSomeTimeRemaining, select, true {{remainingTime} {isNewSubmission, select, true {} other {remaining}} to complete this assessment.} other {The assessment has ended!}}"
+  },
+  "course.assessment.submission.timedExamDialogMessage": {
+    "defaultMessage": "{stillSomeTimeRemaining, select, true {Please do not sign out or close the browser while attempting this exam. Once the time is up, the assessment will be automatically finalised.} other {Finalising the submission now!}}"
+  },
+  "course.assessment.submission.timedExamDialogTitle": {
+    "defaultMessage": "{stillSomeTimeRemaining, select, true {{remainingTime} {isNewSubmission, select, true {} other {remaining}} to complete this exam.} other {The exam has ended!}}"
   },
   "course.assessment.submission.totalGrade": {
     "defaultMessage": "Total Grade"
@@ -3971,6 +4658,9 @@
   "course.assessment.submission.type": {
     "defaultMessage": "Type"
   },
+  "course.assessment.submission.unknown": {
+    "defaultMessage": "Unknown status, please contact administrator"
+  },
   "course.assessment.submission.unmark": {
     "defaultMessage": "Revert to Submitted"
   },
@@ -3984,7 +4674,7 @@
     "defaultMessage": "Unsubmit Submission"
   },
   "course.assessment.submission.unsubmitAllConfirmation": {
-    "defaultMessage": "Are you sure you want to UNSUBMIT the submissions for all {users}? All submissions will be unsubmitted and this will reset the submission time and permit the users to change their answers. NOTE THAT THIS ACTION IS IRREVERSIBLE"
+    "defaultMessage": "Are you sure you want to UNSUBMIT the submissions for all {users}? All submissions will be unsubmitted and this will reset the submission time and permit the users to change their submissions. NOTE THAT THIS ACTION IS IRREVERSIBLE"
   },
   "course.assessment.submission.unsubmitAllSubmissionsJobPending": {
     "defaultMessage": "Please wait as the submissions are currently being unsubmitted."
@@ -4001,6 +4691,9 @@
   "course.assessment.submission.updateFailure": {
     "defaultMessage": "Submission update failed: {errors}"
   },
+  "course.assessment.submission.updateIndividualSuccess": {
+    "defaultMessage": "Submission for {errors} updated successfully"
+  },
   "course.assessment.submission.updateSuccess": {
     "defaultMessage": "Submission updated successfully."
   },
@@ -4037,9 +4730,6 @@
   "course.assessment.submissions.SubmissionsIndex.header": {
     "defaultMessage": "Submissions"
   },
-  "course.assessment.submission.SubmissionsIndex.publishAutoFeedback": {
-    "defaultMessage": "Publish Automated Programming Feedback ({count})"
-  },
   "course.assessment.submissions.SubmissionsTable.gradeTooltip": {
     "defaultMessage": "These grades can't be seen by the student until they are published"
   },
@@ -4062,7 +4752,7 @@
     "defaultMessage": "Submitted At"
   },
   "course.assessment.submissions.SubmissionsTable.tableHeaderTitle": {
-    "defaultMessage": "Assessment"
+    "defaultMessage": "Title"
   },
   "course.assessment.submissions.SubmissionsTable.tableHeaderTotalGrade": {
     "defaultMessage": "Grade"
@@ -4121,6 +4811,18 @@
   "course.assessments.index.hasTodo": {
     "defaultMessage": "Has TODO"
   },
+  "course.assessments.index.inviteToKoditsu": {
+    "defaultMessage": "Invite users to Koditsu Exam"
+  },
+  "course.assessments.index.invitingUserToKoditsu": {
+    "defaultMessage": "Inviting users to Koditsu Exam"
+  },
+  "course.assessments.index.invitingUserToKoditsuFailure": {
+    "defaultMessage": "There is a problem in inviting users to Koditsu. Please try again later"
+  },
+  "course.assessments.index.invitingUserToKoditsuSuccess": {
+    "defaultMessage": "Successful in inviting users to Koditsu Exam"
+  },
   "course.assessments.index.neededFor": {
     "defaultMessage": "Needed for"
   },
@@ -4151,6 +4853,9 @@
   "course.assessments.index.submittedCount": {
     "defaultMessage": "Submissions"
   },
+  "course.assessments.index.timeLimitIcon": {
+    "defaultMessage": "Time Limit: {timeLimit, plural, one {# minute} other {# minutes}}"
+  },
   "course.assessments.index.title": {
     "defaultMessage": "Title"
   },
@@ -4169,9 +4874,6 @@
   "course.asssessment.submission.submitNoQuestionExplain": {
     "defaultMessage": "Mark as completed?"
   },
-  "course.admin.NotificationSettings.component": {
-    "defaultMessage": "Component"
-  },
   "course.componentTitles.course_achievements_component": {
     "defaultMessage": "Achievements"
   },
@@ -4253,15 +4955,6 @@
   "course.courses.CourseAnnouncements.announcementHeader": {
     "defaultMessage": "Latest announcements"
   },
-  "course.courses.CourseSuspendedAlert.header": {
-    "defaultMessage": "This course is suspended. Instructors can still access it, but students cannot."
-  },
-  "course.courses.CourseSuspendedAlert.canSuspendMessage": {
-    "defaultMessage": "You can unsuspend it from the {link} page."
-  },
-  "course.courses.CourseSuspendedAlert.cannotSuspendMessage": {
-    "defaultMessage": "If you believe this is a mistake, contact a course manager or owner to have them unsuspend the course."
-  },
   "course.courses.CourseDisplay.noCourse": {
     "defaultMessage": "There is no course yet..."
   },
@@ -4307,6 +5000,15 @@
   "course.courses.CourseShow.instructorsHeader": {
     "defaultMessage": "Instructors"
   },
+  "course.courses.CourseSuspendedAlert.canSuspendMessage": {
+    "defaultMessage": "You can unsuspend it from the {link} page."
+  },
+  "course.courses.CourseSuspendedAlert.cannotSuspendMessage": {
+    "defaultMessage": "If you believe this is a mistake, contact a course manager or owner to have them unsuspend the course."
+  },
+  "course.courses.CourseSuspendedAlert.header": {
+    "defaultMessage": "This course is suspended. Instructors can still access it, but students cannot."
+  },
   "course.courses.CourseUserItem.differentCourseNameHint": {
     "defaultMessage": "You're seeing a name different from your account name because this course's manager invited you with this name."
   },
@@ -4422,7 +5124,7 @@
     "defaultMessage": "Starts at"
   },
   "course.courses.PendingTodosTable.tableHeaderTitle": {
-    "defaultMessage": "Title"
+    "defaultMessage": "Assessment"
   },
   "course.courses.PendingTodosTable.tableSeeMore": {
     "defaultMessage": "See {n} more"
@@ -4430,6 +5132,9 @@
   "course.courses.Sidebar.administration": {
     "defaultMessage": "Administration"
   },
+  "course.courses.Sidebar.joinCoursemologyMessage": {
+    "defaultMessage": "Create a Coursemology account or sign up to join this course."
+  },
   "course.courses.SidebarItem.admin.duplication": {
     "defaultMessage": "Duplicate Data"
   },
@@ -4475,15 +5180,15 @@
   "course.courses.SidebarItem.home": {
     "defaultMessage": "Home"
   },
+  "course.courses.SidebarItem.scholaistic.assessments": {
+    "defaultMessage": "Role-Playing Assessments"
+  },
   "course.courses.SidebarItem.stories.learn": {
     "defaultMessage": "Learn"
   },
   "course.courses.SidebarItem.stories.missionControl": {
     "defaultMessage": "Mission Control"
   },
-  "course.courses.SidebarItem.scholaistic.assessments": {
-    "defaultMessage": "Role-Playing Assessments"
-  },
   "course.courses.TodoIgnoreButton.ignore.ignoreButtonText": {
     "defaultMessage": "Ignore"
   },
@@ -4526,6 +5231,12 @@
   "course.discussion.topics.CommentCard.deleteSuccess": {
     "defaultMessage": "Successfully deleted comment."
   },
+  "course.discussion.topics.CommentCard.isAiGenerated": {
+    "defaultMessage": "AI Generated Comment"
+  },
+  "course.discussion.topics.CommentCard.publish": {
+    "defaultMessage": "Publish"
+  },
   "course.discussion.topics.CommentCard.publishFailure": {
     "defaultMessage": "Failed to publish feedback."
   },
@@ -4547,12 +5258,6 @@
   "course.discussion.topics.CommentCard.updateSuccess": {
     "defaultMessage": "Successfully updated comment."
   },
-  "course.discussion.topics.CommentCard.publish": {
-    "defaultMessage": "Publish"
-  },
-  "course.discussion.topics.CommentCard.isAiGenerated": {
-    "defaultMessage": "AI Generated Comment"
-  },
   "course.discussion.topics.CommentField.comment": {
     "defaultMessage": "Comment"
   },
@@ -4620,7 +5325,7 @@
     "defaultMessage": "Select current instance"
   },
   "course.duplication.Duplication.DestinationCourseSelector.InstanceDropdown.destinationInstance": {
-    "defaultMessage": "Destination Instance"
+    "defaultMessage": "Destination instance"
   },
   "course.duplication.Duplication.DestinationCourseSelector.NewCourseForm.newStartAt": {
     "defaultMessage": "New Start Date *"
@@ -4724,15 +5429,15 @@
   "course.duplication.Duplication.duplicateData": {
     "defaultMessage": "Duplicate Data"
   },
-  "course.duplication.Duplication.fromCourse": {
-    "defaultMessage": "Duplicate Data from {courseTitle}"
-  },
   "course.duplication.Duplication.duplicationDisabled": {
     "defaultMessage": "Duplication is disabled for this course."
   },
   "course.duplication.Duplication.existingCourse": {
     "defaultMessage": "Existing Course"
   },
+  "course.duplication.Duplication.fromCourse": {
+    "defaultMessage": "Duplicate data from {courseTitle}"
+  },
   "course.duplication.Duplication.items": {
     "defaultMessage": "Selected Items"
   },
@@ -4826,21 +5531,6 @@
   "course.enrolRequests.UserRequests.rejected": {
     "defaultMessage": "Rejected Enrolment Requests"
   },
-  "course.experiencePoints.downloadCsvButton": {
-    "defaultMessage": "Download CSV"
-  },
-  "course.experiencePoints.downloadFailure": {
-    "defaultMessage": "An error occurred while doing your request for download."
-  },
-  "course.experiencePoints.downloadPending": {
-    "defaultMessage": "Please wait as your request to download is being processed."
-  },
-  "course.experiencePoints.downloadRequestSuccess": {
-    "defaultMessage": "Your request to download is successful"
-  },
-  "course.experiencePoints.filterByNameButton": {
-    "defaultMessage": "Filter by Name"
-  },
   "course.experiencePoints.disbursement.DisbursementForm.createDisbursementFailure": {
     "defaultMessage": "Failed to award experience points."
   },
@@ -4872,7 +5562,7 @@
     "defaultMessage": "Disburse Points"
   },
   "course.experiencePoints.disbursement.DisbursementIndex.disbursements": {
-    "defaultMessage": "Disbursed Experience Points"
+    "defaultMessage": "Experience Points"
   },
   "course.experiencePoints.disbursement.DisbursementIndex.experienceTab": {
     "defaultMessage": "History"
@@ -4910,6 +5600,15 @@
   "course.experiencePoints.disbursement.FilterForm.weeklyCap": {
     "defaultMessage": "Weekly Cap"
   },
+  "course.experiencePoints.disbursement.ForumDisbursement.fetchDisbursementFailure": {
+    "defaultMessage": "Failed to retrieve data."
+  },
+  "course.experiencePoints.disbursement.ForumDisbursement.fetchForumPostsFailure": {
+    "defaultMessage": "Failed to fetch forum posts."
+  },
+  "course.experiencePoints.disbursement.ForumDisbursement.postListDialogHeader": {
+    "defaultMessage": "Posts created between {startDate} and {endDate} by"
+  },
   "course.experiencePoints.disbursement.ForumDisbursementForm.createDisbursementFailure": {
     "defaultMessage": "Failed to award experience points."
   },
@@ -4919,9 +5618,6 @@
   "course.experiencePoints.disbursement.ForumDisbursementForm.fetchForumPostsFailure": {
     "defaultMessage": "Failed to fetch forum posts."
   },
-  "course.experiencePoints.disbursement.ForumDisbursementForm.postListDialogHeader": {
-    "defaultMessage": "Posts created between {startDate} and {endDate} by"
-  },
   "course.experiencePoints.disbursement.ForumDisbursementForm.reason": {
     "defaultMessage": "Reason For Disbursement"
   },
@@ -4961,6 +5657,27 @@
   "course.experiencePoints.disbursement.ForumPostTable.voteTally": {
     "defaultMessage": "Vote Tally"
   },
+  "course.experiencePoints.disbursement.GeneralDisbursement.fetchDisbursementFailure": {
+    "defaultMessage": "Failed to retrieve data."
+  },
+  "course.experiencePoints.downloadCsvButton": {
+    "defaultMessage": "Download CSV"
+  },
+  "course.experiencePoints.downloadFailure": {
+    "defaultMessage": "An error occurred while doing your request for download."
+  },
+  "course.experiencePoints.downloadPending": {
+    "defaultMessage": "Please wait as your request to download is being processed."
+  },
+  "course.experiencePoints.downloadRequestSuccess": {
+    "defaultMessage": "Your request to download is successful"
+  },
+  "course.experiencePoints.fetchRecordsFailure": {
+    "defaultMessage": "Failed to fetch records"
+  },
+  "course.experiencePoints.filterByNameButton": {
+    "defaultMessage": "Filter by Name"
+  },
   "course.forum.FormShow.fetchTopicsFailure": {
     "defaultMessage": "Failed to retrieve forum topic data."
   },
@@ -5198,48 +5915,57 @@
   "course.forum.ForumsIndex.newForum": {
     "defaultMessage": "New Forum"
   },
+  "course.forum.GenerateReplyButton.generateReply": {
+    "defaultMessage": "Generate reply"
+  },
+  "course.forum.GenerateReplyButton.generateReplySuccess": {
+    "defaultMessage": "A reply has been successfully generated."
+  },
+  "course.forum.GenerateReplyButton.generatingReply": {
+    "defaultMessage": "Generating reply"
+  },
   "course.forum.HideButton.hide": {
     "defaultMessage": "Hide"
   },
-  "course.forum.HideButton.hideTooltip": {
-    "defaultMessage": "Hide topic from students"
-  },
   "course.forum.HideButton.hideFailure": {
     "defaultMessage": "Failed to hide the topic \"{title}\" - {error}"
   },
   "course.forum.HideButton.hideSuccess": {
     "defaultMessage": "The topic \"{title}\" has successfully been hidden."
   },
+  "course.forum.HideButton.hideTooltip": {
+    "defaultMessage": "Hide topic from students"
+  },
   "course.forum.HideButton.unhide": {
     "defaultMessage": "Unhide"
   },
-  "course.forum.HideButton.unhideTooltip": {
-    "defaultMessage": "Show topic to students"
-  },
   "course.forum.HideButton.unhideFailure": {
     "defaultMessage": "Failed to unhide the topic \"{title}\" - {error}"
   },
   "course.forum.HideButton.unhideSuccess": {
     "defaultMessage": "The topic \"{title}\" has successfully been unhidden."
   },
-  "course.forum.LockButton.locked": {
-    "defaultMessage": "Lock"
+  "course.forum.HideButton.unhideTooltip": {
+    "defaultMessage": "Show topic to students"
   },
   "course.forum.LockButton.lockTooltip": {
     "defaultMessage": "Lock to stop students from posting in this topic"
   },
+  "course.forum.LockButton.locked": {
+    "defaultMessage": "Lock"
+  },
   "course.forum.LockButton.lockedFailure": {
     "defaultMessage": "Failed to locked the topic \"{title}\" - {error}"
   },
   "course.forum.LockButton.lockedSuccess": {
     "defaultMessage": "The topic \"{title}\" has successfully been locked."
   },
-  "course.forum.LockButton.unlocked": {
-    "defaultMessage": "Unlock"
-  },
   "course.forum.LockButton.unlockTooltip": {
     "defaultMessage": "Unlock to allow students to post within this topic"
   },
+  "course.forum.LockButton.unlocked": {
+    "defaultMessage": "Unlock"
+  },
   "course.forum.LockButton.unlockedFailure": {
     "defaultMessage": "Failed to unlocked the topic \"{title}\" - {error}"
   },
@@ -5258,6 +5984,12 @@
   "course.forum.MarkAnswerButton.markAsAnswer": {
     "defaultMessage": "Mark as answer"
   },
+  "course.forum.MarkAnswerButton.markAsAnswerAndPublish": {
+    "defaultMessage": "Mark as answer and publish"
+  },
+  "course.forum.MarkAnswerButton.markAsAnswerAndPublishTooltip": {
+    "defaultMessage": "Mark as answer and publish for students to view"
+  },
   "course.forum.MarkAnswerButton.markedAsAnswer": {
     "defaultMessage": "Marked as answer"
   },
@@ -5357,6 +6089,27 @@
   "course.forum.forum.markAllAsReadFailed": {
     "defaultMessage": "Failed to mark all topics in this forum as read. Please try again later."
   },
+  "course.forum.publishButton.generateReplyDisabledTooltip": {
+    "defaultMessage": "Disabled for generated reply"
+  },
+  "course.forum.publishButton.generateReplySuccess": {
+    "defaultMessage": "Failed to generate a reply."
+  },
+  "course.forum.publishButton.generateReplyTooltip": {
+    "defaultMessage": "Generate a draft reply using AI"
+  },
+  "course.forum.publishButton.publish": {
+    "defaultMessage": "Publish"
+  },
+  "course.forum.publishButton.publishFailure": {
+    "defaultMessage": "Failed to publish the post."
+  },
+  "course.forum.publishButton.publishSuccess": {
+    "defaultMessage": "The post has succesfully been published."
+  },
+  "course.forum.publishButton.publishTooltip": {
+    "defaultMessage": "Pusblish post to students"
+  },
   "course.group.GroupCreationForm.description": {
     "defaultMessage": "Description (Optional)"
   },
@@ -5633,27 +6386,27 @@
   "course.leaderboard.LeaderboardTable.average": {
     "defaultMessage": "Average"
   },
-  "course.leaderboard.LeaderboardTable.experience": {
-    "defaultMessage": "Experience"
+  "course.leaderboard.LeaderboardTable.averageAchievements": {
+    "defaultMessage": "Average Achievements"
   },
-  "course.leaderboard.LeaderboardTable.rank": {
-    "defaultMessage": "Rank"
+  "course.leaderboard.LeaderboardTable.averageExperience": {
+    "defaultMessage": "Average Experience"
   },
-  "course.leaderboard.LeaderboardTable.name": {
-    "defaultMessage": "Name"
+  "course.leaderboard.LeaderboardTable.experience": {
+    "defaultMessage": "Experience"
   },
   "course.leaderboard.LeaderboardTable.level": {
     "defaultMessage": "Level"
   },
-  "course.leaderboard.LeaderboardTable.averageExperience": {
-    "defaultMessage": "Average Experience"
-  },
-  "course.leaderboard.LeaderboardTable.averageAchievements": {
-    "defaultMessage": "Average Achievements"
-  },
   "course.leaderboard.LeaderboardTable.members": {
     "defaultMessage": "Members"
   },
+  "course.leaderboard.LeaderboardTable.name": {
+    "defaultMessage": "Name"
+  },
+  "course.leaderboard.LeaderboardTable.rank": {
+    "defaultMessage": "Rank"
+  },
   "course.leaderboard.LeaderboardTable.titleAchievements": {
     "defaultMessage": "By Achievements"
   },
@@ -5822,20 +6575,56 @@
   "course.level.Level.levelHeader": {
     "defaultMessage": "Levels"
   },
-  "course.level.Level.saveFailure": {
-    "defaultMessage": "Level saving failed, please try again."
+  "course.level.Level.orderedIncorrectly": {
+    "defaultMessage": "Levels will be sorted automatically when saved regardless of their order here."
+  },
+  "course.level.Level.placeholder": {
+    "defaultMessage": "0"
   },
-  "course.level.Level.saveLevels": {
-    "defaultMessage": "Save Levels"
+  "course.level.Level.reset": {
+    "defaultMessage": "Reset"
+  },
+  "course.level.Level.resetTooltip": {
+    "defaultMessage": "Reset changes"
+  },
+  "course.level.Level.saveChanges": {
+    "defaultMessage": "Save"
+  },
+  "course.level.Level.saveFailure": {
+    "defaultMessage": "Failed to save levels"
   },
   "course.level.Level.saveSuccess": {
     "defaultMessage": "Levels Saved"
   },
   "course.level.Level.thresholdHeader": {
-    "defaultMessage": "Threshold"
+    "defaultMessage": "EXP Threshold"
+  },
+  "course.level.Level.unsavedChanges": {
+    "defaultMessage": "You have unsaved changes"
+  },
+  "course.material.files.DownloadingFilePage.clickToDownloadFile": {
+    "defaultMessage": "Download {name}"
   },
-  "course.level.LevelRow.zeroThresholdError": {
-    "defaultMessage": "Experience points threshold cannot be 0"
+  "course.material.files.DownloadingFilePage.clickToDownloadFileDescription": {
+    "defaultMessage": "Something happened when initiating an automatic download. Click the link below to immediately download the file."
+  },
+  "course.material.files.DownloadingFilePage.downloading": {
+    "defaultMessage": "Downloading {name}"
+  },
+  "course.material.files.DownloadingFilePage.downloadingDescription": {
+    "defaultMessage": "This file should start downloading automatically now. If it doesn't, you can try again by clicking the link below or refreshing this page."
+  },
+  "course.material.files.DownloadingFilePage.tryDownloadingAgain": {
+    "defaultMessage": "Try downloading again"
+  },
+  "course.material.files.ErrorRetrievingFilePage.goToTheWorkbin": {
+    "defaultMessage": "Go to the Workbin"
+  },
+  "course.material.files.ErrorRetrievingFilePage.problemRetrievingFile": {
+    "defaultMessage": "Problem retrieving file"
+  },
+  "course.material.files.ErrorRetrievingFilePage.problemRetrievingFileDescription": {
+    "defaultMessage": "Either it no longer exists, you don't have the permission to access it, or something unexpected happened when we were trying to retrieve it."
   },
   "course.material.folders.DownloadFolderButton.downloadFolderErrorMessage": {
     "defaultMessage": "Download has failed. Please try again later."
@@ -5846,6 +6635,15 @@
   "course.material.folders.DownloadFolderButton.downloading": {
     "defaultMessage": "Downloading..."
   },
+  "course.material.folders.ErrorRetrievingFolderPage.goToMainFolder": {
+    "defaultMessage": "Go to the main folder"
+  },
+  "course.material.folders.ErrorRetrievingFolderPage.problemRetrievingFolder": {
+    "defaultMessage": "Problem retrieving folder"
+  },
+  "course.material.folders.ErrorRetrievingFolderPage.problemRetrievingFolderDescription": {
+    "defaultMessage": "Either it no longer exists, you don't have the permission to access it, or something unexpected happened when we were trying to retrieve it."
+  },
   "course.material.folders.FolderEdit.editSubfolderTitle": {
     "defaultMessage": "Edit Folder"
   },
@@ -5885,6 +6683,12 @@
   "course.material.folders.FolderShow.defaultHeader": {
     "defaultMessage": "Materials"
   },
+  "course.material.folders.FolderShow.error": {
+    "defaultMessage": "(Error)"
+  },
+  "course.material.folders.FolderShow.folderNotFound": {
+    "defaultMessage": "Folder not found"
+  },
   "course.material.folders.MaterialEdit.editMaterialTitle": {
     "defaultMessage": "Edit Material"
   },
@@ -5930,41 +6734,71 @@
   "course.material.folders.UploadFilesButton.uploadFilesTooltip": {
     "defaultMessage": "Upload"
   },
+  "course.material.folders.WorkbinTable.lastModified": {
+    "defaultMessage": "Last Modified"
+  },
+  "course.material.folders.WorkbinTable.name": {
+    "defaultMessage": "Name"
+  },
+  "course.material.folders.WorkbinTable.startAt": {
+    "defaultMessage": "Start At"
+  },
   "course.material.folders.WorkbinTableButtons.DeletionFailure": {
     "defaultMessage": "could not be deleted"
   },
+  "course.material.folders.WorkbinTableButtons.addFailure": {
+    "defaultMessage": "{material} could not be added to knowledge base"
+  },
   "course.material.folders.WorkbinTableButtons.deleteConfirmation": {
     "defaultMessage": "Are you sure you want to delete"
   },
   "course.material.folders.WorkbinTableButtons.deletionSuccess": {
     "defaultMessage": "has been deleted"
   },
+  "course.material.folders.WorkbinTableButtons.removeFailure": {
+    "defaultMessage": "{material} could not be removed from knowledge base"
+  },
+  "course.material.folders.WorkbinTableButtons.removeSuccess": {
+    "defaultMessage": "{material} has been removed from knowledge base"
+  },
   "course.material.folders.WorkbinTableButtons.tableButtonDeleteTooltip": {
     "defaultMessage": "Delete"
   },
-  "course.material.folders.WorkbinTable.name": {
-    "defaultMessage": "Name"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkDialog.linkAssessments": {
+    "defaultMessage": "Link Assessments"
   },
-  "course.material.folders.WorkbinTable.lastModified": {
-    "defaultMessage": "Last Modified"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkDialog.linkedAssessments": {
+    "defaultMessage": "Linked Assessments"
   },
-  "course.material.folders.WorkbinTable.startAt": {
-    "defaultMessage": "Start At"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkDialog.searchPlaceholder": {
+    "defaultMessage": "Search by Assessment Title"
   },
-  "course.plagiarism.PlagiarismIndex.header.plagiarism": {
-    "defaultMessage": "Plagiarism Check"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkDialog.unlinkedAssessments": {
+    "defaultMessage": "Available Assessments"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.assessment": {
-    "defaultMessage": "Assessments"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkDialog.updateLinksFailure": {
+    "defaultMessage": "Failed to update assessment links"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.numSubmitted": {
-    "defaultMessage": "# Submissions"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkDialog.updateLinksSuccess": {
+    "defaultMessage": "Assessment links updated successfully"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.numCheckableQuestions": {
-    "defaultMessage": "# Checkable Questions"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkList.cannotManage": {
+    "defaultMessage": "You do not have permission to manage this assessment."
   },
-  "course.plagiarism.PlagiarismIndex.assessments.lastSubmittedAt": {
-    "defaultMessage": "Last Submission At"
+  "course.plagiarism.PlagiarismIndex.assessments.AssessmentLinkList.noAssessmentsFound": {
+    "defaultMessage": "No assessments found"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.actions": {
+    "defaultMessage": "Actions"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.assessment": {
+    "defaultMessage": "Assessment"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.confirmRerunMessage": {
+    "defaultMessage": "Some of the selected assessments already have completed plagiarism checks. Running a new plagiarism check will remove the previous results."
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.confirmRerunTitle": {
+    "defaultMessage": "Confirm Plagiarism Check?"
   },
   "course.plagiarism.PlagiarismIndex.assessments.lastRunStatus": {
     "defaultMessage": "Status"
@@ -5972,17 +6806,17 @@
   "course.plagiarism.PlagiarismIndex.assessments.lastRunTime": {
     "defaultMessage": "Last Run At"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.statusNotStarted": {
-    "defaultMessage": "Not Started"
+  "course.plagiarism.PlagiarismIndex.assessments.lastSubmittedAt": {
+    "defaultMessage": "Last Submission At"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.statusRunning": {
-    "defaultMessage": "Running"
+  "course.plagiarism.PlagiarismIndex.assessments.linkAssessments": {
+    "defaultMessage": "Link Assessments"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.statusCompleted": {
-    "defaultMessage": "Completed"
+  "course.plagiarism.PlagiarismIndex.assessments.newSubmissionsWarning": {
+    "defaultMessage": "New submissions detected since last plagiarism run"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.statusFailed": {
-    "defaultMessage": "Failed"
+  "course.plagiarism.PlagiarismIndex.assessments.noNewSubmissionsWarning": {
+    "defaultMessage": "No new submissions since last plagiarism run"
   },
   "course.plagiarism.PlagiarismIndex.assessments.noPlagiarismCheckableQuestions": {
     "defaultMessage": "No checkable questions"
@@ -5990,53 +6824,107 @@
   "course.plagiarism.PlagiarismIndex.assessments.notEnoughSubmissions": {
     "defaultMessage": "Not enough submissions"
   },
+  "course.plagiarism.PlagiarismIndex.assessments.numCheckableQuestions": {
+    "defaultMessage": "# Checkable Questions"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.numSubmitted": {
+    "defaultMessage": "# Submissions"
+  },
   "course.plagiarism.PlagiarismIndex.assessments.runAssessmentsPlagiarism": {
     "defaultMessage": "New Plagiarism Check ({count})"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.runPlagiarismCheckSuccess": {
-    "defaultMessage": "Started plagiarism check for {count, plural, =1 {# assessment} other {# assessments}}"
+  "course.plagiarism.PlagiarismIndex.assessments.runPlagiarismCheck": {
+    "defaultMessage": "Run Plagiarism Check"
   },
   "course.plagiarism.PlagiarismIndex.assessments.runPlagiarismCheckError": {
     "defaultMessage": "Failed to start plagiarism checks for some assessments"
   },
+  "course.plagiarism.PlagiarismIndex.assessments.runPlagiarismCheckSuccess": {
+    "defaultMessage": "Started plagiarism check for {count, plural, =1 {# assessment} other {# assessments}}"
+  },
   "course.plagiarism.PlagiarismIndex.assessments.searchByAssessmentTitle": {
     "defaultMessage": "Search by Assessment Title"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.actions": {
-    "defaultMessage": "Actions"
+  "course.plagiarism.PlagiarismIndex.assessments.statusCompleted": {
+    "defaultMessage": "Completed"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.runPlagiarismCheck": {
-    "defaultMessage": "Run Plagiarism Check"
+  "course.plagiarism.PlagiarismIndex.assessments.statusFailed": {
+    "defaultMessage": "Failed"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.statusNotStarted": {
+    "defaultMessage": "Not Started"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.statusRunning": {
+    "defaultMessage": "Running"
+  },
+  "course.plagiarism.PlagiarismIndex.assessments.statusStarting": {
+    "defaultMessage": "Starting"
   },
   "course.plagiarism.PlagiarismIndex.assessments.viewResults": {
     "defaultMessage": "View Results"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.newSubmissionsWarning": {
-    "defaultMessage": "New submissions detected since last plagiarism run"
+  "course.plagiarism.PlagiarismIndex.header.plagiarism": {
+    "defaultMessage": "Plagiarism Check"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.noNewSubmissionsWarning": {
-    "defaultMessage": "No new submissions since last plagiarism run"
+  "course.statistics.StatisticsIndex.assessments.averageGrade": {
+    "defaultMessage": "Avg Grade"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.confirmRerunTitle": {
-    "defaultMessage": "Confirm Plagiarism Check?"
+  "course.statistics.StatisticsIndex.assessments.averageTimeTaken": {
+    "defaultMessage": "Avg Time"
   },
-  "course.plagiarism.PlagiarismIndex.assessments.confirmRerunMessage": {
-    "defaultMessage": "Some of the selected assessments already have completed plagiarism checks. Running a new plagiarism check will remove the previous results."
+  "course.statistics.StatisticsIndex.assessments.category": {
+    "defaultMessage": "Category"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.achievementCount": {
-    "defaultMessage": "No. of Achievements (Total: {courseAchievementCount})"
+  "course.statistics.StatisticsIndex.assessments.csvFileTitle": {
+    "defaultMessage": "Assessments Statistics"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.ascending": {
-    "defaultMessage": "Ascending"
+  "course.statistics.StatisticsIndex.assessments.downloadCsv": {
+    "defaultMessage": "Download Score Summary for the following Assessments?"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.correctness": {
-    "defaultMessage": "Correctness"
+  "course.statistics.StatisticsIndex.assessments.downloadScoreSummaryFailure": {
+    "defaultMessage": "An error occurred while downloading score summary"
+  },
+  "course.statistics.StatisticsIndex.assessments.downloadScoreSummaryPending": {
+    "defaultMessage": "Please wait as your request to download is being processed"
+  },
+  "course.statistics.StatisticsIndex.assessments.downloadScoreSummarySuccess": {
+    "defaultMessage": "Successfully downloaded score summary"
+  },
+  "course.statistics.StatisticsIndex.assessments.numLateStudents": {
+    "defaultMessage": "# Late"
+  },
+  "course.statistics.StatisticsIndex.assessments.numSubmittedStudents": {
+    "defaultMessage": "# Attempted"
+  },
+  "course.statistics.StatisticsIndex.assessments.searchBar": {
+    "defaultMessage": "Search by Assessment Title, Tab, or Category"
+  },
+  "course.statistics.StatisticsIndex.assessments.selectedNUsers": {
+    "defaultMessage": "Download Score Summary ({n, plural, =1 {# assessment} other {# assessments}})"
+  },
+  "course.statistics.StatisticsIndex.assessments.startAt": {
+    "defaultMessage": "Starts At"
+  },
+  "course.statistics.StatisticsIndex.assessments.stdevGrade": {
+    "defaultMessage": "Stdev Grade"
+  },
+  "course.statistics.StatisticsIndex.assessments.stdevTimeTaken": {
+    "defaultMessage": "Stdev Time"
+  },
+  "course.statistics.StatisticsIndex.assessments.tab": {
+    "defaultMessage": "Tab"
+  },
+  "course.statistics.StatisticsIndex.assessments.tableTitle": {
+    "defaultMessage": "Assessments Statistics ({numStudents} students)"
+  },
+  "course.statistics.StatisticsIndex.assessments.title": {
+    "defaultMessage": "Title"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.correctnessHint": {
-    "defaultMessage": "Correctness is the average grade percentage of all graded assessments by a student."
+  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.achievementCountDetails": {
+    "defaultMessage": "No. of Achievements (Total: {courseAchievementCount})"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.descending": {
-    "defaultMessage": "Descending"
+  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.correctness": {
+    "defaultMessage": "Correctness"
   },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.experiencePoints": {
     "defaultMessage": "Experience Points"
@@ -6045,32 +6933,23 @@
     "defaultMessage": "Tutors"
   },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.highlight": {
-    "defaultMessage": "Highlight top and bottom {percent}%"
+    "defaultMessage": "Highlight top and bottom {percent}% based on {criteria}"
   },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.learningRate": {
     "defaultMessage": "Learning Rate"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.learningRateHint": {
-    "defaultMessage": "A learning rate of 200% means that they can complete the course in half the time."
-  },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.level": {
+  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.levelInfo": {
     "defaultMessage": "Level (Max: {maxLevel})"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.levelFilter": {
-    "defaultMessage": "Level: {name}"
-  },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.name": {
     "defaultMessage": "Name"
   },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.noData": {
     "defaultMessage": "No Data"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.numSubmissions": {
+  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.numSubmissionsDetails": {
     "defaultMessage": "No. of Submissions (Total: {courseAssessmentCount})"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.phantom": {
-    "defaultMessage": "Include phantom users"
-  },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.studentType": {
     "defaultMessage": "Student Type"
   },
@@ -6080,27 +6959,15 @@
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.studentType.phantom": {
     "defaultMessage": "Phantom"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.tableTitle": {
-    "defaultMessage": "Students Sorted in {direction} {column}"
-  },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.title": {
     "defaultMessage": "Student Performance"
   },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.tutorFilter": {
-    "defaultMessage": "Tutor: {name}"
-  },
-  "course.statistics.StatisticsIndex.course.StudentPerformanceTable.videoPercentWatched": {
-    "defaultMessage": "Video % Count"
-  },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.videoPercentWatchedHeader": {
     "defaultMessage": "Average Video % Watched"
   },
   "course.statistics.StatisticsIndex.course.StudentPerformanceTable.videoSubmissionCountHeader": {
     "defaultMessage": "Videos Watched (Total: {courseVideoCount})"
   },
-  "course.statistics.StatisticsIndex.course.searchBar": {
-    "defaultMessage": "Search by Student Name"
-  },
   "course.statistics.StatisticsIndex.course.StudentProgressionChart.deadlines": {
     "defaultMessage": "Deadlines"
   },
@@ -6131,83 +6998,20 @@
   "course.statistics.StatisticsIndex.course.StudentProgressionChart.yAxisLabel": {
     "defaultMessage": "Assessment (Sorted by Deadline)"
   },
-  "course.statistics.StatisticsIndex.course.error": {
-    "defaultMessage": "Something went wrong when fetching course statistics! Please refresh to try again."
+  "course.statistics.StatisticsIndex.course.csvFileTitle": {
+    "defaultMessage": "Student Performance Statistics"
   },
-  "course.statistics.StatisticsIndex.course.performanceError": {
-    "defaultMessage": "Something went wrong when fetching course performance statistics! Please refresh to try again."
-  },
-  "course.statistics.StatisticsIndex.course.progressionError": {
-    "defaultMessage": "Something went wrong when fetching course progression statistics! Please refresh to try again."
+  "course.statistics.StatisticsIndex.course.searchBar": {
+    "defaultMessage": "Search by Student Name"
   },
   "course.statistics.StatisticsIndex.header.statistics": {
     "defaultMessage": "Statistics"
   },
-  "course.statistics.StatisticsIndex.assessments.title": {
-    "defaultMessage": "Title"
-  },
-  "course.statistics.StatisticsIndex.assessments.startAt": {
-    "defaultMessage": "Starts At"
-  },
-  "course.statistics.StatisticsIndex.assessments.tab": {
-    "defaultMessage": "Tab"
-  },
-  "course.statistics.StatisticsIndex.assessments.category": {
-    "defaultMessage": "Category"
-  },
-  "course.statistics.StatisticsIndex.assessments.numSubmittedStudents": {
-    "defaultMessage": "# Submitted"
-  },
-  "course.statistics.StatisticsIndex.assessments.numAttemptedStudents": {
-    "defaultMessage": "# Attempted"
-  },
-  "course.statistics.StatisticsIndex.assessments.numLateStudents": {
-    "defaultMessage": "# Late"
-  },
-  "course.statistics.StatisticsIndex.assessments.averageGrade": {
-    "defaultMessage": "Avg Grade"
-  },
-  "course.statistics.StatisticsIndex.assessments.stdevGrade": {
-    "defaultMessage": "Stdev Grade"
-  },
-  "course.statistics.StatisticsIndex.assessments.averageTimeTaken": {
-    "defaultMessage": "Avg Time"
-  },
-  "course.statistics.StatisticsIndex.assessments.stdevTimeTaken": {
-    "defaultMessage": "Stdev Time"
-  },
-  "course.statistics.StatisticsIndex.assessments.tableTitle": {
-    "defaultMessage": "Assessments Statistics ({numStudents} students)"
-  },
-  "course.statistics.StatisticsIndex.assessments.csvFileTitle": {
-    "defaultMessage": "Assessments Statistics"
-  },
-  "course.statistics.StatisticsIndex.assessments.searchBar": {
-    "defaultMessage": "Search by Assessment Title, Tab, or Category"
-  },
-  "course.statistics.StatisticsIndex.assessments.selectedNUsers": {
-    "defaultMessage": "Download Score Summary for {numUsers} students?"
-  },
-  "course.statistics.StatisticsIndex.assessments.downloadCsv": {
-    "defaultMessage": "Download"
-  },
-  "course.statistics.StatisticsIndex.assessments.downloadScoreSummary": {
-    "defaultMessage": "Download Score Summary for the following Assessments?"
-  },
-  "course.statistics.StatisticsIndex.assessments.downloadScoreSummarySuccess": {
-    "defaultMessage": "Successfully downloaded score summary"
-  },
-  "course.statistics.StatisticsIndex.assessments.downloadScoreSummaryFailure": {
-    "defaultMessage": "An error occurred while downloading score summary"
-  },
-  "course.statistics.StatisticsIndex.assessments.downloadScoreSummaryPending": {
-    "defaultMessage": "Your download is being processed. Please wait."
-  },
   "course.statistics.StatisticsIndex.staff.averageMarkingTime": {
     "defaultMessage": "Avg Time / Assessment"
   },
-  "course.statistics.StatisticsIndex.staff.error": {
-    "defaultMessage": "Something went wrong when fetching staff statistics! Please refresh to try again."
+  "course.statistics.StatisticsIndex.staff.csvFileTitle": {
+    "defaultMessage": "Staff Statistics"
   },
   "course.statistics.StatisticsIndex.staff.name": {
     "defaultMessage": "Name"
@@ -6218,23 +7022,20 @@
   "course.statistics.StatisticsIndex.staff.numStudents": {
     "defaultMessage": "# Students"
   },
+  "course.statistics.StatisticsIndex.staff.searchBar": {
+    "defaultMessage": "Search by Staff Name"
+  },
   "course.statistics.StatisticsIndex.staff.stddev": {
-    "defaultMessage": "Standard Deviation"
+    "defaultMessage": "Stdev Time / Assessment"
   },
   "course.statistics.StatisticsIndex.staff.tableTitle": {
     "defaultMessage": "Staff Statistics"
   },
-  "course.statistics.StatisticsIndex.staff.csvFileTitle": {
-    "defaultMessage": "Staff Statistics"
-  },
-  "course.statistics.StatisticsIndex.staff.searchBar": {
-    "defaultMessage": "Search by Staff Name"
-  },
-  "course.statistics.StatisticsIndex.staffFailure": {
-    "defaultMessage": "Failed to fetch staff data!"
+  "course.statistics.StatisticsIndex.students.csvFileTitle": {
+    "defaultMessage": "Student Statistics"
   },
-  "course.statistics.StatisticsIndex.students.error": {
-    "defaultMessage": "Something went wrong when fetching student statistics! Please refresh to try again."
+  "course.statistics.StatisticsIndex.students.email": {
+    "defaultMessage": "Email"
   },
   "course.statistics.StatisticsIndex.students.experiencePoints": {
     "defaultMessage": "Experience Points"
@@ -6248,14 +7049,8 @@
   "course.statistics.StatisticsIndex.students.name": {
     "defaultMessage": "Name"
   },
-  "course.statistics.StatisticsIndex.students.email": {
-    "defaultMessage": "Email"
-  },
-  "course.statistics.StatisticsIndex.students.noStudents": {
-    "defaultMessage": "There is no student in this course, yet..."
-  },
-  "course.statistics.StatisticsIndex.students.showMyStudentsOnly": {
-    "defaultMessage": "Show My Students Only"
+  "course.statistics.StatisticsIndex.students.searchBar": {
+    "defaultMessage": "Search by Student Name or Student Type"
   },
   "course.statistics.StatisticsIndex.students.studentsType": {
     "defaultMessage": "Student Type"
@@ -6263,21 +7058,12 @@
   "course.statistics.StatisticsIndex.students.tableTitle": {
     "defaultMessage": "Student Statistics ({numStudents} students, {numPhantom} phantom)"
   },
-  "course.statistics.StatisticsIndex.students.tutorFilter": {
-    "defaultMessage": "Tutor: {name}"
-  },
   "course.statistics.StatisticsIndex.students.videoPercentWatched": {
     "defaultMessage": "Average % Watched"
   },
   "course.statistics.StatisticsIndex.students.videoSubmissionCount": {
     "defaultMessage": "Videos Watched (Total: {courseVideoCount})"
   },
-  "course.statistics.StatisticsIndex.students.csvFileTitle": {
-    "defaultMessage": "Student Statistics"
-  },
-  "course.statistics.StatisticsIndex.students.searchBar": {
-    "defaultMessage": "Search by Student Name or Student Type"
-  },
   "course.statistics.StatisticsIndex.studentsFailure": {
     "defaultMessage": "Failed to fetch student data!"
   },
@@ -6302,12 +7088,6 @@
   "course.statistics.course.studentProgressionChart.startAt": {
     "defaultMessage": "Starts at: {startAt}"
   },
-  "course.statistics.failures.coursePerformance": {
-    "defaultMessage": "Failed to fetch course performance data!"
-  },
-  "course.statistics.failures.courseProgression": {
-    "defaultMessage": "Failed to fetch course progression data!"
-  },
   "course.statistics.tabs.course": {
     "defaultMessage": "Course"
   },
@@ -6317,6 +7097,15 @@
   "course.statistics.tabs.courseProgression": {
     "defaultMessage": "Course Progression"
   },
+  "course.stories.CikgoErrorPage.errorFetching": {
+    "defaultMessage": "Either it's supposed to be naught, or something went wrong."
+  },
+  "course.stories.CikgoErrorPage.errorFetchingDescription": {
+    "defaultMessage": "<cikgo>Cikgo</cikgo> is our partner that powers this experience. They were contactable, but did not give us any resources for this request just now. Please try again later, and if this persists, <link>contact us</link>."
+  },
+  "course.stories.pages.MissionControlPage": {
+    "defaultMessage": "Mission Control"
+  },
   "course.survey.DeleteSectionButton.deleteSection": {
     "defaultMessage": "Delete Section"
   },
@@ -6804,7 +7593,7 @@
     "defaultMessage": "Revert and delete timeline and its times"
   },
   "course.timelines.defaultTimeline": {
-    "defaultMessage": "Default"
+    "defaultMessage": "Default Timeline"
   },
   "course.timelines.deleteTime": {
     "defaultMessage": "Delete time"
@@ -6962,6 +7751,24 @@
   "course.userInvitation.InviteUsersRegistrationCode.registrationCodeNote": {
     "defaultMessage": "Users who have been invited and use this invitation code to register for the course would not have the proper status reflected in the Invitations page."
   },
+  "course.userInvitations.ExternalIdUpdateTable.currentColumn": {
+    "defaultMessage": "{label} (current)"
+  },
+  "course.userInvitations.ExternalIdUpdateTable.existingColumn": {
+    "defaultMessage": "Existing"
+  },
+  "course.userInvitations.ExternalIdUpdateTable.inFileColumn": {
+    "defaultMessage": "In file"
+  },
+  "course.userInvitations.ExternalIdUpdateTable.no": {
+    "defaultMessage": "No"
+  },
+  "course.userInvitations.ExternalIdUpdateTable.yes": {
+    "defaultMessage": "Yes"
+  },
+  "course.userInvitations.IndividualInvitations.addRowsByEmail": {
+    "defaultMessage": "Add Rows by Email"
+  },
   "course.userInvitations.IndividualInvitations.appendNewRow": {
     "defaultMessage": "Add Row"
   },
@@ -6971,23 +7778,62 @@
   "course.userInvitations.IndividualInvitations.invite": {
     "defaultMessage": "Invite All Users"
   },
+  "course.userInvitations.IndividualInvitations.malformedEmail": {
+    "defaultMessage": "{n, plural, one {This email is } other {These emails are }} wrongly formatted: {emails}"
+  },
+  "course.userInvitations.IndividualInvitations.nameEmailInput": {
+    "defaultMessage": "John Doe '<john.doe@example.org'>; \"Doe, Jane\" '<jane.doe@example.org'>; ..."
+  },
   "course.userInvitations.IndividualInvitations.namePlaceholder": {
     "defaultMessage": "Awesome User"
   },
   "course.userInvitations.IndividualInvitations.removeInvitation": {
     "defaultMessage": "Remove Invitation"
   },
-  "course.userInvitations.InvitationResultDialog.body": {
-    "defaultMessage": "{newInvitationsCount, plural, =0 {No new users were} one {# new user has been} other {# new users have been}} invited to Coursemology. {newCourseUsersCount, plural, =0 {No user with Coursemology account has been} one {# new user with existing Coursemology account has been} other {# new users with existing Coursemology accounts have been}} added to this course."
+  "course.userInvitations.IndividualInviteForm.failure": {
+    "defaultMessage": "Failed to invite users. {error}"
+  },
+  "course.userInvitations.IndividualInviteForm.failureGeneric": {
+    "defaultMessage": "Failed to invite users. You may reload and try again."
+  },
+  "course.userInvitations.InvitationActionButtons.deletionConfirm": {
+    "defaultMessage": "Are you sure you wish to delete invitation to {name} ({email})?"
+  },
+  "course.userInvitations.InvitationActionButtons.deletionFailure": {
+    "defaultMessage": "Failed to delete user - {error}"
+  },
+  "course.userInvitations.InvitationActionButtons.deletionFailureGeneric": {
+    "defaultMessage": "Failed to delete user."
+  },
+  "course.userInvitations.InvitationActionButtons.deletionSuccess": {
+    "defaultMessage": "Invitation for {name} was deleted."
+  },
+  "course.userInvitations.InvitationActionButtons.deletionTooltip": {
+    "defaultMessage": "Delete Invitation"
+  },
+  "course.userInvitations.InvitationActionButtons.resendFailure": {
+    "defaultMessage": "Failed to resend invitation."
+  },
+  "course.userInvitations.InvitationActionButtons.resendSuccess": {
+    "defaultMessage": "Resent email invitation to {email}!"
+  },
+  "course.userInvitations.InvitationActionButtons.resendTooltip": {
+    "defaultMessage": "Resend Invitation"
+  },
+  "course.userInvitations.InvitationResultDialog.actionableTitle": {
+    "defaultMessage": "Failed ({count})"
+  },
+  "course.userInvitations.InvitationResultDialog.applyFailed": {
+    "defaultMessage": "Couldn''t apply — External ID ''{id}'' is now used by another member. No changes were made."
+  },
+  "course.userInvitations.InvitationResultDialog.applyFileValues": {
+    "defaultMessage": "Apply file values ({count})"
   },
   "course.userInvitations.InvitationResultDialog.close": {
     "defaultMessage": "Close"
   },
-  "course.userInvitations.InvitationResultDialog.duplicateInfo": {
-    "defaultMessage": "Duplicate users were found in the invitation. Only the first instance of each user will be invited."
-  },
-  "course.userInvitations.InvitationResultDialog.duplicateUsers": {
-    "defaultMessage": "Duplicate Users ({count})"
+  "course.userInvitations.InvitationResultDialog.enrolledMembersSubheading": {
+    "defaultMessage": "Enrolled members ({count})"
   },
   "course.userInvitations.InvitationResultDialog.existingCourseUsers": {
     "defaultMessage": "Existing Course Users ({count})"
@@ -6995,35 +7841,38 @@
   "course.userInvitations.InvitationResultDialog.existingCourseUsersInfo": {
     "defaultMessage": "These users are already enrolled in this course. They were not re-enrolled."
   },
-  "course.userInvitations.InvitationResultDialog.externalIdUpdatedInfo": {
-    "defaultMessage": "External IDs were updated where specified."
-  },
   "course.userInvitations.InvitationResultDialog.existingInvitations": {
     "defaultMessage": "Existing Invitations ({count})"
   },
   "course.userInvitations.InvitationResultDialog.existingInvitationsInfo": {
     "defaultMessage": "These users already have a pending invitation. They were not re-invited."
   },
+  "course.userInvitations.InvitationResultDialog.externalIdUpdatedDone": {
+    "defaultMessage": "External IDs were updated from your file."
+  },
+  "course.userInvitations.InvitationResultDialog.externalIdUpdates": {
+    "defaultMessage": "External ID updates ({count})"
+  },
+  "course.userInvitations.InvitationResultDialog.externalIdUpdatesInfo": {
+    "defaultMessage": "These users are already invited or enrolled. Their External ID changes only if you apply the file values."
+  },
+  "course.userInvitations.InvitationResultDialog.failedRowsSubtitle": {
+    "defaultMessage": "{count} {count, plural, one {row} other {rows}} highlighted in red could not be sent"
+  },
   "course.userInvitations.InvitationResultDialog.header": {
     "defaultMessage": "Invitation Summary"
   },
+  "course.userInvitations.InvitationResultDialog.invitationsSubheading": {
+    "defaultMessage": "Invitations ({count})"
+  },
   "course.userInvitations.InvitationResultDialog.newCourseUsers": {
     "defaultMessage": "New Course Users ({count})"
   },
   "course.userInvitations.InvitationResultDialog.newInvitations": {
-    "defaultMessage": "New Invitations ({count})"
-  },
-  "course.userInvitations.InvitationResultDialog.actionableTitle": {
-    "defaultMessage": "Failed ({count})"
-  },
-  "course.userInvitations.InvitationResultDialog.failedInvitations": {
-    "defaultMessage": "Failed to Send ({count})"
-  },
-  "course.userInvitations.InvitationResultDialog.failedInvitationsInfo": {
-    "defaultMessage": "Error occurred when sending invitation email, please try again."
+    "defaultMessage": "New Invitations ({count})"
   },
-  "course.userInvitations.InvitationResultDialog.updatedSubtitle": {
-    "defaultMessage": "{count} updated · shown first"
+  "course.userInvitations.InvitationResultDialog.pendingExternalIdInfo": {
+    "defaultMessage": "{count, plural, one {# row has} other {# rows have}} a different External ID in your file. Current values were kept."
   },
   "course.userInvitations.InvitationResultDialog.summary": {
     "defaultMessage": "{newInvitations} new {newInvitations, plural, one {invitation} other {invitations}} sent, {newEnrollments} directly enrolled, {alreadyInCourse} already in course."
@@ -7031,6 +7880,15 @@
   "course.userInvitations.InvitationResultDialog.summaryFailed": {
     "defaultMessage": "{count} failed."
   },
+  "course.userInvitations.InvitationResultDialog.undo": {
+    "defaultMessage": "Undo"
+  },
+  "course.userInvitations.InvitationResultExistingTable.no": {
+    "defaultMessage": "No"
+  },
+  "course.userInvitations.InvitationResultExistingTable.yes": {
+    "defaultMessage": "Yes"
+  },
   "course.userInvitations.InvitationResultFailedTable.duplicateEmailInFile": {
     "defaultMessage": "Duplicate email in uploaded CSV"
   },
@@ -7043,17 +7901,17 @@
   "course.userInvitations.InvitationResultFailedTable.failedToSend": {
     "defaultMessage": "Failed to send invitation email, please try again - if failures persist, contact us for assistance"
   },
-  "course.userInvitations.InvitationResultSkippedTable.no": {
+  "course.userInvitations.InvitationResultFailedTable.no": {
     "defaultMessage": "No"
   },
-  "course.userInvitations.InvitationResultSkippedTable.previouslyLabel": {
-    "defaultMessage": "Previously: {value}"
-  },
-  "course.userInvitations.InvitationResultSkippedTable.yes": {
+  "course.userInvitations.InvitationResultFailedTable.yes": {
     "defaultMessage": "Yes"
   },
-  "course.userInvitations.InvitationsBarChart.accepted": {
-    "defaultMessage": "Accepted Invitations"
+  "course.userInvitations.InvitationResultPrimaryTable.no": {
+    "defaultMessage": "No"
+  },
+  "course.userInvitations.InvitationResultPrimaryTable.yes": {
+    "defaultMessage": "Yes"
   },
   "course.userInvitations.InvitationsIndex.failure": {
     "defaultMessage": "Failed to fetch all invitations"
@@ -7091,14 +7949,14 @@
   "course.userInvitations.InviteUsersFileUpload.fileUploadExamplePersonalTimeline": {
     "defaultMessage": "Name,Email,Role,Phantom,PersonalTimeline,ExternalId{br}John,test1@example.org,student,y,otot,A0123456{br}Mary,test2@example.org,teaching_assistant,n,fixed,A0123457"
   },
+  "course.userInvitations.InviteUsersFileUpload.fileUploadInfo": {
+    "defaultMessage": "Upload a .csv file with the following format:"
+  },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfoEmail": {
     "defaultMessage": "Each invitation must use a unique email address within the course. Duplicate emails will be skipped."
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfoExternalId": {
-    "defaultMessage": "External ID is optional. If provided, it overwrites any existing external ID for the user and must be unique within the course."
-  },
-  "course.userInvitations.InviteUsersFileUpload.fileUploadInfo": {
-    "defaultMessage": "Upload a .csv file with the following format:"
+    "defaultMessage": "External ID is optional. If provided, it must be unique within the course."
   },
   "course.userInvitations.InviteUsersFileUpload.fileUploadInfoPersonalTimeline": {
     "defaultMessage": "Personal Timelines can be <code>[fixed, otot, stragglers, fomo]</code>, with course default: {defaultTimelineAlgorithm} if omitted."
@@ -7121,30 +7979,6 @@
   "course.userInvitations.InviteUsersfileUploadForm.invite": {
     "defaultMessage": "Invite Users from File"
   },
-  "course.userInvitations.InvitationActionButtons.deletionConfirm": {
-    "defaultMessage": "Are you sure you wish to delete invitation to {name} ({email})?"
-  },
-  "course.userInvitations.InvitationActionButtons.deletionFailure": {
-    "defaultMessage": "Failed to delete user - {error}"
-  },
-  "course.userInvitations.InvitationActionButtons.deletionFailureGeneric": {
-    "defaultMessage": "Failed to delete user."
-  },
-  "course.userInvitations.InvitationActionButtons.deletionSuccess": {
-    "defaultMessage": "Invitation for {name} was deleted."
-  },
-  "course.userInvitations.InvitationActionButtons.deletionTooltip": {
-    "defaultMessage": "Delete Invitation"
-  },
-  "course.userInvitations.InvitationActionButtons.resendFailure": {
-    "defaultMessage": "Failed to resend invitation."
-  },
-  "course.userInvitations.InvitationActionButtons.resendSuccess": {
-    "defaultMessage": "Resent email invitation to {email}!"
-  },
-  "course.userInvitations.InvitationActionButtons.resendTooltip": {
-    "defaultMessage": "Resend Invitation"
-  },
   "course.userInvitations.RegistrationCodeButton.registrationCode": {
     "defaultMessage": "Registration Code"
   },
@@ -7163,6 +7997,9 @@
   "course.userInvitations.UserInvitationsTable.accepted": {
     "defaultMessage": "Accepted"
   },
+  "course.userInvitations.UserInvitationsTable.confirmedTooltip": {
+    "defaultMessage": "Accepted {confirmedAt}"
+  },
   "course.userInvitations.UserInvitationsTable.failed": {
     "defaultMessage": "Failed"
   },
@@ -7175,9 +8012,6 @@
   "course.userInvitations.UserInvitationsTable.sentTooltip": {
     "defaultMessage": "Sent {sentAt}"
   },
-  "course.userInvitations.UserInvitationsTable.confirmedTooltip": {
-    "defaultMessage": "Accepted {confirmedAt}"
-  },
   "course.userNotification.AchievementGainedPopup.unlocked": {
     "defaultMessage": "Achievement Unlocked!"
   },
@@ -7196,12 +8030,6 @@
   "course.users.ExperiencePointsRecords.experiencePointsHistoryHeader": {
     "defaultMessage": "Experience Points History: {for}"
   },
-  "course.users.ExperiencePointsRecords.fetchUsersFailure": {
-    "defaultMessage": "Failed to fetch records"
-  },
-  "course.users.ExperiencePointsTable.fetchRecordsFailure": {
-    "defaultMessage": "Failed to fetch records"
-  },
   "course.users.ManageStaff.noStaff": {
     "defaultMessage": "No staff in course."
   },
@@ -7214,6 +8042,12 @@
   "course.users.ManageUsersTable.ManageUsersTable.searchText": {
     "defaultMessage": "Search by name or email"
   },
+  "course.users.ManageUsersTable.addIdFailure": {
+    "defaultMessage": "Failed to set External ID to {newId}"
+  },
+  "course.users.ManageUsersTable.addIdSuccess": {
+    "defaultMessage": "External ID set to {newId}"
+  },
   "course.users.ManageUsersTable.assignToTimeline": {
     "defaultMessage": "Assign to timeline"
   },
@@ -7244,6 +8078,12 @@
   "course.users.ManageUsersTable.changeAlgorithmSuccess": {
     "defaultMessage": "Updated {name}'s timeline algorithm to {timeline}."
   },
+  "course.users.ManageUsersTable.changeIdFailure": {
+    "defaultMessage": "Failed to change ID from {oldId} to {newId}"
+  },
+  "course.users.ManageUsersTable.changeIdSuccess": {
+    "defaultMessage": "ID was changed from {oldId} to {newId}"
+  },
   "course.users.ManageUsersTable.changeRoleFailure": {
     "defaultMessage": "Failed to update {name}'s role to {role}."
   },
@@ -7259,29 +8099,26 @@
   "course.users.ManageUsersTable.defaultTimeline": {
     "defaultMessage": "Default"
   },
-  "course.users.ManageUsersTable.group": {
-    "defaultMessage": "Group: {name}"
-  },
-  "course.users.ManageUsersTable.phantomSuccess": {
-    "defaultMessage": "{name} {isPhantom, select, true {is now a phantom user} other {is now a normal user} }."
+  "course.users.ManageUsersTable.deleteIdFailure": {
+    "defaultMessage": "Failed to delete External ID"
   },
-  "course.users.ManageUsersTable.addIdFailure": {
-    "defaultMessage": "Failed to set External ID to {newId}"
+  "course.users.ManageUsersTable.deleteIdSuccess": {
+    "defaultMessage": "External ID deleted"
   },
-  "course.users.ManageUsersTable.addIdSuccess": {
-    "defaultMessage": "External ID set to {newId}"
+  "course.users.ManageUsersTable.deletionConfirm": {
+    "defaultMessage": "Are you sure you wish to delete {role} {name} ({email})?"
   },
-  "course.users.ManageUsersTable.changeIdFailure": {
-    "defaultMessage": "Failed to change ID from {oldId} to {newId}"
+  "course.users.ManageUsersTable.deletionFailure": {
+    "defaultMessage": "Failed to delete {role} {name} ({email})."
   },
-  "course.users.ManageUsersTable.changeIdSuccess": {
-    "defaultMessage": "ID was changed from {oldId} to {newId}"
+  "course.users.ManageUsersTable.deletionScheduled": {
+    "defaultMessage": "{role} {name} ({email}) has been scheduled for deletion."
   },
-  "course.users.ManageUsersTable.deleteIdFailure": {
-    "defaultMessage": "Failed to delete External ID"
+  "course.users.ManageUsersTable.group": {
+    "defaultMessage": "Group: {name}"
   },
-  "course.users.ManageUsersTable.deleteIdSuccess": {
-    "defaultMessage": "External ID deleted"
+  "course.users.ManageUsersTable.phantomSuccess": {
+    "defaultMessage": "{name} {isPhantom, select, true {is now a phantom user} other {is now a normal user} }."
   },
   "course.users.ManageUsersTable.renameFailure": {
     "defaultMessage": "Failed to rename {oldName} to {newName}"
@@ -7292,6 +8129,24 @@
   "course.users.ManageUsersTable.selectedNUsers": {
     "defaultMessage": "Selected {n, plural, =1 {# user} other {# users}}"
   },
+  "course.users.ManageUsersTable.suspend": {
+    "defaultMessage": "Suspend"
+  },
+  "course.users.ManageUsersTable.suspendFailure": {
+    "defaultMessage": "Failed to suspend {name}."
+  },
+  "course.users.ManageUsersTable.suspendSuccess": {
+    "defaultMessage": "{name} is now suspended. They cannot access this course until they are unsuspended."
+  },
+  "course.users.ManageUsersTable.unsuspend": {
+    "defaultMessage": "Unsuspend"
+  },
+  "course.users.ManageUsersTable.unsuspendFailure": {
+    "defaultMessage": "Failed to unsuspend {name}."
+  },
+  "course.users.ManageUsersTable.unsuspendSuccess": {
+    "defaultMessage": "{name} is no longer suspended. They can now access the course."
+  },
   "course.users.ManageUsersTable.updateFailure": {
     "defaultMessage": "Failed to update user - {error}"
   },
@@ -7400,36 +8255,6 @@
   "course.users.UpgradeToStaff.upgradeSuccess": {
     "defaultMessage": "{count, plural, =0 {No users were} one {# new user has} other {# new users have}} been upgraded to {role}"
   },
-  "course.users.ManageUsersTable.deletionConfirm": {
-    "defaultMessage": "Are you sure you wish to delete {role} {name} ({email})?"
-  },
-  "course.users.ManageUsersTable.deletionFailure": {
-    "defaultMessage": "Failed to delete user."
-  },
-  "course.users.ManageUsersTable.deletionScheduled": {
-    "defaultMessage": "{role} {name} ({email}) has been scheduled for deletion."
-  },
-  "course.users.ManageUsersTable.deletionSuccess": {
-    "defaultMessage": "User was deleted."
-  },
-  "course.users.ManageUsersTable.suspend": {
-    "defaultMessage": "Suspend"
-  },
-  "course.users.ManageUsersTable.suspendFailure": {
-    "defaultMessage": "Failed to suspend {name}."
-  },
-  "course.users.ManageUsersTable.suspendSuccess": {
-    "defaultMessage": "{name} is now suspended. They cannot access this course until they are unsuspended."
-  },
-  "course.users.ManageUsersTable.unsuspend": {
-    "defaultMessage": "Unsuspend"
-  },
-  "course.users.ManageUsersTable.unsuspendFailure": {
-    "defaultMessage": "Failed to unsuspend {name}."
-  },
-  "course.users.ManageUsersTable.unsuspendSuccess": {
-    "defaultMessage": "{name} is no longer suspended. They can now access the course."
-  },
   "course.users.UserManagementTabs.enrolRequestsTitle": {
     "defaultMessage": "Enrol Requests"
   },
@@ -7568,27 +8393,27 @@
   "course.video.VideoShow.videoTitle": {
     "defaultMessage": "Video - {title}"
   },
+  "course.video.VideoTable.actions": {
+    "defaultMessage": "Actions"
+  },
+  "course.video.VideoTable.averageWatched": {
+    "defaultMessage": "Average % Watched"
+  },
   "course.video.VideoTable.noVideo": {
     "defaultMessage": "No Video"
   },
-  "course.video.VideoTable.title": {
-    "defaultMessage": "Title"
+  "course.video.VideoTable.published": {
+    "defaultMessage": "Published"
   },
   "course.video.VideoTable.startAt": {
     "defaultMessage": "Start At"
   },
+  "course.video.VideoTable.title": {
+    "defaultMessage": "Title"
+  },
   "course.video.VideoTable.watchCount": {
     "defaultMessage": "Watch Count"
   },
-  "course.video.VideoTable.averageWatched": {
-    "defaultMessage": "Average % Watched"
-  },
-  "course.video.VideoTable.published": {
-    "defaultMessage": "Published"
-  },
-  "course.video.VideoTable.actions": {
-    "defaultMessage": "Actions"
-  },
   "course.video.VideosIndex.fetchVideosFailure": {
     "defaultMessage": "Failed to retrieve videos."
   },
@@ -7736,9 +8561,33 @@
   "course.videoSubmissions.UserVideoSubmissionsIndex.videoSubmissionsHeader": {
     "defaultMessage": "Video Watch History"
   },
+  "d6avGo": {
+    "defaultMessage": "Submissions"
+  },
+  "f9aTl7": {
+    "defaultMessage": "Role-Playing Assessments"
+  },
+  "jvrMfo": {
+    "defaultMessage": "Assistants"
+  },
   "landing_page.create_an_account": {
     "defaultMessage": "Create an account"
   },
+  "landing_page.iconEngaging": {
+    "defaultMessage": "Engaging"
+  },
+  "landing_page.iconEngagingSubtitle": {
+    "defaultMessage": "It is built for all teachers. You do not need to have any programming knowledge to master the platform. Coursemology is easy and intuitive to use for both teachers and students."
+  },
+  "landing_page.iconGeneral": {
+    "defaultMessage": "General"
+  },
+  "landing_page.iconGeneralSubtitle": {
+    "defaultMessage": "It is built for all subjects. The gamification system of Coursemology does not make any assumptions on the subject. Through Coursemology, any teacher who teaches any subject can turn his course exercises into an online game."
+  },
+  "landing_page.iconSimple": {
+    "defaultMessage": "Simple"
+  },
   "landing_page.new_to_coursemology": {
     "defaultMessage": "New to Coursemology?"
   },
@@ -7775,12 +8624,12 @@
   "lib.components.core.Expandable.showMore": {
     "defaultMessage": "Show more"
   },
-  "lib.components.core.Note.noteHeader": {
-    "defaultMessage": "Note"
-  },
   "lib.components.core.Note.errorHeader": {
     "defaultMessage": "Error"
   },
+  "lib.components.core.Note.noteHeader": {
+    "defaultMessage": "Note"
+  },
   "lib.components.core.banners.ServerUnreachableBanner.refreshPage": {
     "defaultMessage": "Refresh page"
   },
@@ -7910,6 +8759,69 @@
   "lib.components.form.fields.SingleFileInput.removeFile": {
     "defaultMessage": "Remove File"
   },
+  "lib.components.getHelp.filter.filterAssessmentLabel": {
+    "defaultMessage": "Filter by Assessment"
+  },
+  "lib.components.getHelp.filter.filterCourseLabel": {
+    "defaultMessage": "Filter by Course"
+  },
+  "lib.components.getHelp.filter.filterEndDateLabel": {
+    "defaultMessage": "End Date"
+  },
+  "lib.components.getHelp.filter.filterStartDateLabel": {
+    "defaultMessage": "Start Date"
+  },
+  "lib.components.getHelp.filter.filterStudentLabel": {
+    "defaultMessage": "Filter by Student"
+  },
+  "lib.components.getHelp.filter.lastFourteenDays": {
+    "defaultMessage": "Last 14 Days"
+  },
+  "lib.components.getHelp.filter.lastSevenDays": {
+    "defaultMessage": "Last 7 Days"
+  },
+  "lib.components.getHelp.filter.lastSixMonths": {
+    "defaultMessage": "Last 6 Months"
+  },
+  "lib.components.getHelp.filter.lastThirtyDays": {
+    "defaultMessage": "Last 30 Days"
+  },
+  "lib.components.getHelp.filter.lastTwelveMonths": {
+    "defaultMessage": "Last 12 Months"
+  },
+  "lib.components.getHelp.header": {
+    "defaultMessage": "Recent Get Help Activity ({total, plural, one {# Conversation} other {# Conversations}})"
+  },
+  "lib.components.getHelp.table.assessmentTitle": {
+    "defaultMessage": "Assessment"
+  },
+  "lib.components.getHelp.table.courseTitle": {
+    "defaultMessage": "Course"
+  },
+  "lib.components.getHelp.table.createdAt": {
+    "defaultMessage": "Last Message At"
+  },
+  "lib.components.getHelp.table.instanceTitle": {
+    "defaultMessage": "Instance"
+  },
+  "lib.components.getHelp.table.lastMessage": {
+    "defaultMessage": "Last Message"
+  },
+  "lib.components.getHelp.table.messageCount": {
+    "defaultMessage": "# Msgs"
+  },
+  "lib.components.getHelp.table.questionNumber": {
+    "defaultMessage": "Question"
+  },
+  "lib.components.getHelp.table.studentName": {
+    "defaultMessage": "Name"
+  },
+  "lib.components.getHelp.validation.exceedDateRange": {
+    "defaultMessage": "Date range cannot exceed 365 days"
+  },
+  "lib.components.getHelp.validation.invalidDateSelection": {
+    "defaultMessage": "End Date must be after or equal to Start Date"
+  },
   "lib.components.navigation.AdminPopupMenuList.adminPanel": {
     "defaultMessage": "System Admin Panel"
   },
@@ -7937,14 +8849,29 @@
   "lib.components.navigation.CourseSwitcherPopupMenu.seeAllCoursesInAdmin": {
     "defaultMessage": "See all courses in Coursemology"
   },
-  "lib.components.navigation.CourseSwitcherPopupMenu.seeAllCoursesInInstanceAdmin": {
-    "defaultMessage": "See all courses in this instance"
+  "lib.components.navigation.CourseSwitcherPopupMenu.seeAllCoursesInInstanceAdmin": {
+    "defaultMessage": "See all courses in this instance"
+  },
+  "lib.components.navigation.CourseSwitcherPopupMenu.seeAllPublicCourses": {
+    "defaultMessage": "See all public courses"
+  },
+  "lib.components.navigation.CourseSwitcherPopupMenu.thisCourse": {
+    "defaultMessage": "This course"
+  },
+  "lib.components.table.MuiColumnPickerPrompt.apply": {
+    "defaultMessage": "Apply to view"
+  },
+  "lib.components.table.MuiColumnPickerPrompt.cancel": {
+    "defaultMessage": "Cancel"
+  },
+  "lib.components.table.MuiColumnPickerPrompt.defaultTitle": {
+    "defaultMessage": "Select columns"
   },
-  "lib.components.navigation.CourseSwitcherPopupMenu.seeAllPublicCourses": {
-    "defaultMessage": "See all public courses"
+  "lib.components.table.MuiTableToolbar.directExport": {
+    "defaultMessage": "Export"
   },
-  "lib.components.navigation.CourseSwitcherPopupMenu.thisCourse": {
-    "defaultMessage": "This course"
+  "lib.components.table.MuiTableToolbar.exportTrigger": {
+    "defaultMessage": "Export…"
   },
   "lib.hooks.router.usePrompt.sureYouWantToLeave": {
     "defaultMessage": "Are you sure you want to leave this page? You will lose unsaved changes."
@@ -7973,108 +8900,27 @@
   "lib.translations.beta": {
     "defaultMessage": "Beta"
   },
-  "lib.components.getHelp.header": {
-    "defaultMessage": "Recent Get Help Activity ({total, plural, one {# Conversation} other {# Conversations}})"
-  },
-  "lib.components.getHelp.filter.filterCourseLabel": {
-    "defaultMessage": "Filter by Course"
-  },
-  "lib.components.getHelp.filter.filterAssessmentLabel": {
-    "defaultMessage": "Filter by Assessment"
-  },
-  "lib.components.getHelp.filter.filterStudentLabel": {
-    "defaultMessage": "Filter by Student"
-  },
-  "lib.components.getHelp.filter.filterStartDateLabel": {
-    "defaultMessage": "Start Date"
-  },
-  "lib.components.getHelp.filter.filterEndDateLabel": {
-    "defaultMessage": "End Date"
-  },
-  "lib.components.getHelp.filter.lastSevenDays": {
-    "defaultMessage": "Last 7 Days"
-  },
-  "lib.components.getHelp.filter.lastFourteenDays": {
-    "defaultMessage": "Last 14 Days"
-  },
-  "lib.components.getHelp.filter.lastThirtyDays": {
-    "defaultMessage": "Last 30 Days"
-  },
-  "lib.components.getHelp.filter.lastSixMonths": {
-    "defaultMessage": "Last 6 Months"
-  },
-  "lib.components.getHelp.filter.lastTwelveMonths": {
-    "defaultMessage": "Last 12 Months"
-  },
-  "lib.components.getHelp.table.studentName": {
-    "defaultMessage": "Name"
-  },
-  "lib.components.getHelp.table.messageCount": {
-    "defaultMessage": "# Msgs"
-  },
-  "lib.components.getHelp.table.lastMessage": {
-    "defaultMessage": "Last Message"
-  },
-  "lib.components.getHelp.table.questionNumber": {
-    "defaultMessage": "Question"
-  },
-  "lib.components.getHelp.table.assessmentTitle": {
-    "defaultMessage": "Assessment"
-  },
-  "lib.components.getHelp.table.createdAt": {
-    "defaultMessage": "Last Message At"
-  },
-  "lib.components.getHelp.table.courseTitle": {
-    "defaultMessage": "Course"
-  },
-  "lib.components.getHelp.table.instanceTitle": {
-    "defaultMessage": "Instance"
-  },
-  "lib.components.getHelp.validation.invalidDateSelection": {
-    "defaultMessage": "End Date must be after or equal to Start Date"
-  },
-  "lib.components.getHelp.validation.exceedDateRange": {
-    "defaultMessage": "Date range cannot exceed 365 days"
-  },
-  "lib.components.table.MuiColumnPickerDialog.apply": {
-    "defaultMessage": "Apply to view"
-  },
-  "lib.components.table.MuiColumnPickerDialog.cancel": {
-    "defaultMessage": "Cancel"
-  },
-  "lib.components.table.MuiColumnPickerDialog.defaultTitle": {
-    "defaultMessage": "Select columns"
-  },
-  "lib.components.table.MuiColumnPickerDialog.export": {
-    "defaultMessage": "Apply and Export"
-  },
-  "lib.components.table.MuiTableToolbar.directExport": {
-    "defaultMessage": "Export"
-  },
-  "lib.components.table.MuiTableToolbar.exportTrigger": {
-    "defaultMessage": "Export…"
-  },
   "lib.translations.course.users.fetchUsersFailure": {
     "defaultMessage": "Failed to fetch users."
   },
   "lib.translations.course.users.manageUsersHeader": {
     "defaultMessage": "Manage Users"
   },
-  "lib.translations.course.users.roles.student": {
-    "defaultMessage": "Student"
-  },
-  "lib.translations.course.users.roles.teachingAssistant": {
-    "defaultMessage": "Teaching Assistant"
+  "lib.translations.course.users.roles.manager": {
+    "defaultMessage": "Manager"
   },
   "lib.translations.course.users.roles.observer": {
     "defaultMessage": "Observer"
   },
-  "lib.translations.course.users.roles.manager": {
-    "defaultMessage": "Manager"
-  },
   "lib.translations.course.users.roles.owner": {
     "defaultMessage": "Owner"
   },
+  "lib.translations.course.users.roles.student": {
+    "defaultMessage": "Student"
+  },
+  "lib.translations.course.users.roles.teachingAssistant": {
+    "defaultMessage": "Teaching Assistant"
+  },
   "lib.translations.experimental": {
     "defaultMessage": "Experimental"
   },
@@ -8135,6 +8981,9 @@
   "lib.translations.form.endAt": {
     "defaultMessage": "End At"
   },
+  "lib.translations.form.maximum": {
+    "defaultMessage": "Maximum"
+  },
   "lib.translations.form.messages.areYouSure": {
     "defaultMessage": "Are you sure?"
   },
@@ -8150,6 +8999,9 @@
   "lib.translations.form.messages.unsavedChanges": {
     "defaultMessage": "You have unsaved changes."
   },
+  "lib.translations.form.minimum": {
+    "defaultMessage": "Minimum"
+  },
   "lib.translations.form.startAt": {
     "defaultMessage": "Start At"
   },
@@ -8186,14 +9038,17 @@
   "lib.translations.form.validation.startEndDateValidationError": {
     "defaultMessage": "Must be after Start Date"
   },
-  "lib.translations.instance.users.roles.normal": {
-    "defaultMessage": "Normal"
+  "lib.translations.instance.users.roles.administrator": {
+    "defaultMessage": "Administrator"
   },
   "lib.translations.instance.users.roles.instructor": {
     "defaultMessage": "Instructor"
   },
-  "lib.translations.instance.users.roles.administrator": {
-    "defaultMessage": "Administrator"
+  "lib.translations.instance.users.roles.normal": {
+    "defaultMessage": "Normal"
+  },
+  "lib.translations.messages.featureUnavailable": {
+    "defaultMessage": "This feature is currently unavailable."
   },
   "lib.translations.messages.fetchingError": {
     "defaultMessage": "An error occurred when loading your data. Please reload and try again."
@@ -8204,9 +9059,27 @@
   "lib.translations.messages.loadImageError": {
     "defaultMessage": "An error occurred when loading your image. Please try selecting another one."
   },
+  "lib.translations.myStudents": {
+    "defaultMessage": "My Students"
+  },
+  "lib.translations.myStudentsIncludingPhantoms": {
+    "defaultMessage": "My Students (Including Phantoms)"
+  },
   "lib.translations.no": {
     "defaultMessage": "No"
   },
+  "lib.translations.staff": {
+    "defaultMessage": "Staff"
+  },
+  "lib.translations.staffIncludingPhantoms": {
+    "defaultMessage": "Staff (Including Phantoms)"
+  },
+  "lib.translations.students": {
+    "defaultMessage": "Students"
+  },
+  "lib.translations.studentsIncludingPhantoms": {
+    "defaultMessage": "Students (Including Phantoms)"
+  },
   "lib.translations.summary": {
     "defaultMessage": "Summary"
   },
@@ -8249,9 +9122,6 @@
   "lib.translations.table.column.email": {
     "defaultMessage": "Email"
   },
-  "lib.translations.table.column.externalId": {
-    "defaultMessage": "External ID"
-  },
   "lib.translations.table.column.endAt": {
     "defaultMessage": "End At"
   },
@@ -8261,6 +9131,9 @@
   "lib.translations.table.column.experiencePointsAwarded": {
     "defaultMessage": "EXP Awarded"
   },
+  "lib.translations.table.column.externalId": {
+    "defaultMessage": "External ID"
+  },
   "lib.translations.table.column.groups": {
     "defaultMessage": "Group(s)"
   },
@@ -8378,33 +9251,15 @@
   "lib.translations.yes": {
     "defaultMessage": "Yes"
   },
-  "material.attemptLoader.errorAccessingMaterial": {
-    "defaultMessage": "An error occurred while accessing this material. Try again later."
-  },
-  "system.admin.instance.instance.InstanceAdminNavigator.announcements": {
-    "defaultMessage": "Announcements"
-  },
-  "system.admin.instance.instance.InstanceAdminNavigator.components": {
-    "defaultMessage": "Components"
-  },
-  "system.admin.instance.instance.InstanceAdminNavigator.courses": {
-    "defaultMessage": "Courses"
-  },
-  "system.admin.instance.instance.InstanceAdminNavigator.roleRequests": {
-    "defaultMessage": "Role Requests"
-  },
-  "system.admin.instance.instance.InstanceAdminNavigator.users": {
-    "defaultMessage": "Users"
-  },
-  "system.admin.instance.instance.InstanceAdminNavigator.getHelp": {
-    "defaultMessage": "Get Help"
-  },
   "system.admin.admin.AdminNavigator.announcements": {
     "defaultMessage": "System Announcements"
   },
   "system.admin.admin.AdminNavigator.courses": {
     "defaultMessage": "Courses"
   },
+  "system.admin.admin.AdminNavigator.getHelp": {
+    "defaultMessage": "Get Help"
+  },
   "system.admin.admin.AdminNavigator.instances": {
     "defaultMessage": "Instances"
   },
@@ -8414,9 +9269,6 @@
   "system.admin.admin.AdminNavigator.users": {
     "defaultMessage": "Users"
   },
-  "system.admin.admin.AdminNavigator.getHelp": {
-    "defaultMessage": "Get Help"
-  },
   "system.admin.admin.AnnouncementsIndex.fetchAnnouncementsFailure": {
     "defaultMessage": "Unable to fetch announcements"
   },
@@ -8501,21 +9353,24 @@
   "system.admin.admin.InstancesTable.updateSuccess": {
     "defaultMessage": "Renamed {field} from {prevValue} to {newValue}"
   },
+  "system.admin.admin.UsersButton.associatedCourses": {
+    "defaultMessage": "{courseName} ({instanceName})"
+  },
   "system.admin.admin.UsersButton.deleteTooltip": {
     "defaultMessage": "Delete User"
   },
   "system.admin.admin.UsersButton.deletionConfirm": {
-    "defaultMessage": "Are you sure you wish to delete {role} {name} ({email})?"
+    "defaultMessage": "Are you sure you wish to proceed?"
   },
   "system.admin.admin.UsersButton.deletionConfirmTitle": {
     "defaultMessage": "Deleting {role} User {name} ({email})"
   },
-  "system.admin.admin.UsersButton.deletionPromptContent": {
-    "defaultMessage": "Deleting this user will PERMANENTLY delete associated data in the following {count, plural, one {course} other {courses}}:"
-  },
   "system.admin.admin.UsersButton.deletionFailure": {
     "defaultMessage": "Failed to delete user - {error}"
   },
+  "system.admin.admin.UsersButton.deletionPromptContent": {
+    "defaultMessage": "Deleting this user will PERMANENTLY delete associated data in the following {count, plural, one {course} other {courses}}:"
+  },
   "system.admin.admin.UsersButton.deletionSuccess": {
     "defaultMessage": "User was deleted."
   },
@@ -8561,6 +9416,24 @@
   "system.admin.instance.instance.IndividualInvitations.invite": {
     "defaultMessage": "Invite All Users"
   },
+  "system.admin.instance.instance.InstanceAdminNavigator.announcements": {
+    "defaultMessage": "Announcements"
+  },
+  "system.admin.instance.instance.InstanceAdminNavigator.components": {
+    "defaultMessage": "Components"
+  },
+  "system.admin.instance.instance.InstanceAdminNavigator.courses": {
+    "defaultMessage": "Courses"
+  },
+  "system.admin.instance.instance.InstanceAdminNavigator.getHelp": {
+    "defaultMessage": "Get Help"
+  },
+  "system.admin.instance.instance.InstanceAdminNavigator.roleRequests": {
+    "defaultMessage": "Role Requests"
+  },
+  "system.admin.instance.instance.InstanceAdminNavigator.users": {
+    "defaultMessage": "Users"
+  },
   "system.admin.instance.instance.InstanceAnnouncementsIndex.fetchAnnouncementsFailure": {
     "defaultMessage": "Unable to fetch announcements"
   },
@@ -8654,21 +9527,12 @@
   "system.admin.instance.instance.InstanceUsersIndex.totalUsers": {
     "defaultMessage": "Total Users: {allCount} ({adminCount} Administrators, {instructorCount} Instructors, {normalCount} Normal)"
   },
-  "system.admin.instance.instance.InstanceUsersInvitations.accepted": {
-    "defaultMessage": "Accepted Invitations"
-  },
-  "system.admin.instance.instance.InstanceUsersInvitations.failed": {
-    "defaultMessage": "Failed Invitations"
-  },
   "system.admin.instance.instance.InstanceUsersInvitations.fetch.failure": {
     "defaultMessage": "Failed to fetch invitations."
   },
   "system.admin.instance.instance.InstanceUsersInvitations.header": {
     "defaultMessage": "Invitations"
   },
-  "system.admin.instance.instance.InstanceUsersInvitations.pending": {
-    "defaultMessage": "Pending Invitations"
-  },
   "system.admin.instance.instance.InstanceUsersInvitations.title": {
     "defaultMessage": "Users"
   },
@@ -8681,6 +9545,27 @@
   "system.admin.instance.instance.InstanceUsersTabs.usersTab": {
     "defaultMessage": "Users"
   },
+  "system.admin.instance.instance.InvitationActionButtons.deletionConfirm": {
+    "defaultMessage": "Are you sure you wish to delete invitation to {name} ({email})?"
+  },
+  "system.admin.instance.instance.InvitationActionButtons.deletionFailure": {
+    "defaultMessage": "Failed to delete user - {error}"
+  },
+  "system.admin.instance.instance.InvitationActionButtons.deletionSuccess": {
+    "defaultMessage": "Invitation for {name} was deleted."
+  },
+  "system.admin.instance.instance.InvitationActionButtons.deletionTooltip": {
+    "defaultMessage": "Delete Invitation"
+  },
+  "system.admin.instance.instance.InvitationActionButtons.resendFailure": {
+    "defaultMessage": "Failed to resend invitation - {error}"
+  },
+  "system.admin.instance.instance.InvitationActionButtons.resendSuccess": {
+    "defaultMessage": "Resent email invitation to {email}!"
+  },
+  "system.admin.instance.instance.InvitationActionButtons.resendTooltip": {
+    "defaultMessage": "Resend Invitation"
+  },
   "system.admin.instance.instance.InvitationResultDialog.close": {
     "defaultMessage": "Close"
   },
@@ -8711,27 +9596,6 @@
   "system.admin.instance.instance.InvitationResultDialog.newInvitations": {
     "defaultMessage": "New Invitations ({count})"
   },
-  "system.admin.instance.instance.InvitationActionButtons.deletionConfirm": {
-    "defaultMessage": "Are you sure you wish to delete invitation to {name} ({email})?"
-  },
-  "system.admin.instance.instance.InvitationActionButtons.deletionFailure": {
-    "defaultMessage": "Failed to delete user - {error}"
-  },
-  "system.admin.instance.instance.InvitationActionButtons.deletionSuccess": {
-    "defaultMessage": "Invitation for {name} was deleted."
-  },
-  "system.admin.instance.instance.InvitationActionButtons.deletionTooltip": {
-    "defaultMessage": "Delete Invitation"
-  },
-  "system.admin.instance.instance.InvitationActionButtons.resendFailure": {
-    "defaultMessage": "Failed to resend invitation - {error}"
-  },
-  "system.admin.instance.instance.InvitationActionButtons.resendSuccess": {
-    "defaultMessage": "Resent email invitation to {email}!"
-  },
-  "system.admin.instance.instance.InvitationActionButtons.resendTooltip": {
-    "defaultMessage": "Resend Invitation"
-  },
   "system.admin.instance.instance.PendingRoleRequestsButton.approveFailure": {
     "defaultMessage": "Failed to approve role request - {error}"
   },
@@ -8777,6 +9641,9 @@
   "system.admin.instance.instance.UserInvitationsTable.accepted": {
     "defaultMessage": "Accepted"
   },
+  "system.admin.instance.instance.UserInvitationsTable.confirmedTooltip": {
+    "defaultMessage": "Accepted {confirmedAt}"
+  },
   "system.admin.instance.instance.UserInvitationsTable.failed": {
     "defaultMessage": "Failed"
   },
@@ -8789,9 +9656,6 @@
   "system.admin.instance.instance.UserInvitationsTable.sentTooltip": {
     "defaultMessage": "Sent {sentAt}"
   },
-  "system.admin.instance.instance.UserInvitationsTable.confirmedTooltip": {
-    "defaultMessage": "Accepted {confirmedAt}"
-  },
   "system.admin.instance.instance.UsersButton.deleteTooltip": {
     "defaultMessage": "Remove User"
   },
@@ -8801,12 +9665,12 @@
   "system.admin.instance.instance.UsersButton.deletionConfirmTitle": {
     "defaultMessage": "Removing {role} User {name} ({email})"
   },
-  "system.admin.instance.instance.UsersButton.deletionPromptContent": {
-    "defaultMessage": "Removing this user may cause errors in the following {count, plural, one {course} other {courses}}:"
-  },
   "system.admin.instance.instance.UsersButton.deletionFailure": {
     "defaultMessage": "Failed to remove user - {error}"
   },
+  "system.admin.instance.instance.UsersButton.deletionPromptContent": {
+    "defaultMessage": "Removing this user may cause errors in the following {count, plural, one {course} other {courses}}:"
+  },
   "system.admin.instance.instance.UsersButton.deletionSuccess": {
     "defaultMessage": "User was removed from this instance."
   },
@@ -9137,31 +10001,7 @@
   "users.troubleSigningIn": {
     "defaultMessage": "Trouble signing in?"
   },
-  "course.userInvitations.ExternalIdConflictPrompt.title": {
-    "defaultMessage": "Confirm External ID Updates"
-  },
-  "course.userInvitations.ExternalIdConflictPrompt.body": {
-    "defaultMessage": "These users are already enrolled or have pending invitations. No new invitation emails will be sent to them. Would you like to keep their current External IDs, or replace them with the values from your file?"
-  },
-  "course.userInvitations.ExternalIdConflictPrompt.pendingInvitationUpdates": {
-    "defaultMessage": "Pending Invitation Updates ({count})"
-  },
-  "course.userInvitations.ExternalIdConflictPrompt.pendingCourseUserUpdates": {
-    "defaultMessage": "Pending Course Member Updates ({count})"
-  },
-  "course.userInvitations.ExternalIdConflictPrompt.goBack": {
-    "defaultMessage": "Go Back"
-  },
-  "course.userInvitations.ExternalIdConflictPrompt.keepExisting": {
-    "defaultMessage": "Keep Existing"
-  },
-  "course.userInvitations.ExternalIdConflictPrompt.replace": {
-    "defaultMessage": "Replace"
-  },
-  "lib.translations.table.column.currentExternalId": {
-    "defaultMessage": "Current External ID"
-  },
-  "lib.translations.table.column.newExternalId": {
-    "defaultMessage": "New External ID"
+  "wEQDC6": {
+    "defaultMessage": "Edit"
   }
 }
diff --git a/config/routes.rb b/config/routes.rb
index 921ce2fb71d..d26ab611980 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -447,6 +447,7 @@
         post 'invite' => 'user_invitations#create', on: :collection
         post 'resend_invitations' => 'user_invitations#resend_invitations', on: :collection
         post 'toggle_registration' => 'user_invitations#toggle_registration', on: :collection
+        post 'update_external_ids' => 'user_invitations#update_external_ids', on: :collection
         get 'disburse_experience_points' => 'experience_points/disbursement#new', on: :collection
         post 'disburse_experience_points' => 'experience_points/disbursement#create',
              on: :collection
diff --git a/spec/controllers/course/user_invitations_controller_spec.rb b/spec/controllers/course/user_invitations_controller_spec.rb
index eca86cd44be..c256c373a49 100644
--- a/spec/controllers/course/user_invitations_controller_spec.rb
+++ b/spec/controllers/course/user_invitations_controller_spec.rb
@@ -91,12 +91,12 @@ def replace_with_erroneous_course
             post :create, format: :json, params: { course_id: course, course: { invitations_file: csv_file } }
           end
 
-          it 'returns 200 with pendingInvitationUpdates or pendingCourseUserUpdates' do
+          it 'returns 200 and finalizes, reporting the diff under invitationResult' do
             subject
             expect(response).to have_http_status(:ok)
             json = JSON.parse(response.body)
-            expect(json.keys).to include('pendingCourseUserUpdates')
-            expect(json['pendingCourseUserUpdates']).not_to be_empty
+            result = JSON.parse(json['invitationResult'])
+            expect(result['pendingCourseUserUpdates']).not_to be_empty
           end
 
           it 'does not change external_id in the database' do
@@ -141,45 +141,6 @@ def replace_with_erroneous_course
             expect { subject }.not_to(change { existing_course_user.reload.external_id })
           end
         end
-
-        context 'when uploading with resolution=replace_all' do
-          render_views
-
-          let(:existing_user) { create(:user) }
-          let!(:existing_course_user) do
-            create(:course_student, course: course, user: existing_user, external_id: 'OLD001')
-          end
-          let(:csv_content) do
-            "Name,Email,Role,Phantom,Timeline,ExternalId\n" \
-              "#{existing_user.name},#{existing_user.email},student,false,,NEW001"
-          end
-          let(:csv_file) do
-            file = Tempfile.new(['invite', '.csv'])
-            file.write(csv_content)
-            file.rewind
-            Rack::Test::UploadedFile.new(file.path, 'text/csv').tap { file.close }
-          end
-
-          subject do
-            post :create, format: :json, params: {
-              course_id: course,
-              course: { invitations_file: csv_file },
-              external_id_resolution: 'replace_all'
-            }
-          end
-
-          it 'returns 200 with invitationResult' do
-            subject
-            expect(response).to have_http_status(:ok)
-            json = JSON.parse(response.body)
-            expect(json).to have_key('invitationResult')
-          end
-
-          it 'updates the external_id to the new value' do
-            subject
-            expect(existing_course_user.reload.external_id).to eq('NEW001')
-          end
-        end
       end
 
       context 'when inviting a user who already has a non-retryable (failed) invitation' do
@@ -344,6 +305,50 @@ def replace_with_erroneous_course
       end
     end
 
+    describe '#update_external_ids' do
+      let(:target_user) { create(:user) }
+      let!(:target_cu) { create(:course_student, course: course, user: target_user, external_id: 'OLD001') }
+
+      context 'as a manager' do
+        before { controller_sign_in(controller, user) }
+        let!(:course_manager) { create(:course_manager, course: course, user: user) }
+
+        it 'applies the values and returns ok' do
+          post :update_external_ids, format: :json, params: {
+            course_id: course,
+            updates: [type: 'course_user', id: target_cu.id, external_id: 'NEW001']
+          }
+          expect(response).to have_http_status(:ok)
+          expect(target_cu.reload.external_id).to eq('NEW001')
+        end
+
+        it 'returns 409 and names the conflicting id on collision' do
+          create(:course_student, course: course, user: create(:user), external_id: 'TAKEN')
+          post :update_external_ids, format: :json, params: {
+            course_id: course,
+            updates: [type: 'course_user', id: target_cu.id, external_id: 'TAKEN']
+          }
+          expect(response).to have_http_status(:conflict)
+          expect(JSON.parse(response.body)['conflictingExternalId']).to eq('TAKEN')
+          expect(target_cu.reload.external_id).to eq('OLD001')
+        end
+      end
+
+      context 'as a student' do
+        let(:student) { create(:course_student, course: course).user }
+        before { controller_sign_in(controller, student) }
+
+        it 'is forbidden' do
+          expect do
+            post :update_external_ids, format: :json, params: {
+              course_id: course,
+              updates: [type: 'course_user', id: target_cu.id, external_id: 'NEW001']
+            }
+          end.to raise_exception(CanCan::AccessDenied)
+        end
+      end
+    end
+
     describe '#resend_invitation' do
       before do
         create(:course_manager, course: course, user: user)
diff --git a/spec/services/course/user_invitation_service_spec.rb b/spec/services/course/user_invitation_service_spec.rb
index af51c108e17..16611642bff 100644
--- a/spec/services/course/user_invitation_service_spec.rb
+++ b/spec/services/course/user_invitation_service_spec.rb
@@ -322,19 +322,19 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'updates the pending invitation external_id' do
+        it 'keeps the pending invitation external_id (no auto-overwrite)' do
           result
-          expect(pending_invitation.reload.external_id).to eq('new-id')
+          expect(pending_invitation.reload.external_id).to be_nil
         end
 
-        it 'puts the user in updated_invitations' do
-          updated_invitations = result[5]
-          expect(updated_invitations.map { |u| u[:record] }).to include(pending_invitation)
+        it 'reports the update in pending_invitation_updates' do
+          pending_invitation_updates = result[5]
+          expect(pending_invitation_updates.map { |u| u[:record] }).to include(pending_invitation)
         end
 
         it 'captures nil as previous_external_id' do
-          updated_invitations = result[5]
-          entry = updated_invitations.find { |u| u[:record] == pending_invitation }
+          pending_invitation_updates = result[5]
+          entry = pending_invitation_updates.find { |u| u[:record] == pending_invitation }
           expect(entry[:previous_external_id]).to be_nil
         end
 
@@ -386,23 +386,23 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'updates the course_user external_id' do
+        it 'keeps the course_user external_id (no auto-overwrite)' do
           result
-          expect(course_user_record.reload.external_id).to eq('new-id')
+          expect(course_user_record.reload.external_id).to be_nil
         end
 
-        it 'puts the user in updated_course_users' do
-          updated_course_users = result[6]
-          expect(updated_course_users.map { |u| u[:record] }).to include(course_user_record)
+        it 'reports the update in pending_course_user_updates' do
+          pending_course_user_updates = result[6]
+          expect(pending_course_user_updates.map { |u| u[:record] }).to include(course_user_record)
         end
 
         it 'captures nil as previous_external_id' do
-          updated_course_users = result[6]
-          entry = updated_course_users.find { |u| u[:record] == course_user_record }
+          pending_course_user_updates = result[6]
+          entry = pending_course_user_updates.find { |u| u[:record] == course_user_record }
           expect(entry[:previous_external_id]).to be_nil
         end
 
-        it 'produces no failed_users entry' do
+        it 'does not create failed_users entry' do
           _, _, _, _, failed_users = result
           expect(failed_users).to be_empty
         end
@@ -538,29 +538,25 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'updates the pending invitation external_id' do
+        it 'keeps the pending invitation external_id (no auto-overwrite)' do
           result
-          expect(pending_invitation.reload.external_id).to eq('new-id')
-        end
-
-        it 'puts the user in updated_invitations' do
-          updated_invitations = result[5]
-          expect(updated_invitations.map { |u| u[:record] }).to include(pending_invitation)
+          expect(pending_invitation.reload.external_id).to eq('old-id')
         end
 
-        it 'captures the previous ext_id' do
-          updated_invitations = result[5]
-          entry = updated_invitations.find { |u| u[:record] == pending_invitation }
+        it 'reports the row in pending_invitation_updates with both values' do
+          pending_invitation_updates = result[5]
+          entry = pending_invitation_updates.find { |u| u[:record] == pending_invitation }
           expect(entry[:previous_external_id]).to eq('old-id')
+          expect(entry[:new_external_id]).to eq('new-id')
         end
 
-        it 'does not create failed_users entry' do
-          _, _, _, _, failed_users = result
+        it 'does not create a failed_users entry' do
+          failed_users = result[4]
           expect(failed_users).to be_empty
         end
       end
 
-      context 'when a batch changes an existing invitation ext_id and a later row claims the freed id' do
+      context 'when a batch queues an existing invitation for a new ext_id and a later row claims the current id' do
         let!(:alice_invitation) do
           create(:course_user_invitation, course: course,
                                           email: 'alice@example.com', name: 'Alice', external_id: 'freed-id')
@@ -575,26 +571,23 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'updates Alice to new-id' do
-          result
-          expect(alice_invitation.reload.external_id).to eq('new-id')
+        it 'queues Alice in pending_invitation_updates' do
+          pending_invitation_updates = result[5]
+          expect(pending_invitation_updates.map { |u| u[:record] }).to include(alice_invitation)
         end
 
-        it 'creates a new invitation for Bob with the freed id' do
-          new_invitations, = result
-          expect(new_invitations.map(&:external_id)).to include('freed-id')
+        it 'keeps Alice at her current external_id' do
+          result
+          expect(alice_invitation.reload.external_id).to eq('freed-id')
         end
 
-        it 'produces no failed_users entries' do
+        it 'rejects Bob because the current id is still held by Alice' do
           _, _, _, _, failed_users = result
-          expect(failed_users).to be_empty
+          expect(failed_users.find { |u| u[:email] == bob_email }[:reason]).to eq(:external_id_taken)
         end
       end
 
-      context 'cross-type freed-id: existing course user frees id, new invitation claims it in same batch' do
-        # invite_new_users runs before add_existing_users, so the new invitation is processed
-        # first and sees the id as still taken. The existing course user is then upserted
-        # successfully, but the new invitation has already been rejected.
+      context 'cross-type freed-id: existing course user has pending new id, new invitation claims the current id' do
         let!(:enrolled_user_freeing) { create(:user) }
         let!(:course_user_freeing) do
           create(:course_student, course: course, user: enrolled_user_freeing, external_id: 'freed-id')
@@ -611,12 +604,18 @@ def csv_with_external_id_no_timeline(entries)
         subject(:result) { invitation_service.invite(invitation_attributes) }
         let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
 
-        it 'upserts the existing course user to new-id' do
+        it 'queues the existing course user in pending_course_user_updates' do
           result
-          expect(course_user_freeing.reload.external_id).to eq('new-id')
+          pending_course_user_updates = result[6]
+          expect(pending_course_user_updates.map { |u| u[:record] }).to include(course_user_freeing)
         end
 
-        it 'rejects the new invitation because it is processed before the id is freed' do
+        it 'keeps the existing course user at their current external_id' do
+          result
+          expect(course_user_freeing.reload.external_id).to eq('freed-id')
+        end
+
+        it 'rejects the new invitation because the id is still held by the course user' do
           _, _, _, _, failed_users = result
           expect(failed_users.map { |u| u[:email] }).to include(new_user_email)
           expect(failed_users.find { |u| u[:email] == new_user_email }[:reason]).to eq(:external_id_taken)
@@ -731,7 +730,7 @@ def csv_with_timeline(entries)
           let(:enrolled_user) { create(:instance_user).user }
           let!(:course_student) { create(:course_student, course: course, user: enrolled_user) }
 
-          it 'is caught as a batch external_id duplicate and does not fail the batch' do
+          it 'fails the enrolled row with :external_id_taken (bypasses CSV dedup, caught in process phase)' do
             csv = csv_with_timeline([
                                       { name: 'User A', email: 'a@example.com', external_id: 'shared-id' },
                                       { name: 'Enrolled', email: enrolled_user.email, external_id: 'shared-id' }
@@ -740,7 +739,26 @@ def csv_with_timeline(entries)
             expect(result).not_to be_nil
             _new_invitations, _existing, _new_cu, _existing_cu, failed_users = result
             expect(failed_users.size).to eq(1)
-            expect(failed_users.first[:reason]).to eq(:duplicate_external_id_in_file)
+            expect(failed_users.first[:reason]).to eq(:external_id_taken)
+            csv.close!
+          end
+        end
+
+        context 'when an enrolled user who already owns the external_id appears after a new user claiming it' do
+          let!(:enrolled_user) { create(:user) }
+          let!(:course_user_record) do
+            create(:course_student, course: course, user: enrolled_user, external_id: 'owned-id')
+          end
+
+          it 'routes the enrolled user to existing_course_users, not failed_users' do
+            csv = csv_with_timeline([
+                                      { name: 'New Person', email: generate(:email), external_id: 'owned-id' },
+                                      { name: enrolled_user.name, email: enrolled_user.email, external_id: 'owned-id' }
+                                    ])
+            result = subject.invite(csv)
+            _, _, _, existing_course_users, failed_users = result
+            expect(existing_course_users).to include(course_user_record)
+            expect(failed_users.map { |u| u[:email] }).not_to include(enrolled_user.email)
             csv.close!
           end
         end
@@ -797,6 +815,31 @@ def csv_with_timeline(entries)
           expect(errors.first[:email].first).to match(/invalid/)
         end
       end
+
+      context 'when an existing course member has a different external_id in the CSV (no resolution)' do
+        let(:existing_user) { create(:user) }
+        let!(:existing_course_user) do
+          create(:course_student, course: course, user: existing_user, external_id: 'OLD001')
+        end
+        let(:invitation_attributes) do
+          { '0' => { name: existing_course_user.name, email: existing_user.email, role: :student,
+                     phantom: false, timeline_algorithm: :fixed, external_id: 'NEW001' } }
+        end
+        let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+        subject(:result) { invitation_service.invite(invitation_attributes) }
+
+        it 'finalizes without raising and keeps the existing external_id' do
+          expect { result }.not_to raise_error
+          expect(existing_course_user.reload.external_id).to eq('OLD001')
+        end
+
+        it 'reports the row in pending_course_user_updates with both values' do
+          pending_course_user_updates = result[6]
+          entry = pending_course_user_updates.find { |u| u[:record] == existing_course_user }
+          expect(entry[:previous_external_id]).to eq('OLD001')
+          expect(entry[:new_external_id]).to eq('NEW001')
+        end
+      end
     end
 
     describe 'timeline_algorithm assignment on direct enrollment' do
@@ -851,13 +894,13 @@ def csv_with_timeline(entries)
                    role: :student, phantom: false, timeline_algorithm: :fixed, external_id: 'DIFFERENT' } }
       end
 
-      it 'sets ext_id on existing invitation when current is nil and CSV value is free' do
+      it 'queues the pending_invitation_update when current is nil and CSV value is free' do
         result = subject.invite(inv_nil_ext_user_attrs)
         expect(result).not_to be_nil
-        updated_invitations = result[5]
-        expect(updated_invitations.length).to eq(1)
-        expect(updated_invitations.map { |u| u[:record] }.first.external_id).to eq('EXT001')
-        expect(existing_inv_nil_ext.reload.external_id).to eq('EXT001')
+        pending_invitation_updates = result[5]
+        expect(pending_invitation_updates.length).to eq(1)
+        expect(pending_invitation_updates.first[:new_external_id]).to eq('EXT001')
+        expect(existing_inv_nil_ext.reload.external_id).to be_nil
       end
 
       it 'rejects with :external_id_taken when existing invitation has nil ext_id but CSV value is taken' do
@@ -867,31 +910,31 @@ def csv_with_timeline(entries)
         expect(failed_users.map { |u| u[:reason] }).to include(:external_id_taken)
       end
 
-      it 'sets ext_id on existing course user when current is nil and CSV value is free' do
+      it 'queues the pending_course_user_update when current is nil and CSV value is free' do
         result = subject.invite(enrolled_nil_user_attrs)
         expect(result).not_to be_nil
-        updated_course_users = result[6]
-        expect(updated_course_users.length).to eq(1)
-        expect(updated_course_users.map { |u| u[:record] }.first.external_id).to eq('EXT002')
-        expect(enrolled_nil.reload.external_id).to eq('EXT002')
+        pending_course_user_updates = result[6]
+        expect(pending_course_user_updates.length).to eq(1)
+        expect(pending_course_user_updates.first[:new_external_id]).to eq('EXT002')
+        expect(enrolled_nil.reload.external_id).to be_nil
       end
 
       context 'when an existing course user has non-nil ext_id and CSV provides a free different value' do
-        it 'updates the course_user external_id' do
+        it 'keeps the course_user external_id (no auto-overwrite)' do
           subject.invite(enrolled_conflict_user_attrs)
-          expect(enrolled_conflict.reload.external_id).to eq('DIFFERENT')
+          expect(enrolled_conflict.reload.external_id).to eq('EXISTING')
         end
 
-        it 'puts the user in updated_course_users' do
+        it 'puts the user in pending_course_user_updates' do
           result = subject.invite(enrolled_conflict_user_attrs)
-          updated_course_users = result[6]
-          expect(updated_course_users.map { |u| u[:record] }).to include(enrolled_conflict)
+          pending_course_user_updates = result[6]
+          expect(pending_course_user_updates.map { |u| u[:record] }).to include(enrolled_conflict)
         end
 
         it 'captures the previous ext_id' do
           result = subject.invite(enrolled_conflict_user_attrs)
-          updated_course_users = result[6]
-          entry = updated_course_users.find { |u| u[:record] == enrolled_conflict }
+          pending_course_user_updates = result[6]
+          entry = pending_course_user_updates.find { |u| u[:record] == enrolled_conflict }
           expect(entry[:previous_external_id]).to eq('EXISTING')
         end
 
@@ -903,6 +946,43 @@ def csv_with_timeline(entries)
       end
     end
 
+    describe '#update_external_ids' do
+      let(:invitation_service) { Course::UserInvitationService.new(course_user, user, course) }
+      let(:target_user) { create(:user) }
+      let!(:target_cu) { create(:course_student, course: course, user: target_user, external_id: 'OLD001') }
+      let!(:target_inv) do
+        create(:course_user_invitation, course: course, email: 'inv@example.com', name: 'Inv', external_id: 'OLDINV')
+      end
+
+      it 'sets course-user and invitation external IDs to the given values' do
+        invitation_service.update_external_ids([
+                                                 { type: 'course_user', id: target_cu.id, external_id: 'NEW001' },
+                                                 { type: 'invitation', id: target_inv.id, external_id: 'NEWINV' }
+                                               ])
+        expect(target_cu.reload.external_id).to eq('NEW001')
+        expect(target_inv.reload.external_id).to eq('NEWINV')
+      end
+
+      it 'clears an external ID when given a blank value (undo to blank)' do
+        invitation_service.update_external_ids([
+                                                 type: 'course_user', id: target_cu.id, external_id: ''
+                                               ])
+        expect(target_cu.reload.external_id).to be_nil
+      end
+
+      it 'is atomic: a collision rolls back all changes and raises' do
+        create(:course_student, course: course, user: create(:user), external_id: 'TAKEN')
+        expect do
+          invitation_service.update_external_ids([
+                                                   { type: 'course_user', id: target_cu.id, external_id: 'NEW001' },
+                                                   { type: 'invitation', id: target_inv.id, external_id: 'TAKEN' }
+                                                 ])
+        end.to raise_error(Course::UserInvitationService::ExternalIdConflict, /TAKEN/)
+        expect(target_cu.reload.external_id).to eq('OLD001')
+        expect(target_inv.reload.external_id).to eq('OLDINV')
+      end
+    end
+
     describe '#resend_invitation' do
       let(:previous_sent_time) { 1.day.ago }
       let(:pending_invitations) do