diff --git a/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml b/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
index 95b9da9775f..fcd02c92c22 100644
--- a/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
+++ b/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml
@@ -274,7 +274,6 @@ group-saml:
 oauth:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Instance::Image
     QA_GITLAB_HOSTNAME: "gitlab"
@@ -298,7 +297,6 @@ instance-saml:
 jira:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Integration::Jira
   rules:
@@ -354,7 +352,6 @@ mtls:
 mattermost:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Integration::Mattermost
   rules:
@@ -365,7 +362,6 @@ mattermost:
 registry:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Integration::Registry
   rules:
@@ -377,7 +373,6 @@ registry:
 repository-storage:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Instance::RepositoryStorage
   rules:
@@ -399,7 +394,6 @@ service-ping-disabled:
 smtp:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Integration::SMTP
   rules:
@@ -410,7 +404,6 @@ smtp:
 cloud-activation:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Instance::Image
     QA_RSPEC_TAGS: --tag cloud_activation
@@ -422,7 +415,6 @@ cloud-activation:
 large-setup:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Instance::Image
     QA_RSPEC_TAGS: --tag can_use_large_setup
@@ -455,7 +447,6 @@ elasticsearch:
 importers:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Integration::Import
     QA_MOCK_GITHUB: "true"
@@ -469,7 +460,6 @@ importers:
 .ai-gateway-base:
   extends:
     - .qa
-    - .failure-videos
 
 ai-gateway:
   extends:
@@ -522,7 +512,6 @@ ai-gateway-no-license:
 continuous-vulnerabiity-scanning:
   extends:
     - .qa
-    - .failure-videos
   variables:
     QA_SCENARIO: Test::Integration::ContinuousVulnerabilityScanning
     QA_MOCK_GITHUB: "true"
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index af6f96134d1..8335422373a 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-a55fcf0766d1e0f9fba854d57f0377bf1d7cea27
+ce985730923cae26a48a6f8ee2b966317c83e190
diff --git a/Gemfile b/Gemfile
index 6929021b6f1..99b050b2d5c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,7 +63,7 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'sprockets-rails', '~>  3.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
 
-gem 'view_component', '~> 3.17.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'view_component', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Supported DBs
 gem 'pg', '~> 1.5.6', feature_category: :database
diff --git a/Gemfile.checksum b/Gemfile.checksum
index d62e27ad335..4aaef82c247 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -758,7 +758,7 @@
 {"name":"validates_hostname","version":"1.0.13","platform":"ruby","checksum":"eac40178cc0b4f727df9cc6a5cb5bc2550718ad8d9bb3728df9aba6354bdda19"},
 {"name":"version_gem","version":"1.1.0","platform":"ruby","checksum":"6b009518020db57f51ec7b410213fae2bf692baea9f1b51770db97fbc93d9a80"},
 {"name":"version_sorter","version":"2.3.0","platform":"ruby","checksum":"2147f2a1a3804fbb8f60d268b7d7c1ec717e6dd727ffe2c165b4e05e82efe1da"},
-{"name":"view_component","version":"3.17.0","platform":"ruby","checksum":"4f5fea0a2c09d9ec020400fa9f2f3b7258706e8648fe570290d1ab8839ba880f"},
+{"name":"view_component","version":"3.20.0","platform":"ruby","checksum":"ac3192b80c2936521e5e60e585960942f40f745cf0a78d037bf6d36e703e228b"},
 {"name":"virtus","version":"2.0.0","platform":"ruby","checksum":"8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2"},
 {"name":"vite_rails","version":"3.0.17","platform":"ruby","checksum":"b90e85a3e55802981cbdb43a4101d944b1e7055bfe85599d9cb7de0f1ea58bcc"},
 {"name":"vite_ruby","version":"3.8.2","platform":"ruby","checksum":"f3f1460d5b61d20be76270ceb61f1cde32f6d22ec954933a1391f742605690b9"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 62214da0a90..847288aaccc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1902,8 +1902,8 @@ GEM
       activesupport (>= 3.0)
     version_gem (1.1.0)
     version_sorter (2.3.0)
-    view_component (3.17.0)
-      activesupport (>= 5.2.0, < 8.0)
+    view_component (3.20.0)
+      activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     virtus (2.0.0)
@@ -2317,7 +2317,7 @@ DEPENDENCIES
   valid_email (~> 0.1)
   validates_hostname (~> 1.0.13)
   version_sorter (~> 2.3)
-  view_component (~> 3.17.0)
+  view_component (~> 3.20.0)
   vite_rails (~> 3.0.17)
   vite_ruby (~> 3.8.0)
   vmstat (~> 2.3.0)
diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum
index 09dd5d2c1c5..690ffd16cc9 100644
--- a/Gemfile.next.checksum
+++ b/Gemfile.next.checksum
@@ -773,7 +773,7 @@
 {"name":"validates_hostname","version":"1.0.13","platform":"ruby","checksum":"eac40178cc0b4f727df9cc6a5cb5bc2550718ad8d9bb3728df9aba6354bdda19"},
 {"name":"version_gem","version":"1.1.0","platform":"ruby","checksum":"6b009518020db57f51ec7b410213fae2bf692baea9f1b51770db97fbc93d9a80"},
 {"name":"version_sorter","version":"2.3.0","platform":"ruby","checksum":"2147f2a1a3804fbb8f60d268b7d7c1ec717e6dd727ffe2c165b4e05e82efe1da"},
-{"name":"view_component","version":"3.17.0","platform":"ruby","checksum":"4f5fea0a2c09d9ec020400fa9f2f3b7258706e8648fe570290d1ab8839ba880f"},
+{"name":"view_component","version":"3.20.0","platform":"ruby","checksum":"ac3192b80c2936521e5e60e585960942f40f745cf0a78d037bf6d36e703e228b"},
 {"name":"virtus","version":"2.0.0","platform":"ruby","checksum":"8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2"},
 {"name":"vite_rails","version":"3.0.17","platform":"ruby","checksum":"b90e85a3e55802981cbdb43a4101d944b1e7055bfe85599d9cb7de0f1ea58bcc"},
 {"name":"vite_ruby","version":"3.8.2","platform":"ruby","checksum":"f3f1460d5b61d20be76270ceb61f1cde32f6d22ec954933a1391f742605690b9"},
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 91137a4e136..b894eff8c92 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -1929,8 +1929,8 @@ GEM
       activesupport (>= 3.0)
     version_gem (1.1.0)
     version_sorter (2.3.0)
-    view_component (3.17.0)
-      activesupport (>= 5.2.0, < 8.0)
+    view_component (3.20.0)
+      activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     virtus (2.0.0)
@@ -2344,7 +2344,7 @@ DEPENDENCIES
   valid_email (~> 0.1)
   validates_hostname (~> 1.0.13)
   version_sorter (~> 2.3)
-  view_component (~> 3.17.0)
+  view_component (~> 3.20.0)
   vite_rails (~> 3.0.17)
   vite_ruby (~> 3.8.0)
   vmstat (~> 2.3.0)
diff --git a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
index 44b9b5058b2..46fbce5c96c 100644
--- a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
+++ b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
@@ -71,6 +71,7 @@ import {
 } from '~/issues/list/constants';
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 import MergeRequestReviewers from '~/issuable/components/merge_request_reviewers.vue';
+import IssuableByEmail from '~/issuable/components/issuable_by_email.vue';
 import setSortPreferenceMutation from '~/issues/list/queries/set_sort_preference.mutation.graphql';
 import issuableEventHub from '~/issues/list/eventhub';
 import getMergeRequestsQuery from 'ee_else_ce/merge_requests/list/queries/get_merge_requests.query.graphql';
@@ -115,6 +116,7 @@ export default {
     ApprovalCount,
     EmptyState,
     IssuableMilestone,
+    IssuableByEmail,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -133,6 +135,7 @@ export default {
     environmentNamesPath: { default: '' },
     mergeTrainsPath: { default: undefined },
     defaultBranch: { default: '' },
+    initialEmail: { default: '' },
   },
   data() {
     return {
@@ -689,134 +692,142 @@ export default {
 </script>
 
 <template>
-  <issuable-list
-    v-if="hasAnyMergeRequests"
-    :namespace="fullPath"
-    recent-searches-storage-key="merge_requests"
-    :search-tokens="searchTokens"
-    :has-scoped-labels-feature="hasScopedLabelsFeature"
-    :initial-filter-value="filterTokens"
-    :sort-options="sortOptions"
-    :initial-sort-by="sortKey"
-    :issuables="mergeRequests"
-    :error="mergeRequestsError"
-    :tabs="$options.mergeRequestListTabs"
-    :current-tab="state"
-    :tab-counts="tabCounts"
-    :issuables-loading="isLoading"
-    :show-pagination-controls="showPaginationControls"
-    :default-page-size="pageSize"
-    sync-filter-and-sort
-    use-keyset-pagination
-    :has-next-page="pageInfo.hasNextPage"
-    :has-previous-page="pageInfo.hasPreviousPage"
-    issuable-item-class="merge-request"
-    :show-bulk-edit-sidebar="showBulkEditSidebar"
-    @click-tab="handleClickTab"
-    @next-page="handleNextPage"
-    @previous-page="handlePreviousPage"
-    @sort="handleSort"
-    @filter="handleFilter"
-    @update-legacy-bulk-edit="handleUpdateLegacyBulkEdit"
-  >
-    <template #nav-actions>
-      <div class="gl-flex gl-gap-3">
-        <gl-button v-if="mergeTrainsPath" :href="mergeTrainsPath" data-testid="merge-trains">
-          {{ __('Merge trains') }}
-        </gl-button>
-        <gl-button
-          v-if="canBulkUpdate"
-          class="gl-grow"
-          :disabled="isBulkEditButtonDisabled"
-          data-testid="bulk-edit"
-          @click="handleBulkUpdateClick"
-        >
-          {{ __('Bulk edit') }}
-        </gl-button>
+  <div>
+    <issuable-list
+      v-if="hasAnyMergeRequests"
+      :namespace="fullPath"
+      recent-searches-storage-key="merge_requests"
+      :search-tokens="searchTokens"
+      :has-scoped-labels-feature="hasScopedLabelsFeature"
+      :initial-filter-value="filterTokens"
+      :sort-options="sortOptions"
+      :initial-sort-by="sortKey"
+      :issuables="mergeRequests"
+      :error="mergeRequestsError"
+      :tabs="$options.mergeRequestListTabs"
+      :current-tab="state"
+      :tab-counts="tabCounts"
+      :issuables-loading="isLoading"
+      :show-pagination-controls="showPaginationControls"
+      :default-page-size="pageSize"
+      sync-filter-and-sort
+      use-keyset-pagination
+      :has-next-page="pageInfo.hasNextPage"
+      :has-previous-page="pageInfo.hasPreviousPage"
+      issuable-item-class="merge-request"
+      :show-bulk-edit-sidebar="showBulkEditSidebar"
+      @click-tab="handleClickTab"
+      @next-page="handleNextPage"
+      @previous-page="handlePreviousPage"
+      @sort="handleSort"
+      @filter="handleFilter"
+      @update-legacy-bulk-edit="handleUpdateLegacyBulkEdit"
+    >
+      <template #nav-actions>
+        <div class="gl-flex gl-gap-3">
+          <gl-button v-if="mergeTrainsPath" :href="mergeTrainsPath" data-testid="merge-trains">
+            {{ __('Merge trains') }}
+          </gl-button>
+          <gl-button
+            v-if="canBulkUpdate"
+            class="gl-grow"
+            :disabled="isBulkEditButtonDisabled"
+            data-testid="bulk-edit"
+            @click="handleBulkUpdateClick"
+          >
+            {{ __('Bulk edit') }}
+          </gl-button>
 
-        <gl-button
-          v-if="newMergeRequestPath"
-          variant="confirm"
-          :href="newMergeRequestPath"
-          data-testid="new-merge-request-button"
-          data-event-tracking="click_new_merge_request_list"
-        >
-          {{ $options.i18n.newMergeRequest }}
-        </gl-button>
+          <gl-button
+            v-if="newMergeRequestPath"
+            variant="confirm"
+            :href="newMergeRequestPath"
+            data-testid="new-merge-request-button"
+            data-event-tracking="click_new_merge_request_list"
+          >
+            {{ $options.i18n.newMergeRequest }}
+          </gl-button>
 
-        <merge-request-more-actions-dropdown />
-      </div>
-    </template>
+          <merge-request-more-actions-dropdown />
+        </div>
+      </template>
 
-    <template #status="{ issuable = {} }">
-      {{ getStatus(issuable) }}
-      <gl-link
-        v-if="issuable.state === $options.STATUS_OPEN && isMergeRequestBroken(issuable)"
-        v-gl-tooltip
-        :href="issuable.webUrl"
-        :title="__('Cannot be merged automatically')"
-        data-testid="merge-request-cannot-merge"
-      >
-        <gl-icon name="warning-solid" variant="strong" />
-      </gl-link>
-    </template>
-
-    <template #timeframe="{ issuable = {} }">
-      <issuable-milestone v-if="issuable.milestone" :milestone="issuable.milestone" />
-    </template>
-
-    <template #target-branch="{ issuable = {} }">
-      <span
-        v-if="issuable.targetBranch !== defaultBranch"
-        class="project-ref-path gl-inline-block gl-max-w-26 gl-truncate gl-align-bottom"
-        data-testid="target-branch"
-      >
+      <template #status="{ issuable = {} }">
+        {{ getStatus(issuable) }}
         <gl-link
+          v-if="issuable.state === $options.STATUS_OPEN && isMergeRequestBroken(issuable)"
           v-gl-tooltip
-          :href="issuable.targetBranchPath"
-          :title="targetBranchTooltip(issuable)"
-          class="ref-name !gl-text-gray-500"
+          :href="issuable.webUrl"
+          :title="__('Cannot be merged automatically')"
+          data-testid="merge-request-cannot-merge"
         >
-          <gl-icon name="branch" :size="12" class="gl-mr-2" />{{ issuable.targetBranch }}
+          <gl-icon name="warning-solid" variant="strong" />
         </gl-link>
-      </span>
-    </template>
+      </template>
 
-    <template #statistics="{ issuable = {} }">
-      <li class="!gl-mr-0">
-        <merge-request-statistics :merge-request="issuable" />
-      </li>
-    </template>
+      <template #timeframe="{ issuable = {} }">
+        <issuable-milestone v-if="issuable.milestone" :milestone="issuable.milestone" />
+      </template>
 
-    <template #approval-status="{ issuable = {} }">
-      <li class="!gl-mr-0">
-        <approval-count :merge-request="issuable" full-text />
-      </li>
-    </template>
+      <template #target-branch="{ issuable = {} }">
+        <span
+          v-if="issuable.targetBranch !== defaultBranch"
+          class="project-ref-path gl-inline-block gl-max-w-26 gl-truncate gl-align-bottom"
+          data-testid="target-branch"
+        >
+          <gl-link
+            v-gl-tooltip
+            :href="issuable.targetBranchPath"
+            :title="targetBranchTooltip(issuable)"
+            class="ref-name !gl-text-subtle"
+          >
+            <gl-icon name="branch" :size="12" class="gl-mr-2" />{{ issuable.targetBranch }}
+          </gl-link>
+        </span>
+      </template>
 
-    <template #pipeline-status="{ issuable = {} }">
-      <li
-        v-if="issuable.headPipeline && issuable.headPipeline.detailedStatus"
-        class="issuable-pipeline-status !gl-mr-0 gl-hidden sm:gl-flex"
-      >
-        <ci-icon :status="issuable.headPipeline.detailedStatus" use-link show-tooltip />
-      </li>
-    </template>
+      <template #statistics="{ issuable = {} }">
+        <li class="!gl-mr-0">
+          <merge-request-statistics :merge-request="issuable" />
+        </li>
+      </template>
 
-    <template #reviewers="{ issuable = {} }">
-      <li v-if="getReviewers(issuable).length" class="issuable-reviewers !gl-mr-0">
-        <merge-request-reviewers
-          :reviewers="getReviewers(issuable)"
-          :icon-size="16"
-          :max-visible="4"
-          class="gl-flex gl-items-center"
-        />
-      </li>
-    </template>
+      <template #approval-status="{ issuable = {} }">
+        <li class="!gl-mr-0">
+          <approval-count :merge-request="issuable" full-text />
+        </li>
+      </template>
 
-    <template #empty-state>
-      <empty-state :has-search="hasSearch" :is-open-tab="isOpenTab" />
-    </template>
-  </issuable-list>
-  <empty-state v-else :has-merge-requests="false" />
+      <template #pipeline-status="{ issuable = {} }">
+        <li
+          v-if="issuable.headPipeline && issuable.headPipeline.detailedStatus"
+          class="issuable-pipeline-status !gl-mr-0 gl-hidden sm:gl-flex"
+        >
+          <ci-icon :status="issuable.headPipeline.detailedStatus" use-link show-tooltip />
+        </li>
+      </template>
+
+      <template #reviewers="{ issuable = {} }">
+        <li v-if="getReviewers(issuable).length" class="issuable-reviewers !gl-mr-0">
+          <merge-request-reviewers
+            :reviewers="getReviewers(issuable)"
+            :icon-size="16"
+            :max-visible="4"
+            class="gl-flex gl-items-center"
+          />
+        </li>
+      </template>
+
+      <template #empty-state>
+        <empty-state :has-search="hasSearch" :is-open-tab="isOpenTab" />
+      </template>
+    </issuable-list>
+    <empty-state v-else :has-merge-requests="false" />
+    <issuable-by-email
+      v-if="initialEmail"
+      class="gl-pb-7 gl-pt-5 gl-text-center"
+      data-track-action="click_email_issue_project_issues_empty_merge_request_page"
+      data-track-label="email_issue_project_merge_request_empty_list"
+    />
+  </div>
 </template>
diff --git a/app/assets/javascripts/merge_requests/list/index.js b/app/assets/javascripts/merge_requests/list/index.js
index 951859eccca..3d18e3e0a27 100644
--- a/app/assets/javascripts/merge_requests/list/index.js
+++ b/app/assets/javascripts/merge_requests/list/index.js
@@ -36,6 +36,11 @@ export async function mountMergeRequestListsApp() {
     environmentNamesPath,
     mergeTrainsPath,
     defaultBranch,
+    initialEmail,
+    emailsHelpPagePath,
+    quickActionsHelpPath,
+    markdownHelpPath,
+    resetPath,
   } = el.dataset;
 
   return new Vue({
@@ -69,6 +74,11 @@ export async function mountMergeRequestListsApp() {
       environmentNamesPath,
       mergeTrainsPath,
       defaultBranch,
+      initialEmail,
+      emailsHelpPagePath,
+      quickActionsHelpPath,
+      markdownHelpPath,
+      resetPath,
     },
     render: (createComponent) => createComponent(MergeRequestsListApp),
   });
diff --git a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
index d2c0f7cddad..aeb83d7e4fd 100644
--- a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
+++ b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
@@ -1,6 +1,7 @@
 <script>
 import { GlButton } from '@gitlab/ui';
 import { createAlert, VARIANT_DANGER } from '~/alert';
+import SettingsSection from '~/vue_shared/components/settings/settings_section.vue';
 import { INTEGRATION_VIEW_CONFIGS, i18n, INTEGRATION_EXTENSIONS_MARKETPLACE } from '../constants';
 import IntegrationView from './integration_view.vue';
 import ExtensionsMarketplaceWarning from './extensions_marketplace_warning.vue';
@@ -26,6 +27,7 @@ export default {
     IntegrationView,
     GlButton,
     ExtensionsMarketplaceWarning,
+    SettingsSection,
   },
   inject: {
     integrationViews: {
@@ -123,25 +125,16 @@ export default {
 </script>
 
 <template>
-  <div class="js-preferences-form gl-contents">
-    <div
-      v-if="integrationViews.length"
-      class="settings-section js-search-settings-section gl-border-t !gl-pt-6"
-    >
-      <div class="settings-sticky-header">
-        <div class="settings-sticky-header-inner">
-          <h4
-            id="integrations"
-            class="gl-my-0"
-            data-testid="profile-preferences-integrations-heading"
-          >
-            {{ $options.i18n.integrations }}
-          </h4>
-        </div>
-      </div>
-      <p class="gl-text-secondary">
+  <div class="settings-section">
+    <settings-section v-if="integrationViews.length" id="integrations" class="js-preferences-form">
+      <template #heading>
+        {{ $options.i18n.integrations }}
+      </template>
+
+      <template #description>
         {{ $options.i18n.integrationsDescription }}
-      </p>
+      </template>
+
       <div>
         <integration-view
           v-for="view in integrationViews"
@@ -154,7 +147,8 @@ export default {
           :title="view.title"
         />
       </div>
-    </div>
+    </settings-section>
+
     <div class="settings-sticky-footer js-hide-when-nothing-matches-search">
       <gl-button
         category="primary"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index e4451df1387..f13acf71f83 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -560,7 +560,7 @@ export default {
             :new-comment-template-paths="newCommentTemplatePaths"
             @select="insertSavedReply"
           />
-          <template v-if="canSummarizeChanges">
+          <template v-if="!previewMarkdown && canSummarizeChanges">
             <header-divider />
             <summarize-code-changes />
           </template>
diff --git a/app/assets/javascripts/vue_shared/components/settings/settings_section.vue b/app/assets/javascripts/vue_shared/components/settings/settings_section.vue
index 4d60ace6c62..65412fafc79 100644
--- a/app/assets/javascripts/vue_shared/components/settings/settings_section.vue
+++ b/app/assets/javascripts/vue_shared/components/settings/settings_section.vue
@@ -19,7 +19,7 @@ export default {
   <section class="settings-section js-search-settings-section">
     <div class="settings-sticky-header">
       <div class="settings-sticky-header-inner">
-        <h2 class="gl-heading-2 !gl-mb-2" data-testid="settings-section-heading">
+        <h2 class="gl-heading-2 !gl-mb-3" data-testid="settings-section-heading">
           <slot v-if="$scopedSlots.heading" name="heading"></slot>
           <template v-else>{{ heading }}</template>
         </h2>
@@ -33,7 +33,7 @@ export default {
         </p>
       </div>
     </div>
-    <div>
+    <div class="gl-mt-3">
       <slot></slot>
     </div>
   </section>
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_milestone.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_milestone.vue
index 3c475484843..897e85206ae 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_milestone.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_milestone.vue
@@ -71,7 +71,7 @@ export default {
       v-gl-tooltip
       :href="milestoneLink"
       :title="milestoneDate"
-      class="gl-text-sm !gl-text-gray-500"
+      class="gl-text-sm !gl-text-subtle"
       @click.stop
     >
       <gl-icon name="milestone" :size="12" class="gl-mr-2" />{{ milestone.title }}
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 6ecaf30cd20..eb0d2907348 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -84,7 +84,7 @@ ul.content-list {
   padding: 0;
 
   li {
-    border-color: $gray-50;
+    @apply gl-border-default;
     font-size: $gl-font-size;
     @apply gl-text-default;
     word-break: break-word;
diff --git a/app/components/layouts/settings_section_component.haml b/app/components/layouts/settings_section_component.haml
index 3e1e619d906..e6e805763ea 100644
--- a/app/components/layouts/settings_section_component.haml
+++ b/app/components/layouts/settings_section_component.haml
@@ -1,10 +1,10 @@
 %section.settings-section.js-search-settings-section{ options_attrs }
   .settings-sticky-header
     .settings-sticky-header-inner
-      %h2.gl-heading-2{ class: '!gl-mb-2' }
+      %h2.gl-heading-2{ class: '!gl-mb-3' }
         = heading || @heading
       - if description || @description
         %p.gl-text-subtle.gl-mb-3
           = description || @description
-  %div{ data: { testid: 'settings-section-body' } }
+  .gl-mt-3{ data: { testid: 'settings-section-body' } }
     = body
diff --git a/app/controllers/concerns/synchronize_broadcast_message_dismissals.rb b/app/controllers/concerns/synchronize_broadcast_message_dismissals.rb
index 27d3242147b..37c042eadd1 100644
--- a/app/controllers/concerns/synchronize_broadcast_message_dismissals.rb
+++ b/app/controllers/concerns/synchronize_broadcast_message_dismissals.rb
@@ -3,8 +3,8 @@
 module SynchronizeBroadcastMessageDismissals
   extend ActiveSupport::Concern
 
-  def synchronize_broadcast_message_dismissals
-    Users::BroadcastMessageDismissalFinder.new(current_user).execute
+  def synchronize_broadcast_message_dismissals(user)
+    Users::BroadcastMessageDismissalFinder.new(user).execute
       .find_each do |dismissal|
       create_dismissal_cookie(dismissal) if cookies[dismissal.cookie_key].blank?
     end
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 06e0223c279..d6a39f19a3d 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -10,6 +10,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include Onboarding::Redirectable
   include InternalRedirect
   include SafeFormatHelper
+  include SynchronizeBroadcastMessageDismissals
 
   ACTIVE_SINCE_KEY = 'active_since'
 
@@ -155,6 +156,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
       current_auth_user = build_auth_user(auth_module::User)
       set_remember_me(current_user, current_auth_user)
+      # We are also calling this here in the case that devise re-logins and current_user is set
+      synchronize_broadcast_message_dismissals(current_user)
 
       store_idp_two_factor_status(current_auth_user.bypass_two_factor?)
 
@@ -238,6 +241,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
         store_idp_two_factor_status(true)
 
         accept_pending_invitations(user: @user) if new_user
+        synchronize_broadcast_message_dismissals(@user) unless new_user
         persist_accepted_terms_if_required(@user) if new_user
 
         perform_registration_tasks(@user, oauth['provider']) if new_user
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 73a2882b3e7..466f3485c2f 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -80,7 +80,7 @@ class SessionsController < Devise::SessionsController
 
       accept_pending_invitations
 
-      synchronize_broadcast_message_dismissals
+      synchronize_broadcast_message_dismissals(current_user)
 
       log_audit_event(current_user, resource, with: authentication_method)
       log_user_activity(current_user)
diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb
index 47b3c7f77ba..f70d01ad555 100644
--- a/app/finders/groups_finder.rb
+++ b/app/finders/groups_finder.rb
@@ -108,9 +108,16 @@ class GroupsFinder < UnionFinder
     groups = filter_group_ids(groups)
     groups = exclude_group_ids(groups)
     groups = by_visibility(groups)
+    groups = by_ids(groups)
     by_search(groups)
   end
 
+  def by_ids(items)
+    ids = params[:ids]
+    items = items.id_in(ids) if ids
+    items
+  end
+
   def by_organization(groups)
     organization = params[:organization]
     return groups unless organization
diff --git a/app/finders/packages/nuget/package_finder.rb b/app/finders/packages/nuget/package_finder.rb
index 0fe222f6daf..9ad97fc15ac 100644
--- a/app/finders/packages/nuget/package_finder.rb
+++ b/app/finders/packages/nuget/package_finder.rb
@@ -22,16 +22,9 @@ module Packages
       end
 
       def find_by_name
-        if Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-          base
-            .has_version
-            .with_case_insensitive_name(@params[:package_name])
-        else
-          base
-            .nuget
-            .has_version
-            .with_case_insensitive_name(@params[:package_name])
-        end
+        base
+          .has_version
+          .with_case_insensitive_name(@params[:package_name])
       end
 
       def find_by_version(result)
@@ -57,11 +50,7 @@ module Packages
 
       override :packages_class
       def packages_class
-        if Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-          ::Packages::Nuget::Package
-        else
-          super
-        end
+        ::Packages::Nuget::Package
       end
     end
   end
diff --git a/app/graphql/resolvers/groups_resolver.rb b/app/graphql/resolvers/groups_resolver.rb
index f41e96e0569..7aada78b11b 100644
--- a/app/graphql/resolvers/groups_resolver.rb
+++ b/app/graphql/resolvers/groups_resolver.rb
@@ -6,6 +6,11 @@ module Resolvers
 
     type Types::GroupType.connection_type, null: true
 
+    argument :ids, [GraphQL::Types::ID],
+      required: false,
+      description: 'Filter groups by IDs.',
+      prepare: ->(global_ids, _ctx) { GitlabSchema.parse_gids(global_ids, expected_type: ::Group).map(&:model_id) }
+
     argument :search, GraphQL::Types::String,
       required: false,
       description: 'Search query for group name or group full path.'
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 244ef14f044..56c331bbcd1 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -274,7 +274,13 @@ module MergeRequestsHelper
       releases_endpoint: project_releases_path(project, format: :json),
       can_bulk_update: can?(current_user, :admin_merge_request, project).to_s,
       environment_names_path: unfoldered_environment_names_project_path(project, :json),
-      default_branch: project.default_branch
+      default_branch: project.default_branch,
+      initial_email: can?(current_user, :create_merge_request_in, project) &&
+        project.new_issuable_address(current_user, 'merge_request'),
+      emails_help_page_path: help_page_path('development/emails.md', anchor: 'email-namespace'),
+      quick_actions_help_path: help_page_path('user/project/quick_actions.md'),
+      markdown_help_path: help_page_path('user/markdown.md'),
+      reset_path: new_issuable_address_project_path(project, issuable_type: 'merge_request')
     }
   end
 
diff --git a/app/models/concerns/commit_signature.rb b/app/models/concerns/commit_signature.rb
index 777124702ff..ec66efe0da8 100644
--- a/app/models/concerns/commit_signature.rb
+++ b/app/models/concerns/commit_signature.rb
@@ -44,7 +44,7 @@ module CommitSignature
 
   def reverified_status
     return verification_status unless Feature.enabled?(:check_for_mailmapped_commit_emails, project)
-    return verification_status unless verified_ssh? || verified_system?
+    return verification_status unless verified_signature_type? || verified_system?
 
     verified_emails = signed_by_user&.verified_emails
     if verified_emails&.exclude?(commit.author_email)
@@ -56,7 +56,8 @@ module CommitSignature
 
   private
 
-  def verified_ssh?
-    verified? && ssh?
+  # We are omitting x509 signature types until https://gitlab.com/gitlab-org/gitlab/-/issues/498188 is complete
+  def verified_signature_type?
+    verified? && (ssh? || gpg?)
   end
 end
diff --git a/app/models/packages/nuget/metadatum.rb b/app/models/packages/nuget/metadatum.rb
index 3edf3b21e34..79c4b1a0035 100644
--- a/app/models/packages/nuget/metadatum.rb
+++ b/app/models/packages/nuget/metadatum.rb
@@ -2,7 +2,6 @@
 
 class Packages::Nuget::Metadatum < ApplicationRecord
   include Packages::Nuget::VersionNormalizable
-  include Gitlab::Utils::StrongMemoize
 
   MAX_AUTHORS_LENGTH = 255
   MAX_DESCRIPTION_LENGTH = 4000
@@ -10,38 +9,26 @@ class Packages::Nuget::Metadatum < ApplicationRecord
 
   belongs_to :package, class_name: 'Packages::Nuget::Package', inverse_of: :nuget_metadatum
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  belongs_to :legacy_package, -> {
-    where(package_type: :nuget)
-  }, inverse_of: :nuget_metadatum, class_name: 'Packages::Package', foreign_key: :package_id
-
-  validates :package, presence: true, if: -> { nuget_extract_nuget_package_model_enabled? }
-
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  validates :legacy_package, presence: true, unless: -> { nuget_extract_nuget_package_model_enabled? }
-
+  validates :package, presence: true
   validate :ensure_valid_urls
+
   with_options if: :url_validation_enabled?, public_url: { allow_blank: true } do
     validates :license_url
     validates :project_url
     validates :icon_url
   end
+
   with_options length: { maximum: MAX_URL_LENGTH } do
     validates :license_url
     validates :project_url
     validates :icon_url
   end
+
   validates :authors, presence: true, length: { maximum: MAX_AUTHORS_LENGTH }
   validates :description, presence: true, length: { maximum: MAX_DESCRIPTION_LENGTH }
   validates :normalized_version, presence: true
 
-  validate :ensure_nuget_package_type, unless: -> { nuget_extract_nuget_package_model_enabled? }
-
-  # TODO: Use `prefix: true` with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  delegate :version, to: :package_or_legacy_package, prefix: :package
+  delegate :version, to: :package, prefix: true
 
   scope :normalized_version_in, ->(version) { where(normalized_version: version.downcase) }
 
@@ -51,12 +38,6 @@ class Packages::Nuget::Metadatum < ApplicationRecord
     !Gitlab::CurrentSettings.current_application_settings.nuget_skip_metadata_url_validation
   end
 
-  def ensure_nuget_package_type
-    return if legacy_package&.nuget?
-
-    errors.add(:base, _('Package type must be NuGet'))
-  end
-
   def ensure_valid_urls
     %w[license_url project_url icon_url].each do |field|
       value = attributes[field]
@@ -66,20 +47,4 @@ class Packages::Nuget::Metadatum < ApplicationRecord
       errors.add(field, _('is an invalid URL')) unless Gitlab::UrlSanitizer.valid_web?(value)
     end
   end
-
-  # TODO: Use `package` directly in `delegate` with the rollout of
-  # the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  def package_or_legacy_package
-    if nuget_extract_nuget_package_model_enabled?
-      package
-    else
-      legacy_package
-    end
-  end
-
-  def nuget_extract_nuget_package_model_enabled?
-    Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-  end
-  strong_memoize_attr :nuget_extract_nuget_package_model_enabled?
 end
diff --git a/app/models/packages/nuget/symbol.rb b/app/models/packages/nuget/symbol.rb
index 18fc09f5ffd..c9391d6fd5a 100644
--- a/app/models/packages/nuget/symbol.rb
+++ b/app/models/packages/nuget/symbol.rb
@@ -6,31 +6,19 @@ module Packages
       include FileStoreMounter
       include ShaAttribute
       include Packages::Destructible
-      include Gitlab::Utils::StrongMemoize
 
       # Used in destroying stale symbols in worker
       enum :status, default: 0, processing: 1, error: 3
 
       belongs_to :package, class_name: 'Packages::Nuget::Package', inverse_of: :nuget_symbols
-
-      # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-      belongs_to :legacy_package, -> {
-        where(package_type: :nuget)
-      }, inverse_of: :nuget_symbols, class_name: 'Packages::Package', foreign_key: :package_id
-
       belongs_to :project
 
-      delegate :project_id, :project, to: :package_or_legacy_package
+      delegate :project_id, :project, to: :package
 
       validates :file, :file_path, :signature, :object_storage_key, :size, presence: true
       validates :signature, uniqueness: { scope: :file_path }
       validates :object_storage_key, uniqueness: true
-      validates :package, presence: true, if: -> { nuget_extract_nuget_package_model_enabled? }
-
-      # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-      validates :legacy_package, presence: true, unless: -> { nuget_extract_nuget_package_model_enabled? }
+      validates :package, presence: true
 
       sha256_attribute :file_sha256
 
@@ -61,22 +49,6 @@ module Packages
           root_hash: project_id
         ).to_s
       end
-
-      # TODO: Use `package` directly in `delegate` with the rollout of
-      # the FF nuget_extract_nuget_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-      def package_or_legacy_package
-        if nuget_extract_nuget_package_model_enabled?
-          package
-        else
-          legacy_package
-        end
-      end
-
-      def nuget_extract_nuget_package_model_enabled?
-        Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-      end
-      strong_memoize_attr :nuget_extract_nuget_package_model_enabled?
     end
   end
 end
diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index be4f1eae8b3..c731d6701f1 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -40,19 +40,10 @@ class Packages::Package < ApplicationRecord
   # TODO: put the installable default scope on the :package_files association once the dependent: :destroy is removed
   # See https://gitlab.com/gitlab-org/gitlab/-/issues/349191
   has_many :installable_package_files, -> { installable }, class_name: 'Packages::PackageFile', inverse_of: :package
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  has_many :installable_nuget_package_files, -> { installable.with_nuget_format }, class_name: 'Packages::PackageFile', inverse_of: :package
   has_many :dependency_links, inverse_of: :package, class_name: 'Packages::DependencyLink'
   has_many :tags, inverse_of: :package, class_name: 'Packages::Tag'
 
   has_one :maven_metadatum, inverse_of: :package, class_name: 'Packages::Maven::Metadatum'
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  has_one :nuget_metadatum, inverse_of: :package, class_name: 'Packages::Nuget::Metadatum'
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  has_many :nuget_symbols, inverse_of: :package, class_name: 'Packages::Nuget::Symbol'
   has_one :npm_metadatum, inverse_of: :package, class_name: 'Packages::Npm::Metadatum'
 
   has_many :build_infos, inverse_of: :package
@@ -75,13 +66,7 @@ class Packages::Package < ApplicationRecord
   validate :npm_package_already_taken, if: :npm?
 
   validates :name, format: { with: Gitlab::Regex.npm_package_name_regex, message: Gitlab::Regex.npm_package_name_regex_message }, if: :npm?
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  validates :name, format: { with: Gitlab::Regex.nuget_package_name_regex }, if: :nuget?
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  validates :version, format: { with: Gitlab::Regex.nuget_version_regex }, if: :nuget?
   validates :version, format: { with: Gitlab::Regex.maven_version_regex }, if: -> { version? && maven? }
 
   validates :version, format: { with: Gitlab::Regex.semver_regex, message: Gitlab::Regex.semver_regex_message },
@@ -99,20 +84,6 @@ class Packages::Package < ApplicationRecord
     where(arel_table[:name].lower.eq(name.downcase))
   end
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  scope :with_nuget_version_or_normalized_version, ->(version, with_normalized: true) do
-    relation = with_case_insensitive_version(version)
-
-    return relation unless with_normalized
-
-    relation
-      .left_joins(:nuget_metadatum)
-      .or(
-        merge(Packages::Nuget::Metadatum.normalized_version_in(version))
-      )
-  end
-
   scope :search_by_name, ->(query) { fuzzy_search(query, [:name], use_minimum_char_limit: false) }
   scope :with_version, ->(version) { where(version: version) }
   scope :without_version_like, ->(version) { where.not(arel_table[:version].matches(version)) }
@@ -123,28 +94,15 @@ class Packages::Package < ApplicationRecord
   scope :including_project_namespace_route, -> { includes(project: { namespace: :route }) }
   scope :including_tags, -> { includes(:tags) }
   scope :including_dependency_links, -> { includes(dependency_links: :dependency) }
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  scope :including_dependency_links_with_nuget_metadatum, -> { includes(dependency_links: [:dependency, :nuget_metadatum]) }
 
   scope :preload_npm_metadatum, -> { preload(:npm_metadatum) }
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  scope :preload_nuget_metadatum, -> { preload(:nuget_metadatum) }
 
   scope :with_npm_scope, ->(scope) do
     npm.where("position('/' in packages_packages.name) > 0 AND split_part(packages_packages.name, '/', 1) = :package_scope", package_scope: "@#{sanitize_sql_like(scope)}")
   end
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  scope :without_nuget_temporary_name, -> { where.not(name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
-
   scope :has_version, -> { where.not(version: nil) }
   scope :preload_files, -> { preload(:installable_package_files) }
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  scope :preload_nuget_files, -> { preload(:installable_nuget_package_files) }
   scope :preload_pipelines, -> { preload(pipelines: :user) }
   scope :preload_tags, -> { preload(:tags) }
   scope :limit_recent, ->(limit) { order_created_desc.limit(limit) }
@@ -186,7 +144,7 @@ class Packages::Package < ApplicationRecord
   def self.inheritance_column = 'package_type'
 
   def self.inheritance_column_to_class_map
-    hash = {
+    {
       ml_model: 'Packages::MlModel::Package',
       golang: 'Packages::Go::Package',
       rubygems: 'Packages::Rubygems::Package',
@@ -197,14 +155,9 @@ class Packages::Package < ApplicationRecord
       helm: 'Packages::Helm::Package',
       generic: 'Packages::Generic::Package',
       pypi: 'Packages::Pypi::Package',
-      terraform_module: 'Packages::TerraformModule::Package'
-    }
-
-    if Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-      hash[:nuget] = 'Packages::Nuget::Package'
-    end
-
-    hash
+      terraform_module: 'Packages::TerraformModule::Package',
+      nuget: 'Packages::Nuget::Package'
+    }.freeze
   end
 
   def self.only_maven_packages_with_path(path, use_cte: false)
@@ -324,14 +277,6 @@ class Packages::Package < ApplicationRecord
     ::Packages::MarkPackageFilesForDestructionWorker.perform_async(id)
   end
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  def normalized_nuget_version
-    return unless nuget?
-
-    nuget_metadatum&.normalized_version
-  end
-
   def publish_creation_event
     ::Gitlab::EventStore.publish(
       ::Packages::PackageCreatedEvent.new(data: {
diff --git a/app/services/packages/nuget/search_service.rb b/app/services/packages/nuget/search_service.rb
index 8ae68829085..6dabb64001a 100644
--- a/app/services/packages/nuget/search_service.rb
+++ b/app/services/packages/nuget/search_service.rb
@@ -101,13 +101,7 @@ module Packages
       strong_memoize_attr :base_matching_package_names
 
       def nuget_packages
-        if Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-          ::Packages::Nuget::Package.installable.has_version
-        else
-          Packages::Package.nuget
-                           .installable
-                           .has_version
-        end
+        ::Packages::Nuget::Package.installable.has_version
       end
 
       def project_ids_cte
@@ -155,11 +149,7 @@ module Packages
       end
 
       def packages_class
-        if Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-          ::Packages::Nuget::Package
-        else
-          ::Packages::Package
-        end
+        ::Packages::Nuget::Package
       end
 
       class Result
diff --git a/app/services/packages/nuget/symbols/create_symbol_files_service.rb b/app/services/packages/nuget/symbols/create_symbol_files_service.rb
index 6ededc25c2d..be931413ae6 100644
--- a/app/services/packages/nuget/symbols/create_symbol_files_service.rb
+++ b/app/services/packages/nuget/symbols/create_symbol_files_service.rb
@@ -46,7 +46,8 @@ module Packages
           signature, checksum = extract_signature_and_checksum(file)
           return if signature.blank? || checksum.blank?
 
-          symbol = ::Packages::Nuget::Symbol.new(
+          ::Packages::Nuget::Symbol.create!(
+            package: package,
             file: { tempfile: file, filename: path.downcase, content_type: CONTENT_TYPE },
             file_path: path,
             signature: signature,
@@ -54,14 +55,6 @@ module Packages
             file_sha256: checksum,
             project_id: package.project_id
           )
-
-          if Feature.enabled?(:nuget_extract_nuget_package_model, Feature.current_request)
-            symbol.package = package
-          else
-            symbol.legacy_package = package
-          end
-
-          symbol.save!
         rescue StandardError => e
           Gitlab::ErrorTracking.track_exception(e, class: self.class.name, package_id: package.id)
         end
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index c3b67ee09b0..fbeef6849f8 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -16,185 +16,180 @@
 
 = gitlab_ui_form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { id: "profile-preferences-form" } do |f|
   = render_if_exists 'profiles/preferences/code_suggestions_settings_self_assignment'
-  .settings-section.js-preferences-form.js-search-settings-section#appearance
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Appearance')
-    %p.gl-text-secondary
+
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Appearance'),
+    id: 'appearance',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = s_('Preferences|Choose the appearance of the application.')
-    - Gitlab::ColorModes.each do |mode|
-      = f.gitlab_ui_radio_component :color_mode_id, mode.id,
-        mode.name,
-        radio_options: { checked: user_color_mode_id == mode.id }
+    - c.with_body do
+      - Gitlab::ColorModes.each do |mode|
+        = f.gitlab_ui_radio_component :color_mode_id, mode.id,
+          mode.name,
+          radio_options: { checked: user_color_mode_id == mode.id }
 
-  .settings-section.js-preferences-form.js-search-settings-section.application-theme#navigation-theme
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Navigation theme')
-    %p.gl-text-secondary
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Navigation theme'),
+    id: 'navigation-theme',
+    options: { class: 'js-preferences-form application-theme' }) do |c|
+    - c.with_description do
       = s_('Preferences|Choose the navigation theme.')
-    .application-theme.row
-      - Gitlab::Themes.each do |theme|
-        %label.col-6.col-sm-4.col-md-3.col-xl-2.gl-mb-5
-          .preview{ class: theme.css_class }
-          = f.gitlab_ui_radio_component :theme_id, theme.id,
-            theme.name,
-            radio_options: { checked: user_theme_id == theme.id }
+    - c.with_body do
+      .application-theme.row
+        - Gitlab::Themes.each do |theme|
+          %label.col-6.col-sm-4.col-md-3.col-xl-2.gl-mb-5
+            .preview{ class: theme.css_class }
+            = f.gitlab_ui_radio_component :theme_id, theme.id,
+              theme.name,
+              radio_options: { checked: user_theme_id == theme.id }
 
-  .settings-section.js-preferences-form.js-search-settings-section#syntax-highlighting-theme
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Syntax highlighting theme')
-    %p.gl-text-secondary
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Syntax highlighting theme'),
+    id: 'syntax-highlighting-theme',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = s_('Preferences|Customize the appearance of the syntax.')
       = succeed '.' do
         = link_to _('Learn more'), help_page_path('user/profile/preferences.md', anchor: 'change-the-syntax-highlighting-theme'), target: '_blank', rel: 'noopener noreferrer'
-    .syntax-theme.row
-      - Gitlab::ColorSchemes.each do |scheme|
-        %label.col-6.col-sm-4.col-md-3.col-lg-auto.gl-mb-5
-          .preview= image_tag "#{scheme.css_class}-scheme-preview.png"
-          = f.gitlab_ui_radio_component :color_scheme_id, scheme.id,
-            scheme.name,
-            radio_options: { checked: user_color_schema_id == scheme.id }
+    - c.with_body do
+      .syntax-theme.row
+        - Gitlab::ColorSchemes.each do |scheme|
+          %label.col-6.col-sm-4.col-md-3.col-lg-auto.gl-mb-5
+            .preview= image_tag "#{scheme.css_class}-scheme-preview.png"
+            = f.gitlab_ui_radio_component :color_scheme_id, scheme.id,
+              scheme.name,
+              radio_options: { checked: user_color_schema_id == scheme.id }
 
-  .settings-section.js-preferences-form.js-search-settings-section#diffs-colors
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Diff colors')
-    %p.gl-text-secondary
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Diff colors'),
+    id: 'diffs-colors',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = s_('Preferences|Customize the colors of removed and added lines in diffs.')
-    .form-group
+      = succeed '.' do
+        = link_to _('Learn more'), help_page_path('user/profile/preferences.md', anchor: 'change-the-syntax-highlighting-theme'), target: '_blank', rel: 'noopener noreferrer'
+    - c.with_body do
       #js-profile-preferences-diffs-colors-app{ data: user_diffs_colors }
 
-  .settings-section.js-preferences-form.js-search-settings-section#behavior
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Behavior')
-    %p.gl-text-secondary
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Behavior'),
+    id: 'behavior',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = s_('Preferences|Customize the behavior of the system layout and default views.')
       = succeed '.' do
         = link_to _('Learn more'), help_page_path('user/profile/preferences.md', anchor: 'behavior'), target: '_blank', rel: 'noopener noreferrer'
-    .form-group
-      = f.label :keyboard_shortcuts_enabled, class: 'label-bold' do
-        = s_('Preferences|Keyboard shortcuts')
-      - shortcuts_help_link = link_to('', help_page_path('user/shortcuts.md'), target: '_blank', rel: 'noopener noreferrer')
-      = f.gitlab_ui_checkbox_component :keyboard_shortcuts_enabled,
-        s_('Preferences|Enable keyboard shortcuts'),
-        help_text: safe_format(s_('Preferences|%{link_start}List of keyboard shortcuts%{link_end}'), tag_pair(shortcuts_help_link, :link_start, :link_end))
-    .form-group
-      = f.label :layout, class: 'label-bold' do
-        = s_('Preferences|Layout width')
-      = f.gitlab_ui_radio_component :layout, layout_choices[0][1], layout_choices[0][0], help_text: fixed_help_text
-      = f.gitlab_ui_radio_component :layout, layout_choices[1][1], layout_choices[1][0], help_text: fluid_help_text
+    - c.with_body do
+      .form-group
+        = f.label :keyboard_shortcuts_enabled, class: 'label-bold' do
+          = s_('Preferences|Keyboard shortcuts')
+        - shortcuts_help_link = link_to('', help_page_path('user/shortcuts.md'), target: '_blank', rel: 'noopener noreferrer')
+        = f.gitlab_ui_checkbox_component :keyboard_shortcuts_enabled,
+          s_('Preferences|Enable keyboard shortcuts'),
+          help_text: safe_format(s_('Preferences|%{link_start}List of keyboard shortcuts%{link_end}'), tag_pair(shortcuts_help_link, :link_start, :link_end))
+      .form-group
+        = f.label :layout, class: 'label-bold' do
+          = s_('Preferences|Layout width')
+        = f.gitlab_ui_radio_component :layout, layout_choices[0][1], layout_choices[0][0], help_text: fixed_help_text
+        = f.gitlab_ui_radio_component :layout, layout_choices[1][1], layout_choices[1][0], help_text: fluid_help_text
 
-    .form-group
-      = f.label :text_editor, class: 'label-bold' do
-        = s_('Preferences|Default text editor')
-        .gl-text-subtle{ class: '!gl-font-normal' }
-          = s_('Preferences|Choose the default editor for writing content. You can switch editors temporarily when editing.')
-      = f.gitlab_ui_radio_component :text_editor, text_editor_choices[0][1], text_editor_choices[0][0], help_text: rich_text_editor_help_text
-      = f.gitlab_ui_radio_component :text_editor, text_editor_choices[1][1], text_editor_choices[1][0], help_text: plain_text_editor_help_text
+      .form-group
+        = f.label :text_editor, class: 'label-bold' do
+          = s_('Preferences|Default text editor')
+          .gl-text-subtle{ class: '!gl-font-normal' }
+            = s_('Preferences|Choose the default editor for writing content. You can switch editors temporarily when editing.')
+        = f.gitlab_ui_radio_component :text_editor, text_editor_choices[0][1], text_editor_choices[0][0], help_text: rich_text_editor_help_text
+        = f.gitlab_ui_radio_component :text_editor, text_editor_choices[1][1], text_editor_choices[1][0], help_text: plain_text_editor_help_text
 
-    - if Feature.enabled?(:ui_for_organizations, current_user)
-      #js-home-organization-setting{ data: { app_data: home_organization_setting_app_data } }
+      - if Feature.enabled?(:ui_for_organizations, current_user)
+        #js-home-organization-setting{ data: { app_data: home_organization_setting_app_data } }
 
-    .js-listbox-input{ data: { label: s_('Preferences|Homepage'), description: s_('Preferences|Choose what content you want to see by default on your homepage.'), name: 'user[dashboard]', items: dashboard_choices.to_json, value: current_user.dashboard, block: true.to_s, toggle_class: 'gl-form-input-xl' } }
+      .js-listbox-input{ data: { label: s_('Preferences|Homepage'), description: s_('Preferences|Choose what content you want to see by default on your homepage.'), name: 'user[dashboard]', items: dashboard_choices.to_json, value: current_user.dashboard, block: true.to_s, toggle_class: 'gl-form-input-xl' } }
 
-    = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
+      = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
 
-    .form-group
-      = f.label :project_view, class: 'label-bold' do
-        = s_('Preferences|Project overview content')
-      = f.select :project_view, project_view_choices, {}, class: 'gl-form-select custom-select gl-form-input-xl gl-block'
-      .form-text.gl-text-subtle
-        = s_('Preferences|Choose what content you want to see on a project’s overview page.')
-    .form-group
-      = f.gitlab_ui_checkbox_component :project_shortcut_buttons, s_('Preferences|Show shortcut buttons above files on project overview')
-    .form-group
-      = f.gitlab_ui_checkbox_component :render_whitespace_in_code, s_('Preferences|Render whitespace characters in the Web IDE')
-    .form-group
-      = f.gitlab_ui_checkbox_component :show_whitespace_in_diffs, s_('Preferences|Show whitespace changes in diffs')
-    .form-group
-      = f.gitlab_ui_checkbox_component :view_diffs_file_by_file,
-        s_("Preferences|Show one file at a time on merge request's Changes tab"),
-        help_text: s_("Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser.")
-    .form-group
-      - supported_characters = %w(" ' ` &#40; [ { < * _).map { |char| "<code>#{char}</code>" }.join(', ')
-      = f.gitlab_ui_checkbox_component :markdown_surround_selection,
-        s_('Preferences|Surround text selection when typing quotes or brackets'),
-        help_text: sprintf(s_("Preferences|When you type in a description or comment box, selected text is surrounded by the corresponding character after typing one of the following characters: %{supported_characters}."), { supported_characters: supported_characters }).html_safe
-    .form-group
-      = f.gitlab_ui_checkbox_component :markdown_automatic_lists,
-        s_('Preferences|Automatically add new list items'),
-        help_text: html_escape(s_('Preferences|When you type in a description or comment box, pressing %{kbdOpen}Enter%{kbdClose} in a list adds a new item below.')) % { kbdOpen: '<kbd>'.html_safe, kbdClose: '</kbd>'.html_safe }
+      .form-group
+        = f.label :project_view, class: 'label-bold' do
+          = s_('Preferences|Project overview content')
+        = f.select :project_view, project_view_choices, {}, class: 'gl-form-select custom-select gl-form-input-xl gl-block'
+        .form-text.gl-text-subtle
+          = s_('Preferences|Choose what content you want to see on a project’s overview page.')
+      .form-group
+        = f.gitlab_ui_checkbox_component :project_shortcut_buttons, s_('Preferences|Show shortcut buttons above files on project overview')
+      .form-group
+        = f.gitlab_ui_checkbox_component :render_whitespace_in_code, s_('Preferences|Render whitespace characters in the Web IDE')
+      .form-group
+        = f.gitlab_ui_checkbox_component :show_whitespace_in_diffs, s_('Preferences|Show whitespace changes in diffs')
+      .form-group
+        = f.gitlab_ui_checkbox_component :view_diffs_file_by_file,
+          s_("Preferences|Show one file at a time on merge request's Changes tab"),
+          help_text: s_("Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser.")
+      .form-group
+        - supported_characters = %w(" ' ` &#40; [ { < * _).map { |char| "<code>#{char}</code>" }.join(', ')
+        = f.gitlab_ui_checkbox_component :markdown_surround_selection,
+          s_('Preferences|Surround text selection when typing quotes or brackets'),
+          help_text: sprintf(s_("Preferences|When you type in a description or comment box, selected text is surrounded by the corresponding character after typing one of the following characters: %{supported_characters}."), { supported_characters: supported_characters }).html_safe
+      .form-group
+        = f.gitlab_ui_checkbox_component :markdown_automatic_lists,
+          s_('Preferences|Automatically add new list items'),
+          help_text: html_escape(s_('Preferences|When you type in a description or comment box, pressing %{kbdOpen}Enter%{kbdClose} in a list adds a new item below.')) % { kbdOpen: '<kbd>'.html_safe, kbdClose: '</kbd>'.html_safe }
 
-    .form-group
-      = f.label :tab_width, s_('Preferences|Tab width'), class: 'label-bold'
-      = f.number_field :tab_width,
-                      class: 'form-control gl-form-input gl-max-w-15',
-                      min: Gitlab::TabWidth::MIN,
-                      max: Gitlab::TabWidth::MAX,
-                      required: true
-      .form-text.gl-text-subtle
-        = s_('Preferences|Must be a number between %{min} and %{max}') % { min: Gitlab::TabWidth::MIN, max: Gitlab::TabWidth::MAX }
+      .form-group
+        = f.label :tab_width, s_('Preferences|Tab width'), class: 'label-bold'
+        = f.number_field :tab_width,
+                        class: 'form-control gl-form-input gl-max-w-15',
+                        min: Gitlab::TabWidth::MIN,
+                        max: Gitlab::TabWidth::MAX,
+                        required: true
+        .form-text.gl-text-subtle
+          = s_('Preferences|Must be a number between %{min} and %{max}') % { min: Gitlab::TabWidth::MIN, max: Gitlab::TabWidth::MAX }
 
-  .settings-section.js-preferences-form.js-search-settings-section#localization
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = _('Localization')
-    %p.gl-text-secondary
+  = render ::Layouts::SettingsSectionComponent.new(_('Localization'),
+    id: 'localization',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = _('Customize language and region related settings.')
       = succeed '.' do
         = link_to _('Learn more'), help_page_path('user/profile/preferences.md', anchor: 'localization'), target: '_blank', rel: 'noopener noreferrer'
+    - c.with_body do
+      .js-listbox-input{ data: { label: _('Language'), description: s_('Preferences|This feature is experimental and translations are not yet complete.'), name: 'user[preferred_language]', items: language_choices.to_json, value: current_user.preferred_language, block: true.to_s, toggle_class: 'gl-form-input-xl' } }
+      %p.-gl-mt-5
+        = link_to help_page_url('development/i18n/translation.md'), class: 'text-nowrap', target: '_blank', rel: 'noopener noreferrer' do
+          = _("Help translate GitLab into your language")
+          %span{ aria: { label: _('Open new window') } }
+            = sprite_icon('external-link')
+      .form-group
+        = f.label :first_day_of_week, class: 'label-bold' do
+          = _('First day of the week')
+        = f.select :first_day_of_week, first_day_of_week_choices_with_default, {}, class: 'gl-form-select custom-select gl-block gl-form-input-xl'
 
-    .js-listbox-input{ data: { label: _('Language'), description: s_('Preferences|This feature is experimental and translations are not yet complete.'), name: 'user[preferred_language]', items: language_choices.to_json, value: current_user.preferred_language, block: true.to_s, toggle_class: 'gl-form-input-xl' } }
-    %p.-gl-mt-5
-      = link_to help_page_url('development/i18n/translation.md'), class: 'text-nowrap', target: '_blank', rel: 'noopener noreferrer' do
-        = _("Help translate GitLab into your language")
-        %span{ aria: { label: _('Open new window') } }
-          = sprite_icon('external-link')
-    .form-group
-      = f.label :first_day_of_week, class: 'label-bold' do
-        = _('First day of the week')
-      = f.select :first_day_of_week, first_day_of_week_choices_with_default, {}, class: 'gl-form-select custom-select gl-block gl-form-input-xl'
-
-  .settings-section.js-preferences-form.js-search-settings-section#time-preferences
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Time preferences')
-    %p.gl-text-secondary
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Time preferences'),
+    id: 'time-preferences',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = s_('Preferences|Configure how dates and times display for you.')
       = succeed '.' do
         = link_to _('Learn more'), help_page_path('user/profile/preferences.md', anchor: 'show-exact-times-instead-of-relative-times'), target: '_blank', rel: 'noopener noreferrer'
-    .form-group
-      = f.gitlab_ui_checkbox_component :time_display_relative,
-        s_('Preferences|Use relative times'),
-        help_text: s_('Preferences|For example: 30 minutes ago.')
-    .form-group
-      = f.label :time_display_format, class: 'label-bold' do
-        = s_('Preferences|Time format')
-      - time_display_format_choices.each_entry do |time_display_format_option|
-        .gl-mb-4
-        = f.gitlab_ui_radio_component :time_display_format, time_display_format_option[1], time_display_format_option[0]
-  .settings-section.js-preferences-form.js-search-settings-section#enabled_following
-    .settings-sticky-header
-      .settings-sticky-header-inner
-        %h4.gl-my-0
-          = s_('Preferences|Enable follow users feature')
-    %p.gl-text-secondary
+    - c.with_body do
+      .form-group
+        = f.gitlab_ui_checkbox_component :time_display_relative,
+          s_('Preferences|Use relative times'),
+          help_text: s_('Preferences|For example: 30 minutes ago.')
+      .form-group
+        = f.label :time_display_format, class: 'label-bold' do
+          = s_('Preferences|Time format')
+        - time_display_format_choices.each_entry do |time_display_format_option|
+          .gl-mb-4
+          = f.gitlab_ui_radio_component :time_display_format, time_display_format_option[1], time_display_format_option[0]
+
+  = render ::Layouts::SettingsSectionComponent.new(s_('Preferences|Enable follow users feature'),
+    id: 'enabled_following',
+    options: { class: 'js-preferences-form' }) do |c|
+    - c.with_description do
       = s_('Preferences|Turns on or off the ability to follow or be followed by other users.')
       = succeed '.' do
         = link_to _('Learn more'), help_page_path('user/profile/index.md', anchor: 'follow-users'), target: '_blank', rel: 'noopener noreferrer'
-    .form-group
-      = f.gitlab_ui_checkbox_component :enabled_following,
-      s_('Preferences|Enable follow users')
+    - c.with_body do
+      .form-group
+        = f.gitlab_ui_checkbox_component :enabled_following,
+        s_('Preferences|Enable follow users')
+
   = render_if_exists 'profiles/preferences/zoekt_settings', form: f
 
   #js-profile-preferences-app{ data: data_attributes }
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 72c82d505d3..913a041dd61 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -23,19 +23,19 @@
         %span.issuable-reference.gl-inline-block
           #{issuable_reference(merge_request)}
         %span.gl-hidden.sm:gl-inline
-          %span.issuable-authored.gl-inline-block{ class: '!gl-text-gray-500' }
+          %span.issuable-authored.gl-inline-block{ class: '!gl-text-subtle' }
             &middot;
-            #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(merge_request.created_at, placement: 'bottom'), user: link_to_member(merge_request.author, avatar: false, extra_class: '!gl-text-gray-500') }}
+            #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(merge_request.created_at, placement: 'bottom'), user: link_to_member(merge_request.author, avatar: false, extra_class: '!gl-text-subtle') }}
           - if merge_request.milestone
             %span.issuable-milestone.gl-inline-block
               &nbsp;
-              = link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), class: '!gl-text-gray-500', data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do
+              = link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), class: '!gl-text-subtle', data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do
                 = sprite_icon('milestone', size: 12, css_class: 'gl-align-text-bottom')
                 = merge_request.milestone.title
           - if merge_request.target_project.default_branch != merge_request.target_branch
             %span.project-ref-path.has-tooltip.gl-inline-block.gl-truncate.gl-max-w-26.gl-align-bottom{ title: _('Target branch: %{target_branch}') % {target_branch: merge_request.target_branch} }
               &nbsp;
-              = link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name !gl-text-gray-500' do
+              = link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name !gl-text-subtle' do
                 = sprite_icon('branch', size: 12, css_class: 'fork-sprite')
                 = merge_request.target_branch
           - if merge_request.labels.any?
@@ -68,6 +68,6 @@
         = render 'shared/merge_request_pipeline_status', merge_request: merge_request
 
       - if merge_request.updated_at != merge_request.created_at
-        .issuable-updated-at.gl-self-end.gl-hidden.sm:gl-inline-block.gl-text-gray-500
+        .issuable-updated-at.gl-self-end.gl-hidden.sm:gl-inline-block.gl-text-subtle
           %span
             = _('updated %{time_ago}').html_safe % { time_ago: time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago') }
diff --git a/config/feature_flags/gitlab_com_derisk/nuget_extract_nuget_package_model.yml b/config/feature_flags/gitlab_com_derisk/nuget_extract_nuget_package_model.yml
deleted file mode 100644
index cb6bb91bce1..00000000000
--- a/config/feature_flags/gitlab_com_derisk/nuget_extract_nuget_package_model.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: nuget_extract_nuget_package_model
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435826
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170692
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-milestone: '17.6'
-group: group::package registry
-type: gitlab_com_derisk
-default_enabled: false
diff --git a/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb b/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb
index fc6ab237bec..c4108b20248 100644
--- a/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb
+++ b/db/post_migrate/20241024062434_queue_create_missing_external_links_for_vulnerabilities.rb
@@ -10,17 +10,12 @@ class QueueCreateMissingExternalLinksForVulnerabilities < Gitlab::Database::Migr
   SUB_BATCH_SIZE = 100
 
   def up
-    queue_batched_background_migration(
-      MIGRATION,
-      :project_settings,
-      :project_id,
-      job_interval: DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      sub_batch_size: SUB_BATCH_SIZE
-    )
+    # no-op
+    # will be fixed with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172843
   end
 
   def down
-    delete_batched_background_migration(MIGRATION, :project_settings, :project_id, [])
+    # no-op
+    # will be fixed with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172843
   end
 end
diff --git a/doc/administration/configure.md b/doc/administration/configure.md
index 6ae34202c0b..d432b0e39f4 100644
--- a/doc/administration/configure.md
+++ b/doc/administration/configure.md
@@ -5,7 +5,7 @@ description: Installation settings.
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Configure your GitLab installation
+# Configure GitLab
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
diff --git a/doc/administration/dedicated/configure_instance.md b/doc/administration/dedicated/configure_instance.md
index 08f36487d54..c932cf89f2d 100644
--- a/doc/administration/dedicated/configure_instance.md
+++ b/doc/administration/dedicated/configure_instance.md
@@ -32,6 +32,8 @@ The following configuration settings are available in Switchboard:
 - [IP allowlist](#ip-allowlist)
 - [SAML settings](#saml)
 - [Custom certificates](#custom-certificates)
+- [Outbound private links](#outbound-private-link)
+- [Private hosted zones](#private-hosted-zones)
 
 Prerequisites:
 
diff --git a/doc/administration/monitoring/index.md b/doc/administration/monitoring/index.md
index cd6fda75972..ae05f7667e5 100644
--- a/doc/administration/monitoring/index.md
+++ b/doc/administration/monitoring/index.md
@@ -4,7 +4,7 @@ group: Platform Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Monitoring GitLab
+# Monitor GitLab
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
diff --git a/doc/administration/operations/index.md b/doc/administration/operations/index.md
index 145263374bf..6c4bc9bf13b 100644
--- a/doc/administration/operations/index.md
+++ b/doc/administration/operations/index.md
@@ -5,7 +5,7 @@ description: Backup and restore, move repos, maintenance tasks.
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Maintain your GitLab installation
+# Maintain GitLab
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 1c4d0dff500..b4b3ad7bb14 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -579,6 +579,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="querygroupsids"></a>`ids` | [`[ID!]`](#id) | Filter groups by IDs. |
 | <a id="querygroupsmarkedfordeletionon"></a>`markedForDeletionOn` | [`Date`](#date) | Date when the group was marked for deletion. |
 | <a id="querygroupssearch"></a>`search` | [`String`](#string) | Search query for group name or group full path. |
 | <a id="querygroupssort"></a>`sort` | [`String`](#string) | Sort order of results. Format: `<field_name>_<sort_direction>`, for example: `id_desc` or `name_asc`. |
@@ -29650,6 +29651,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="organizationgroupsids"></a>`ids` | [`[ID!]`](#id) | Filter groups by IDs. |
 | <a id="organizationgroupsmarkedfordeletionon"></a>`markedForDeletionOn` | [`Date`](#date) | Date when the group was marked for deletion. |
 | <a id="organizationgroupssearch"></a>`search` | [`String`](#string) | Search query for group name or group full path. |
 | <a id="organizationgroupssort"></a>`sort` | [`String`](#string) | Sort order of results. Format: `<field_name>_<sort_direction>`, for example: `id_desc` or `name_asc`. |
diff --git a/doc/editor_extensions/jetbrains_ide/jetbrains_troubleshooting.md b/doc/editor_extensions/jetbrains_ide/jetbrains_troubleshooting.md
index e5f4a4c630d..43316bb89db 100644
--- a/doc/editor_extensions/jetbrains_ide/jetbrains_troubleshooting.md
+++ b/doc/editor_extensions/jetbrains_ide/jetbrains_troubleshooting.md
@@ -30,7 +30,11 @@ To enable GitLab Language Server debug logs:
 1. Select **Apply**.
 1. Below **Enable GitLab Language Server**, select **Restart Language Server**.
 
-The debug logs are available in the `idea.log` log file.
+The debug logs are available in the `idea.log` log file. To view this file, either:
+
+- In your IDE, go to **Help > Show Log in Finder**.
+- Go to the directory `/Users/<user>/Library/Logs/JetBrains/IntelliJIdea<build_version>`, replacing
+  `<user>` and `<build_version>` with the appropriate values.
 
 ## Use an HTTP proxy
 
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index ed6b835e1c4..4c60985fa51 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -186,7 +186,7 @@ sudo /etc/init.d/gitlab start
 
 DETAILS:
 **Tier:** Premium, Ultimate
-**Offering:** Self-managed, GitLab Dedicated
+**Offering:** Self-managed
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142189) in GitLab 16.9.
 
diff --git a/doc/security/index.md b/doc/security/index.md
index 400d821d6f1..74948ba979b 100644
--- a/doc/security/index.md
+++ b/doc/security/index.md
@@ -5,7 +5,7 @@ description: SSH key limits, 2FA, tokens, hardening.
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Secure your installation
+# Secure GitLab
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
diff --git a/doc/subscriptions/subscription-add-ons.md b/doc/subscriptions/subscription-add-ons.md
index 141daba7e29..859e023b97d 100644
--- a/doc/subscriptions/subscription-add-ons.md
+++ b/doc/subscriptions/subscription-add-ons.md
@@ -85,6 +85,7 @@ To use GitLab Duo features in any project or group, you must assign the user to
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. Select **Settings > GitLab Duo**.
+1. Select **Assign seats** on the **Seat utilization** card.
 1. To the right of the user, turn on the toggle to assign a GitLab Duo seat.
 
 The user is sent a confirmation email.
@@ -102,6 +103,7 @@ Prerequisites:
      1. On the left sidebar, select **Subscription**.
      1. In **Subscription details**, to the right of **Last sync**, select
         synchronize subscription (**{retry}**).
+1. Select **Assign seats** on the **Seat utilization** card.
 1. To the right of the user, turn on the toggle to assign a GitLab Duo seat.
 
 The user is sent a confirmation email.
diff --git a/lib/bulk_imports/pipeline/runner.rb b/lib/bulk_imports/pipeline/runner.rb
index f9b2f9784c1..090f2b91fcb 100644
--- a/lib/bulk_imports/pipeline/runner.rb
+++ b/lib/bulk_imports/pipeline/runner.rb
@@ -22,6 +22,8 @@ module BulkImports
             raw_entry = entry.dup
             next if already_processed?(raw_entry, index)
 
+            delete_partial_imported_records(entry)
+
             increment_fetched_objects_counter
 
             transformers.each do |transformer|
@@ -111,6 +113,21 @@ module BulkImports
 
       def save_processed_entry(*); end
 
+      # Overridden by child pipelines
+      # This method is called once for the first non-processed item returned in the extract step,
+      # meaning that, in the case of a pipeline retrial, it is called again for the latest partially
+      # processed item.
+      def delete_existing_records(*); end
+
+      def delete_partial_imported_records(entry)
+        # Using memoization to execute delete_existing_records method only once
+        @clean_up_upon_retry ||= begin
+          delete_existing_records(entry)
+
+          true
+        end
+      end
+
       def after_run(extracted_data)
         run if extracted_data.has_next_page?
       end
diff --git a/lib/bulk_imports/projects/pipelines/issues_pipeline.rb b/lib/bulk_imports/projects/pipelines/issues_pipeline.rb
index 3747dc34a46..b41c34b9066 100644
--- a/lib/bulk_imports/projects/pipelines/issues_pipeline.rb
+++ b/lib/bulk_imports/projects/pipelines/issues_pipeline.rb
@@ -9,6 +9,16 @@ module BulkImports
         relation_name 'issues'
 
         extractor ::BulkImports::Common::Extractors::NdjsonExtractor, relation: relation
+
+        def delete_existing_records(entry)
+          relation_hash = entry.first
+          existing_record = portable.issues.iid_in(relation_hash['iid']).first
+
+          return unless existing_record
+
+          Issuable::DestroyService.new(container: portable, current_user: context.current_user)
+            .execute(existing_record)
+        end
       end
     end
   end
diff --git a/lib/bulk_imports/projects/pipelines/merge_requests_pipeline.rb b/lib/bulk_imports/projects/pipelines/merge_requests_pipeline.rb
index fe5c61e81a3..16b1646de87 100644
--- a/lib/bulk_imports/projects/pipelines/merge_requests_pipeline.rb
+++ b/lib/bulk_imports/projects/pipelines/merge_requests_pipeline.rb
@@ -10,6 +10,16 @@ module BulkImports
 
         extractor ::BulkImports::Common::Extractors::NdjsonExtractor, relation: relation
 
+        def delete_existing_records(entry)
+          relation_hash = entry.first
+          existing_record = portable.merge_requests.iid_in(relation_hash['iid']).first
+
+          return unless existing_record
+
+          Issuable::DestroyService.new(container: portable, current_user: context.current_user)
+            .execute(existing_record)
+        end
+
         def on_finish
           ::Projects::ImportExport::AfterImportMergeRequestsWorker.perform_async(context.portable.id)
         end
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 642486f2f68..6cafc8c595f 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -486,3 +486,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth.prepend_mod_with('Gitlab::Auth')
diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb
index 0f673d5b28a..33cc3b190df 100644
--- a/lib/gitlab/ci/pipeline/chain/command.rb
+++ b/lib/gitlab/ci/pipeline/chain/command.rb
@@ -10,30 +10,18 @@ module Gitlab
           :trigger_request, :schedule, :merge_request, :external_pull_request,
           :ignore_skip_ci, :save_incompleted,
           :seeds_block, :variables_attributes, :push_options,
-          :chat_data, :allow_mirror_update, :bridge, :content, :dry_run, :logger, :execution_policy_dry_run,
+          :chat_data, :allow_mirror_update, :bridge, :content, :dry_run, :logger, :pipeline_policy_context,
           # These attributes are set by Chains during processing:
           :config_content, :yaml_processor_result, :workflow_rules_result, :pipeline_seed,
-          :pipeline_config, :execution_policy_pipelines, :partition_id,
+          :pipeline_config, :partition_id,
           keyword_init: true
         ) do
           include Gitlab::Utils::StrongMemoize
 
           def dry_run?
-            dry_run || execution_policy_dry_run
+            dry_run
           end
 
-          # rubocop:disable Gitlab/NoCodeCoverageComment -- method is tested in EE
-          # :nocov:
-          def execution_policy_mode?
-            false # to be overridden in EE
-          end
-
-          def pipeline_policy_context
-            # to be overridden in EE
-          end
-          # :nocov:
-          # rubocop:enable Gitlab/NoCodeCoverageComment
-
           def branch_exists?
             strong_memoize(:is_branch) do
               branch_ref? && project.repository.branch_exists?(ref)
diff --git a/lib/gitlab/ci/pipeline/chain/limit/rate_limit.rb b/lib/gitlab/ci/pipeline/chain/limit/rate_limit.rb
index 8a254358bed..3eb276aee86 100644
--- a/lib/gitlab/ci/pipeline/chain/limit/rate_limit.rb
+++ b/lib/gitlab/ci/pipeline/chain/limit/rate_limit.rb
@@ -14,7 +14,7 @@ module Gitlab
               # sub-pipelines, as well as execution policy pipelines
               # that would otherwise hit the rate limit due to having the same scope (project, user, sha).
               #
-              return if pipeline.parent_pipeline? || command.execution_policy_dry_run
+              return if pipeline.parent_pipeline? || command.pipeline_policy_context&.creating_policy_pipeline?
 
               if rate_limit_throttled?
                 create_log_entry
diff --git a/lib/gitlab/ci/pipeline/chain/populate.rb b/lib/gitlab/ci/pipeline/chain/populate.rb
index 74451bf0987..97e65bf536a 100644
--- a/lib/gitlab/ci/pipeline/chain/populate.rb
+++ b/lib/gitlab/ci/pipeline/chain/populate.rb
@@ -38,7 +38,7 @@ module Gitlab
           def no_pipeline_to_create?
             # If there are security policy pipelines,
             # they will be merged onto the pipeline in PipelineExecutionPolicies::MergeJobs
-            stage_names.empty? && @command.execution_policy_pipelines.blank?
+            stage_names.empty? && !@command.pipeline_policy_context&.has_execution_policy_pipelines?
           end
 
           def stage_names
diff --git a/lib/gitlab/github_import/importer/pull_request_importer.rb b/lib/gitlab/github_import/importer/pull_request_importer.rb
index 764f84e1581..3b4a073ab3b 100644
--- a/lib/gitlab/github_import/importer/pull_request_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_request_importer.rb
@@ -6,9 +6,10 @@ module Gitlab
       class PullRequestImporter
         include Gitlab::Import::MergeRequestHelpers
         include Gitlab::Import::UsernameMentionRewriter
+        include Gitlab::GithubImport::PushPlaceholderReferences
 
         attr_reader :pull_request, :project, :client, :user_finder,
-          :milestone_finder, :issuable_finder
+          :milestone_finder, :issuable_finder, :mapper
 
         # pull_request - An instance of
         #                `Gitlab::GithubImport::Representation::PullRequest`.
@@ -22,6 +23,7 @@ module Gitlab
           @milestone_finder = MilestoneFinder.new(project)
           @issuable_finder =
             GithubImport::IssuableFinder.new(project, pull_request)
+          @mapper = Gitlab::GithubImport::ContributionsMapper.new(project)
         end
 
         def execute
@@ -31,6 +33,14 @@ module Gitlab
             issuable_finder.cache_database_id(mr.id)
             set_merge_request_assignees(mr)
             insert_git_data(mr, already_exists)
+
+            if mapper.user_mapping_enabled?
+              push_with_record(mr, :author_id, pull_request.author.id, mapper.user_mapper)
+
+              # we only import one PR assignee
+              assignee = mr.merge_request_assignees.first
+              push_with_record(assignee, :user_id, pull_request.assignee[:id], mapper.user_mapper) if assignee
+            end
           end
         end
 
diff --git a/lib/gitlab/github_import/importer/pull_requests/merged_by_importer.rb b/lib/gitlab/github_import/importer/pull_requests/merged_by_importer.rb
index 000ca8c6428..b2b7d330e5a 100644
--- a/lib/gitlab/github_import/importer/pull_requests/merged_by_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_requests/merged_by_importer.rb
@@ -5,6 +5,8 @@ module Gitlab
     module Importer
       module PullRequests
         class MergedByImporter
+          include Gitlab::GithubImport::PushPlaceholderReferences
+
           # pull_request - An instance of
           #                `Gitlab::GithubImport::Representation::PullRequest`
           # project - An instance of `Project`
@@ -13,21 +15,27 @@ module Gitlab
             @pull_request = pull_request
             @project = project
             @client = client
+            @merged_by = pull_request.merged_by
+            @mapper = Gitlab::GithubImport::ContributionsMapper.new(project)
           end
 
           def execute
             user_finder = GithubImport::UserFinder.new(project, client)
 
-            gitlab_user_id = user_finder.user_id_for(pull_request.merged_by)
+            gitlab_user_id = user_finder.user_id_for(merged_by)
 
             metrics_upsert(gitlab_user_id)
 
-            add_note!
+            if mapper.user_mapping_enabled?
+              push_with_record(merge_request.metrics, :merged_by_id, merged_by[:id], mapper.user_mapper)
+            else
+              add_legacy_note!
+            end
           end
 
           private
 
-          attr_reader :project, :pull_request, :client
+          attr_reader :project, :pull_request, :client, :mapper, :merged_by
 
           def metrics_upsert(gitlab_user_id)
             MergeRequest::Metrics.upsert({
@@ -40,7 +48,7 @@ module Gitlab
             }, unique_by: :merge_request_id)
           end
 
-          def add_note!
+          def add_legacy_note!
             merge_request.notes.create!(
               importing: true,
               note: missing_author_note,
@@ -61,7 +69,7 @@ module Gitlab
 
           def missing_author_note
             format(s_("GitHubImporter|*Merged by: %{author} at %{timestamp}*"),
-              author: pull_request.merged_by&.login || 'ghost',
+              author: merged_by&.login || 'ghost',
               timestamp: pull_request.merged_at
             )
           end
diff --git a/lib/gitlab/github_import/importer/pull_requests/review_importer.rb b/lib/gitlab/github_import/importer/pull_requests/review_importer.rb
index d5c5c705cc8..e5ec6728d20 100644
--- a/lib/gitlab/github_import/importer/pull_requests/review_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_requests/review_importer.rb
@@ -6,6 +6,7 @@ module Gitlab
       module PullRequests
         class ReviewImporter
           include ::Gitlab::Import::MergeRequestHelpers
+          include Gitlab::GithubImport::PushPlaceholderReferences
 
           # review - An instance of `Gitlab::GithubImport::Representation::PullRequestReview`
           # project - An instance of `Project`
@@ -15,6 +16,8 @@ module Gitlab
             @project = project
             @client = client
             @merge_request = project.merge_requests.find_by_iid(review.merge_request_iid)
+            @user_finder = GithubImport::UserFinder.new(project, client)
+            @mapper = Gitlab::GithubImport::ContributionsMapper.new(project)
           end
 
           def execute(options = {})
@@ -35,7 +38,7 @@ module Gitlab
 
           private
 
-          attr_reader :review, :merge_request, :project, :client
+          attr_reader :review, :merge_request, :project, :client, :mapper, :user_finder
 
           def add_review_note!(author_id)
             return if review.note.empty?
@@ -68,6 +71,10 @@ module Gitlab
             note = Note.new(note_attributes(author_id, note))
 
             note.save!
+
+            return unless mapper.user_mapping_enabled?
+
+            push_with_record(note, :author_id, review.author.id, mapper.user_mapper)
           end
 
           def note_attributes(author_id, note, extra = {})
@@ -88,11 +95,20 @@ module Gitlab
           def add_approval!(user_id)
             return unless review.review_type == 'APPROVED'
 
-            create_approval!(project.id, merge_request.id, user_id, submitted_at)
+            approval, approval_system_note = create_approval!(project.id, merge_request.id, user_id, submitted_at)
+
+            return unless mapper.user_mapping_enabled? && approval
+
+            push_with_record(approval, :user_id, review.author.id, mapper.user_mapper)
+            push_with_record(approval_system_note, :author_id, review.author.id, mapper.user_mapper)
           end
 
           def add_reviewer!(user_id)
-            create_reviewer!(merge_request.id, user_id, submitted_at)
+            reviewer = create_reviewer!(merge_request.id, user_id, submitted_at)
+
+            return unless mapper.user_mapping_enabled? && reviewer
+
+            push_with_record(reviewer, :user_id, review.author.id, mapper.user_mapper)
           end
 
           def submitted_at
diff --git a/lib/gitlab/github_import/importer/pull_requests/review_request_importer.rb b/lib/gitlab/github_import/importer/pull_requests/review_request_importer.rb
index f51c610f24b..bda1ceebfe5 100644
--- a/lib/gitlab/github_import/importer/pull_requests/review_request_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_requests/review_request_importer.rb
@@ -5,31 +5,39 @@ module Gitlab
     module Importer
       module PullRequests
         class ReviewRequestImporter
+          include Gitlab::Utils::StrongMemoize
+          include Gitlab::GithubImport::PushPlaceholderReferences
+
           def initialize(review_request, project, client)
             @review_request = review_request
+            @project = project
             @user_finder = UserFinder.new(project, client)
+            @mapper = Gitlab::GithubImport::ContributionsMapper.new(project)
           end
 
           def execute
-            MergeRequestReviewer.bulk_insert!(build_reviewers)
+            review_request.users.each do |user|
+              user_id = user_finder.user_id_for(user)
+
+              next unless user_id
+
+              reviewer = MergeRequestReviewer.create!(
+                merge_request_id: review_request.merge_request_id,
+                user_id: user_id,
+                state: MergeRequestReviewer.states['unreviewed'],
+                created_at: Time.zone.now
+              )
+
+              next unless mapper.user_mapping_enabled?
+
+              push_with_record(reviewer, :user_id, user.id, mapper.user_mapper)
+            rescue PG::UniqueViolation, ActiveRecord::RecordNotUnique
+            end
           end
 
           private
 
-          attr_reader :review_request, :user_finder
-
-          def build_reviewers
-            reviewer_ids = review_request.users.filter_map { |user| user_finder.user_id_for(user) }
-
-            reviewer_ids.map do |reviewer_id|
-              MergeRequestReviewer.new(
-                merge_request_id: review_request.merge_request_id,
-                user_id: reviewer_id,
-                state: MergeRequestReviewer.states['unreviewed'],
-                created_at: Time.zone.now
-              )
-            end
-          end
+          attr_reader :review_request, :project, :user_finder, :mapper
         end
       end
     end
diff --git a/lib/gitlab/import/merge_request_helpers.rb b/lib/gitlab/import/merge_request_helpers.rb
index 72c4f3c6e46..58bcd95603e 100644
--- a/lib/gitlab/import/merge_request_helpers.rb
+++ b/lib/gitlab/import/merge_request_helpers.rb
@@ -84,13 +84,18 @@ module Gitlab
           updated_at: submitted_at
         }
 
-        result = ::Approval.insert(
+        approval_result = ::Approval.insert(
           approval_attributes,
           returning: [:id],
           unique_by: [:user_id, :merge_request_id]
         )
 
-        add_approval_system_note!(project_id, merge_request_id, user_id, submitted_at) if result.rows.present?
+        return unless approval_result.rows.present?
+
+        note = add_approval_system_note!(project_id, merge_request_id, user_id, submitted_at)
+        approval = Approval.find(approval_result.first['id'])
+
+        [approval, note]
       end
 
       def add_approval_system_note!(project_id, merge_request_id, user_id, submitted_at)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 41ad6de0f97..6d2abbb5a3d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1071,9 +1071,6 @@ msgstr ""
 msgid "%{milliseconds}ms"
 msgstr ""
 
-msgid "%{minutesUsed} units"
-msgstr ""
-
 msgid "%{model_name} not found"
 msgstr ""
 
@@ -1142,9 +1139,6 @@ msgstr ""
 msgid "%{path} on %{ref}"
 msgstr ""
 
-msgid "%{percentageUsed}%% used"
-msgstr ""
-
 msgid "%{percentage}%% complete"
 msgstr ""
 
@@ -4952,9 +4946,6 @@ msgstr ""
 msgid "Admin|Geo"
 msgstr ""
 
-msgid "Admin|GitLab Duo"
-msgstr ""
-
 msgid "Admin|Kubernetes"
 msgstr ""
 
@@ -8592,6 +8583,9 @@ msgstr ""
 msgid "Below you will find all the groups that are public or internal. Contribute by requesting to join a group."
 msgstr ""
 
+msgid "Best Regards,"
+msgstr ""
+
 msgid "Beta"
 msgstr ""
 
@@ -13538,10 +13532,10 @@ msgstr ""
 msgid "CodeSuggestions|Introducing the GitLab Duo Pro add-on"
 msgstr ""
 
-msgid "CodeSuggestions|Manage seat assignments for %{addOnName} or run a health check to identify problems."
+msgid "CodeSuggestions|Manage seat assignments for %{addOnName} within your group."
 msgstr ""
 
-msgid "CodeSuggestions|Manage seat assignments for %{addOnName} within your group."
+msgid "CodeSuggestions|Manage seat assignments for %{addOnName}."
 msgstr ""
 
 msgid "CodeSuggestions|No health problems detected"
@@ -24986,6 +24980,9 @@ msgstr ""
 msgid "GitLab Support Bot"
 msgstr ""
 
+msgid "GitLab Team"
+msgstr ""
+
 msgid "GitLab User"
 msgstr ""
 
@@ -38903,6 +38900,12 @@ msgstr ""
 msgid "Owners and administrators"
 msgstr ""
 
+msgid "PIPL|Important Change to Your GitLab.com Account"
+msgstr ""
+
+msgid "PIPL|Please be advised that GitLab can no longer service GitLab.com accounts for individuals and organizations located in Mainland China, Macao, and Hong Kong. Our system indicates that you are visiting GitLab from one of these locations. We advise you to sign up with JiHu %{jihu_link}. JiHu is an independent company with a localized GitLab offering that has an exclusive right to provide GitLab to individuals and organizations located in this region. You must complete the transition by %{deadline}, after which GitLab will delete your account from our systems. If you believe you are receiving this notification in error, please log in to GitLab.com from a supported service location. For further information or support, please feel free to contact saasmigration@gitlab.cn."
+msgstr ""
+
 msgid "PQL|An error occurred while sending hand raise lead."
 msgstr ""
 
@@ -67057,6 +67060,9 @@ msgstr ""
 msgid "unicode domains should use IDNA encoding"
 msgstr ""
 
+msgid "units"
+msgstr ""
+
 msgid "unsubscribed %{emails}"
 msgstr ""
 
diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
index 67f593ade00..9e0ed9ce621 100644
--- a/spec/controllers/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/omniauth_callbacks_controller_spec.rb
@@ -92,6 +92,32 @@ RSpec.describe OmniauthCallbacksController, type: :controller, feature_category:
     end
   end
 
+  shared_examples 'when user has dismissed broadcast messages' do
+    let_it_be(:message_banner) { create(:broadcast_message, broadcast_type: :banner) }
+    let_it_be(:message_notification) { create(:broadcast_message, broadcast_type: :notification) }
+    let_it_be(:other_message) { create(:broadcast_message, broadcast_type: :banner) }
+
+    before do
+      create(:broadcast_message_dismissal, broadcast_message: message_banner, user: user)
+      create(:broadcast_message_dismissal, broadcast_message: message_notification, user: user)
+      create(:broadcast_message_dismissal, broadcast_message: other_message)
+
+      sign_in user
+    end
+
+    it 'creates dismissed cookies based on db records' do
+      expect(cookies["hide_broadcast_message_#{message_banner.id}"]).to be_nil
+      expect(cookies["hide_broadcast_message_#{message_notification.id}"]).to be_nil
+      expect(cookies["hide_broadcast_message_#{other_message.id}"]).to be_nil
+
+      post_action
+
+      expect(cookies["hide_broadcast_message_#{message_banner.id}"]).to be(true)
+      expect(cookies["hide_broadcast_message_#{message_notification.id}"]).to be(true)
+      expect(cookies["hide_broadcast_message_#{other_message.id}"]).to be_nil
+    end
+  end
+
   describe 'omniauth', :with_current_organization do
     let(:user) { create(:omniauth_user, extern_uid: extern_uid, provider: provider) }
     let(:omniauth_email) { user.email }
@@ -127,6 +153,10 @@ RSpec.describe OmniauthCallbacksController, type: :controller, feature_category:
           sign_in user
         end
 
+        it_behaves_like 'when user has dismissed broadcast messages' do
+          let(:post_action) { post provider }
+        end
+
         it 'increments Prometheus counter' do
           expect { post(provider) }.to(
             change do
@@ -613,6 +643,10 @@ RSpec.describe OmniauthCallbacksController, type: :controller, feature_category:
 
     it_behaves_like 'omniauth sign in that remembers user with two factor disabled'
 
+    it_behaves_like 'when user has dismissed broadcast messages' do
+      let(:post_action) { post provider }
+    end
+
     it 'allows sign in' do
       post provider
 
@@ -654,6 +688,10 @@ RSpec.describe OmniauthCallbacksController, type: :controller, feature_category:
       let(:post_action) { post :saml, params: { SAMLResponse: mock_saml_response } }
     end
 
+    it_behaves_like 'when user has dismissed broadcast messages' do
+      let(:post_action) { post :saml, params: { SAMLResponse: mock_saml_response } }
+    end
+
     context 'for sign up', :with_current_organization do
       before do
         user.destroy!
diff --git a/spec/factories/merge_request_assignees.rb b/spec/factories/merge_request_assignees.rb
new file mode 100644
index 00000000000..daf4563fa6e
--- /dev/null
+++ b/spec/factories/merge_request_assignees.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :merge_request_assignee do
+    assignee { association(:user) }
+    merge_request { association(:merge_request) }
+  end
+end
diff --git a/spec/factories/packages/packages.rb b/spec/factories/packages/packages.rb
index 02eacba73fb..27bf1c87dd1 100644
--- a/spec/factories/packages/packages.rb
+++ b/spec/factories/packages/packages.rb
@@ -62,42 +62,6 @@ FactoryBot.define do
       end
     end
 
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    factory :nuget_package_legacy do
-      sequence(:name) { |n| "NugetPackage#{n}" }
-      sequence(:version) { |n| "1.0.#{n}" }
-      package_type { :nuget }
-
-      transient do
-        without_package_files { false }
-      end
-
-      after :create do |package, evaluator|
-        unless evaluator.without_package_files
-          create :package_file, :nuget, package: package, file_name: "#{package.name}.#{package.version}.nupkg"
-        end
-      end
-
-      trait(:with_metadatum) do
-        after :build do |pkg|
-          pkg.nuget_metadatum = build(:nuget_metadatum)
-        end
-      end
-
-      trait(:with_symbol_package) do
-        after :create do |package|
-          create :package_file, :snupkg, package: package, file_name: "#{package.name}.#{package.version}.snupkg"
-        end
-      end
-
-      trait :with_build do
-        after :create do |package|
-          create(:package_build_info, package: package)
-        end
-      end
-    end
-
     factory :ml_model_package, class: 'Packages::MlModel::Package' do
       sequence(:name) { |n| "mlmodel-package-#{n}" }
       sequence(:version) { |n| "1.0.#{n}" }
diff --git a/spec/features/broadcast_messages_spec.rb b/spec/features/broadcast_messages_spec.rb
index 807d8a85b61..c3fa4ce8467 100644
--- a/spec/features/broadcast_messages_spec.rb
+++ b/spec/features/broadcast_messages_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe 'Broadcast Messages', feature_category: :notifications do
 
   let_it_be(:user) { create(:user) }
   let(:path) { explore_projects_path }
+  let(:sign_in_user) { ->(user) { gitlab_sign_in(user) } }
 
   shared_examples 'a Broadcast Messages' do |type|
     it 'shows broadcast message' do
@@ -55,7 +56,7 @@ RSpec.describe 'Broadcast Messages', feature_category: :notifications do
     end
 
     it 'broadcast message is still hidden after logout and log back in', :js do
-      gitlab_sign_in(user)
+      sign_in_user.call(user)
 
       visit path
 
@@ -67,9 +68,9 @@ RSpec.describe 'Broadcast Messages', feature_category: :notifications do
 
       expect_message_dismissed
 
-      gitlab_sign_out
+      gitlab_sign_out(user)
 
-      gitlab_sign_in(user)
+      sign_in_user.call(user)
 
       visit path
 
@@ -170,6 +171,18 @@ RSpec.describe 'Broadcast Messages', feature_category: :notifications do
     end
   end
 
+  context 'with omniauth' do
+    it_behaves_like 'a dismissible Broadcast Messages' do
+      let_it_be(:broadcast_message) { create(:broadcast_message, :notification, message: 'SampleMessage') }
+      let_it_be(:user) { create(:omniauth_user, extern_uid: 'example-uid', provider: 'saml') }
+      let(:sign_in_user) { ->(user) { gitlab_sign_in_via('saml', user, 'example-uid') } }
+
+      before do
+        stub_omniauth_saml_config(enabled: true, auto_link_saml_user: true)
+      end
+    end
+  end
+
   def expect_broadcast_message(id, text)
     within(".js-broadcast-notification-#{id}") do
       expect(page).to have_content text
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb
index a0d461b3682..d7d78bb2c7e 100644
--- a/spec/features/signed_commits_spec.rb
+++ b/spec/features/signed_commits_spec.rb
@@ -164,40 +164,89 @@ RSpec.describe 'GPG signed commits', :js, feature_category: :source_code_managem
 
     # The below situation can occur when using the git mailmap feature.
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/425042.
-    context 'when user commit email is not verified and the commit is signed and verified' do
-      let(:commit) { project.commit('7b5160f9bb23a3d58a0accdbe89da13b96b1ece9') }
-
-      before do
-        create(:ssh_signature, user: user_1, commit_sha: commit.sha, project: project, verification_status: :verified)
-        allow(commit).to receive(:author_email).and_return('unverified@email.org')
-      end
-
-      it 'label is mapped verified' do
-        visit project_commit_path(project, commit.sha)
+    describe 'the effect of mailmapping' do
+      def expect_to_have_mapped_verified_label_content(ref, fingerprint_message)
+        visit project_commit_path(project, ref)
         wait_for_all_requests
 
         page.find('.gl-badge', text: 'Verified').click
 
         within '.popover' do
           expect(page).to have_content 'This commit was previously signed with a verified signature and verified committer email address. However the committer email address is no longer verified to the same user.'
-          expect(page).to have_content "SSH key fingerprint: #{commit.signature.key_fingerprint_sha256}"
+          expect(page).to have_content fingerprint_message
         end
       end
 
-      context 'when the check_for_mailmapped_commit_emails feature flag is disabled' do
-        before do
-          stub_feature_flags(check_for_mailmapped_commit_emails: false)
+      def expect_to_have_verified_label_content(ref, fingerprint_message)
+        visit project_commit_path(project, ref)
+        wait_for_all_requests
+
+        page.find('.gl-badge', text: 'Verified').click
+
+        within '.popover' do
+          expect(page).to have_content 'Verified commit This commit was signed with a verified signature and the committer email was verified to belong to the same user.'
+          expect(page).to have_content fingerprint_message
         end
+      end
 
-        it 'label is verified' do
-          visit project_commit_path(project, commit.sha)
-          wait_for_all_requests
+      context 'on SSH signed commits' do
+        let(:commit) { project.commit('7b5160f9bb23a3d58a0accdbe89da13b96b1ece9') }
 
-          page.find('.gl-badge', text: 'Verified').click
+        context 'when user commit email is not verified and the commit is signed and verified' do
+          let(:commit) { project.commit('7b5160f9bb23a3d58a0accdbe89da13b96b1ece9') }
+          let(:fingerprint) { commit.signature.key_fingerprint_sha256 }
 
-          within '.popover' do
-            expect(page).to have_content 'Verified commit This commit was signed with a verified signature and the committer email was verified to belong to the same user.'
-            expect(page).to have_content "SSH key fingerprint: #{commit.signature.key_fingerprint_sha256}"
+          before do
+            create(:ssh_signature, user: user_1, commit_sha: commit.sha, project: project, verification_status: :verified)
+            allow(commit).to receive(:author_email).and_return('unverified@email.org')
+          end
+
+          it 'label is mapped verified' do
+            expect_to_have_mapped_verified_label_content(commit.sha, "SSH key fingerprint: #{fingerprint}")
+          end
+
+          context 'when the check_for_mailmapped_commit_emails feature flag is disabled' do
+            before do
+              stub_feature_flags(check_for_mailmapped_commit_emails: false)
+            end
+
+            it 'label is verified' do
+              expect_to_have_verified_label_content(commit.sha, "SSH key fingerprint: #{fingerprint}")
+            end
+          end
+        end
+      end
+
+      context 'on GPG on signed commits' do
+        let(:commit) { project.commit(GpgHelpers::SIGNED_COMMIT_SHA) }
+
+        context 'when user commit email is not verified and the commit is signed and verified' do
+          let(:fingerprint) { GpgHelpers::User1.primary_keyid }
+
+          before do
+            create(
+              :gpg_signature,
+              commit_sha: commit.sha,
+              gpg_key: (create :gpg_key, user: user_1),
+              project: project,
+              verification_status: :verified
+            )
+
+            allow(commit).to receive(:author_email).and_return('unverified@email.org')
+          end
+
+          it 'label is mapped verified' do
+            expect_to_have_mapped_verified_label_content(commit.sha, "GPG Key ID: #{fingerprint}")
+          end
+
+          context 'when the check_for_mailmapped_commit_emails feature flag is disabled' do
+            before do
+              stub_feature_flags(check_for_mailmapped_commit_emails: false)
+            end
+
+            it 'label is verified' do
+              expect_to_have_verified_label_content(commit.sha, "GPG Key ID: #{fingerprint}")
+            end
           end
         end
       end
diff --git a/spec/finders/groups_finder_spec.rb b/spec/finders/groups_finder_spec.rb
index 44a0b1bbc0a..a0cde0440e3 100644
--- a/spec/finders/groups_finder_spec.rb
+++ b/spec/finders/groups_finder_spec.rb
@@ -301,6 +301,18 @@ RSpec.describe GroupsFinder, feature_category: :groups_and_projects do
       end
     end
 
+    context 'with group ids' do
+      let_it_be(:group_one) { create(:group, :public, name: 'group_one') }
+      let_it_be(:group_two) { create(:group, :public, name: 'group_two') }
+      let_it_be(:group_three) { create(:group, :public, name: 'group_three') }
+
+      subject { described_class.new(user, { ids: [group_one.id, group_three.id] }).execute }
+
+      it 'returns only the groups listed in the list of ids' do
+        is_expected.to contain_exactly(group_one, group_three)
+      end
+    end
+
     context 'with organization' do
       let_it_be(:organization_user) { create(:organization_user) }
       let_it_be(:organization) { organization_user.organization }
diff --git a/spec/finders/packages/nuget/package_finder_spec.rb b/spec/finders/packages/nuget/package_finder_spec.rb
index 381a21cd876..ec0a3949f27 100644
--- a/spec/finders/packages/nuget/package_finder_spec.rb
+++ b/spec/finders/packages/nuget/package_finder_spec.rb
@@ -17,17 +17,13 @@ RSpec.describe Packages::Nuget::PackageFinder, feature_category: :package_regist
   let(:package_version) { nil }
   let(:limit) { 50 }
   let(:client_version) { nil }
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # and use ::Packages::Nuget::Package instead
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  let(:packages_class) { package1.class }
 
   describe '#execute!' do
     subject { described_class.new(user, target, package_name: package_name, package_version: package_version, limit: limit, client_version: client_version).execute }
 
     shared_examples 'calling with_nuget_version_or_normalized_version scope' do |with_normalized:|
       it 'calls with_nuget_version_or_normalized_version scope with the correct arguments' do
-        expect(packages_class)
+        expect(::Packages::Nuget::Package)
           .to receive(:with_nuget_version_or_normalized_version)
           .with(package_version, with_normalized: with_normalized)
           .and_call_original
@@ -36,7 +32,7 @@ RSpec.describe Packages::Nuget::PackageFinder, feature_category: :package_regist
       end
     end
 
-    shared_examples 'handling all the conditions' do |factory: :nuget_package|
+    shared_examples 'handling all the conditions' do
       it { is_expected.to match_array([package1, package2]) }
 
       context 'with lower case package name' do
@@ -88,9 +84,9 @@ RSpec.describe Packages::Nuget::PackageFinder, feature_category: :package_regist
       end
 
       context 'with limit hit' do
-        let_it_be(:package4) { create(factory, name: package1.name, project: project) }
-        let_it_be(:package5) { create(factory, name: package1.name, project: project) }
-        let_it_be(:package6) { create(factory, name: package1.name, project: project) }
+        let_it_be(:package4) { create(:nuget_package, name: package1.name, project: project) }
+        let_it_be(:package5) { create(:nuget_package, name: package1.name, project: project) }
+        let_it_be(:package6) { create(:nuget_package, name: package1.name, project: project) }
 
         let(:limit) { 2 }
 
@@ -179,77 +175,5 @@ RSpec.describe Packages::Nuget::PackageFinder, feature_category: :package_regist
 
       it { is_expected.to match_array([package1, package2]) }
     end
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      let_it_be_with_refind(:package1) { create(:nuget_package_legacy, project: project, name: FFaker::Lorem.word) }
-
-      let_it_be(:package2) do
-        create(:nuget_package_legacy, :with_metadatum, name: package1.name, version: '2.0.0+ABC', project: project)
-      end
-
-      let_it_be(:package3) { create(:nuget_package_legacy, name: FFaker::Lorem.word, project: project) }
-      let_it_be(:other_package_1) { create(:nuget_package_legacy, name: package1.name, version: package1.version) }
-      let_it_be(:other_package_2) { create(:nuget_package_legacy, name: package1.name, version: package2.version) }
-
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      context 'with a project' do
-        let(:target) { project }
-
-        before do
-          project.add_developer(user)
-        end
-
-        it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-      end
-
-      context 'with a subgroup' do
-        let(:target) { subgroup }
-
-        before do
-          subgroup.add_developer(user)
-        end
-
-        it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-      end
-
-      context 'with a group' do
-        let(:target) { group }
-
-        before do
-          group.add_developer(user)
-        end
-
-        it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-      end
-
-      context 'with nil' do
-        let(:target) { nil }
-
-        it { is_expected.to be_empty }
-      end
-
-      context 'when package name is blank' do
-        let(:target) { project }
-        let(:package_name) { nil }
-
-        it { is_expected.to be_empty }
-      end
-
-      context 'with public package registry in private group' do
-        let(:target) { group }
-
-        before_all do
-          [subgroup, group, project].each do |entity|
-            entity.reload.update!(visibility_level: Gitlab::VisibilityLevel.const_get(:PRIVATE, false))
-          end
-          project.project_feature.update!(package_registry_access_level: ::ProjectFeature::PUBLIC)
-        end
-
-        it { is_expected.to match_array([package1, package2]) }
-      end
-    end
   end
 end
diff --git a/spec/frontend/profile/preferences/components/profile_preferences_spec.js b/spec/frontend/profile/preferences/components/profile_preferences_spec.js
index cd3ab06e4bc..d1ed427cf6c 100644
--- a/spec/frontend/profile/preferences/components/profile_preferences_spec.js
+++ b/spec/frontend/profile/preferences/components/profile_preferences_spec.js
@@ -4,6 +4,7 @@ import { nextTick } from 'vue';
 import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import { createAlert, VARIANT_DANGER } from '~/alert';
+import SettingsSection from '~/vue_shared/components/settings/settings_section.vue';
 import IntegrationView from '~/profile/preferences/components/integration_view.vue';
 import ProfilePreferences from '~/profile/preferences/components/profile_preferences.vue';
 import ExtensionsMarketplaceWarning from '~/profile/preferences/components/extensions_marketplace_warning.vue';
@@ -57,12 +58,15 @@ describe('ProfilePreferences component', () => {
         },
         propsData: props,
         attachTo,
+        stubs: {
+          SettingsSection,
+        },
       }),
     );
   }
 
   function findIntegrationsHeading() {
-    return wrapper.findByTestId('profile-preferences-integrations-heading');
+    return wrapper.findByTestId('settings-section-heading');
   }
 
   function findSubmitButton() {
diff --git a/spec/frontend/vue_shared/components/settings/settings_section_spec.js b/spec/frontend/vue_shared/components/settings/settings_section_spec.js
index d71659bca08..35d76e1cdd1 100644
--- a/spec/frontend/vue_shared/components/settings/settings_section_spec.js
+++ b/spec/frontend/vue_shared/components/settings/settings_section_spec.js
@@ -37,7 +37,7 @@ describe('Settings Block', () => {
     mountComponent();
 
     expect(findHeading().text()).toBe('Heading');
-    expect(findHeading().classes()).toEqual(['gl-heading-2', '!gl-mb-2']);
+    expect(findHeading().classes()).toEqual(['gl-heading-2', '!gl-mb-3']);
   });
 
   it('has a description slot', () => {
diff --git a/spec/graphql/resolvers/groups_resolver_spec.rb b/spec/graphql/resolvers/groups_resolver_spec.rb
index 6a317742349..c234572349c 100644
--- a/spec/graphql/resolvers/groups_resolver_spec.rb
+++ b/spec/graphql/resolvers/groups_resolver_spec.rb
@@ -40,5 +40,15 @@ RSpec.describe Resolvers::GroupsResolver, feature_category: :groups_and_projects
         expect(subject).to contain_exactly(other_group)
       end
     end
+
+    context 'with `ids` argument' do
+      let_it_be(:other_group) { create(:group, name: 'other-group') }
+
+      let(:params) { { ids: [other_group.to_global_id.to_s] } }
+
+      it 'filters groups by gid' do
+        expect(subject).to contain_exactly(other_group)
+      end
+    end
   end
 end
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index df8316ab0ae..1cc02fe5272 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -327,6 +327,7 @@ RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do
       allow(helper).to receive(:can?).with(current_user, :create_merge_request_in, project).and_return(true)
       allow(helper).to receive(:can?).with(current_user, :admin_merge_request, project).and_return(true)
       allow(helper).to receive(:can?).with(current_user, :create_merge_request_from, project).and_return(true)
+      allow(helper).to receive(:can?).with(current_user, :create_merge_request_in, project).and_return(true)
       allow(helper).to receive(:issuables_count_for_state).and_return(5)
       allow(helper).to receive(:url_for).and_return("/rss-url")
       allow(helper).to receive(:export_csv_project_merge_requests_path).and_return('/csv-url')
diff --git a/spec/lib/bulk_imports/pipeline/runner_spec.rb b/spec/lib/bulk_imports/pipeline/runner_spec.rb
index b61cbc568b2..37774a09d13 100644
--- a/spec/lib/bulk_imports/pipeline/runner_spec.rb
+++ b/spec/lib/bulk_imports/pipeline/runner_spec.rb
@@ -201,6 +201,7 @@ RSpec.describe BulkImports::Pipeline::Runner, feature_category: :importers do
         expect(subject).to receive(:on_finish)
         expect(context.bulk_import).to receive(:touch)
         expect(context.entity).to receive(:touch)
+        expect(subject).to receive(:delete_existing_records).once
 
         expect_next_instance_of(BulkImports::Logger) do |logger|
           expect(logger).to receive(:with_entity).with(context.entity).and_call_original
@@ -414,9 +415,7 @@ RSpec.describe BulkImports::Pipeline::Runner, feature_category: :importers do
 
     context 'when the entry is already processed' do
       before do
-        allow_next_instance_of(BulkImports::MyPipeline) do |klass|
-          allow(klass).to receive(:already_processed?).and_return true
-        end
+        allow(subject).to receive(:already_processed?).and_return(true)
       end
 
       it 'runs pipeline extractor, but not transformer or loader' do
@@ -427,15 +426,8 @@ RSpec.describe BulkImports::Pipeline::Runner, feature_category: :importers do
             .and_return(extracted_data)
         end
 
-        allow_next_instance_of(BulkImports::Transformer) do |transformer|
-          expect(transformer)
-            .not_to receive(:transform)
-        end
-
-        allow_next_instance_of(BulkImports::Loader) do |loader|
-          expect(loader)
-            .not_to receive(:load)
-        end
+        expect(BulkImports::Transformer).not_to receive(:new)
+        expect(BulkImports::Loader).not_to receive(:new)
 
         subject.run
       end
@@ -490,6 +482,21 @@ RSpec.describe BulkImports::Pipeline::Runner, feature_category: :importers do
       end
     end
 
+    describe 'delete partial imported records' do
+      it 'calls delete_existing_records method for the first non processed entry' do
+        allow_next_instance_of(BulkImports::Extractor) do |extractor|
+          allow(extractor).to receive(:extract).with(context)
+            .and_return(BulkImports::Pipeline::ExtractedData.new(data: [{ id: 1 }, { id: 2 }, { id: 3 }]))
+        end
+
+        allow(subject).to receive(:already_processed?).and_return(true, false, false)
+
+        expect(subject).to receive(:delete_existing_records).with({ id: 2 }).once
+
+        subject.run
+      end
+    end
+
     def log_params(context, extra = {})
       {
         bulk_import_id: context.bulk_import_id,
diff --git a/spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb
index 8feae640631..162f678c2dc 100644
--- a/spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb
+++ b/spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb
@@ -50,11 +50,11 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       allow(pipeline).to receive(:set_source_objects_counter)
       allow(context).to receive(:importer_user_mapping_enabled?).and_return(importer_user_mapping_enabled)
       allow(Import::PlaceholderReferences::PushService).to receive(:from_record).and_call_original
-
-      pipeline.run
     end
 
     it 'imports issue into destination project' do
+      pipeline.run
+
       expect(project.issues.count).to eq(1)
 
       imported_issue = project.issues.last
@@ -69,10 +69,25 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       end
     end
 
+    context 'when an issue with the same IID exists' do
+      let!(:existing_issue) { create(:issue, project: project, iid: issue['iid'], description: 'old description') }
+
+      it 'deletes the existing record and imports a new record' do
+        expect { pipeline.run }.to change { Issue.exists?(existing_issue.id) }.from(true).to(false)
+
+        new_record = project.issues.last
+        expect(project.issues.count).to eq(1)
+        expect(new_record.iid).to eq(issue['iid'])
+        expect(new_record.description).to eq(issue['description'])
+      end
+    end
+
     context 'zoom meetings' do
       let(:issue_attributes) { { 'zoom_meetings' => [{ 'url' => 'https://zoom.us/j/123456789' }] } }
 
       it 'restores zoom meetings' do
+        pipeline.run
+
         expect(project.issues.last.zoom_meetings.first.url).to eq('https://zoom.us/j/123456789')
       end
     end
@@ -81,6 +96,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       let(:issue_attributes) { { 'sentry_issue' => { 'sentry_issue_identifier' => '1234567891' } } }
 
       it 'restores sentry issue information' do
+        pipeline.run
+
         expect(project.issues.last.sentry_issue.sentry_issue_identifier).to eq(1234567891)
       end
     end
@@ -89,6 +106,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       let(:issue_attributes) { { 'award_emoji' => [{ 'name' => 'musical_keyboard', 'user_id' => 22 }] } }
 
       it 'has award emoji on an issue' do
+        pipeline.run
+
         award_emoji = project.issues.last.award_emoji.first
 
         expect(award_emoji.name).to eq('musical_keyboard')
@@ -100,6 +119,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       let(:issue_attributes) { { 'state' => 'closed' } }
 
       it 'restores issue state' do
+        pipeline.run
+
         expect(project.issues.last.state).to eq('closed')
       end
     end
@@ -115,6 +136,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       end
 
       it 'restores issue labels' do
+        pipeline.run
+
         expect(project.issues.last.labels.pluck(:title)).to contain_exactly('imported label 1', 'imported label 2')
       end
     end
@@ -123,6 +146,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       let(:issue_attributes) { { 'milestone' => { 'title' => 'imported milestone' } } }
 
       it 'restores issue milestone' do
+        pipeline.run
+
         expect(project.issues.last.milestone.title).to eq('imported milestone')
       end
     end
@@ -131,6 +156,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       let(:issue_attributes) { { 'timelogs' => [{ 'time_spent' => 72000, 'spent_at' => '2019-12-27T00:00:00.000Z', 'user_id' => 22 }] } }
 
       it 'restores issue timelogs' do
+        pipeline.run
+
         timelog = project.issues.last.timelogs.first
 
         aggregate_failures do
@@ -163,6 +190,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       end
 
       it 'restores issue notes and their award emoji' do
+        pipeline.run
+
         note = project.issues.last.notes.first
 
         aggregate_failures do
@@ -194,6 +223,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
         end
 
         it 'saves properly' do
+          pipeline.run
+
           issue = project.issues.last
           notes = issue.notes
 
@@ -210,6 +241,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       let(:issue_attributes) { { 'issue_assignees' => [{ 'user_id' => user.id }] } }
 
       it 'restores issue assignees' do
+        pipeline.run
+
         expect(project.issues.last.assignees).to contain_exactly(user)
       end
     end
@@ -254,6 +287,8 @@ RSpec.describe BulkImports::Projects::Pipelines::IssuesPipeline, feature_categor
       end
 
       it 'imports issues and maps user references to placeholder users', :aggregate_failures do
+        pipeline.run
+
         issue = project.issues.last
         event = issue.events.first
         note = issue.notes.first
diff --git a/spec/lib/bulk_imports/projects/pipelines/merge_requests_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/merge_requests_pipeline_spec.rb
index a6a1f923706..654ae9f6e05 100644
--- a/spec/lib/bulk_imports/projects/pipelines/merge_requests_pipeline_spec.rb
+++ b/spec/lib/bulk_imports/projects/pipelines/merge_requests_pipeline_spec.rb
@@ -107,11 +107,11 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
 
       allow(context).to receive(:importer_user_mapping_enabled?).and_return(importer_user_mapping_enabled)
       allow(Import::PlaceholderReferences::PushService).to receive(:from_record).and_call_original
-
-      pipeline.run
     end
 
     it 'imports a merge request' do
+      pipeline.run
+
       expect(project.merge_requests.count).to eq(1)
       expect(imported_mr.title).to eq(mr['title'])
       expect(imported_mr.description).to eq(mr['description'])
@@ -122,11 +122,28 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       expect(imported_mr.author).to eq(user)
     end
 
+    context 'when a merge_request with the same IID exists' do
+      let!(:existing_mr) do
+        create(:merge_request, target_project: project, source_project: project, iid: mr['iid'],
+          description: 'old description')
+      end
+
+      it 'deletes the existing record and imports the new record' do
+        expect { pipeline.run }.to change { MergeRequest.exists?(existing_mr.id) }.from(true).to(false)
+
+        expect(project.merge_requests.count).to eq(1)
+        expect(imported_mr.iid).to eq(mr['iid'])
+        expect(imported_mr.description).to eq(mr['description'])
+      end
+    end
+
     context 'merge request state' do
       context 'when mr is closed' do
         let(:attributes) { { 'state' => 'closed' } }
 
         it 'imported mr as closed' do
+          pipeline.run
+
           expect(imported_mr.state).to eq(attributes['state'])
         end
       end
@@ -135,6 +152,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
         let(:attributes) { { 'state' => 'merged' } }
 
         it 'imported mr as merged' do
+          pipeline.run
+
           expect(imported_mr.state).to eq(attributes['state'])
         end
       end
@@ -142,10 +161,14 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
 
     context 'source & target project' do
       it 'has the new project as target' do
+        pipeline.run
+
         expect(imported_mr.target_project).to eq(project)
       end
 
       it 'has the new project as source' do
+        pipeline.run
+
         expect(imported_mr.source_project).to eq(project)
       end
 
@@ -153,6 +176,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
         let(:attributes) { { 'source_project_id' => 4321 } }
 
         it 'has no source' do
+          pipeline.run
+
           expect(imported_mr.source_project).to be_nil
         end
 
@@ -160,6 +185,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
           let(:attributes) { { 'diff_head_sha' => 'HEAD', 'source_project_id' => 4321 } }
 
           it 'has the new project as source' do
+            pipeline.run
+
             expect(imported_mr.source_project).to eq(project)
           end
         end
@@ -170,6 +197,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       let(:attributes) { { 'resource_label_events' => [{ 'action' => 'add', 'user_id' => 1 }] } }
 
       it 'restores resource label events' do
+        pipeline.run
+
         expect(imported_mr.resource_label_events.first.action).to eq('add')
       end
     end
@@ -178,6 +207,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       let(:attributes) { { 'award_emoji' => [{ 'name' => 'tada', 'user_id' => 22 }] } }
 
       it 'has award emoji' do
+        pipeline.run
+
         expect(imported_mr.award_emoji.first.name).to eq(attributes['award_emoji'].first['name'])
       end
     end
@@ -202,6 +233,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       end
 
       it 'imports mr note' do
+        pipeline.run
+
         expect(note).to be_present
         expect(note.note).to include('By User 22')
         expect(note.note).to include(attributes['notes'].first['note'])
@@ -209,6 +242,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       end
 
       it 'has award emoji' do
+        pipeline.run
+
         emoji = note.award_emoji.first
 
         expect(emoji.name).to eq('clapper')
@@ -216,6 +251,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       end
 
       it 'does not import note_html' do
+        pipeline.run
+
         expect(note.note_html).to match(attributes['notes'].first['note'])
         expect(note.note_html).not_to match(attributes['notes'].first['note_html'])
       end
@@ -239,6 +276,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       end
 
       it 'restores system note metadata' do
+        pipeline.run
+
         note = imported_mr.notes.first
 
         expect(note.system).to eq(true)
@@ -250,25 +289,35 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
 
     context 'diffs' do
       it 'imports merge request diff' do
+        pipeline.run
+
         expect(imported_mr.merge_request_diff).to be_present
       end
 
       it 'enqueues AfterImportMergeRequestsWorker worker' do
+        pipeline.run
+
         expect(::Projects::ImportExport::AfterImportMergeRequestsWorker)
           .to have_received(:perform_async)
           .with(project.id)
       end
 
       it 'imports diff files' do
+        pipeline.run
+
         expect(imported_mr.merge_request_diff.merge_request_diff_files.count).to eq(1)
       end
 
       context 'diff commits' do
         it 'imports diff commits' do
+          pipeline.run
+
           expect(imported_mr.merge_request_diff.merge_request_diff_commits.count).to eq(1)
         end
 
         it 'assigns committer and author details to diff commits' do
+          pipeline.run
+
           commit = imported_mr.merge_request_diff.merge_request_diff_commits.first
 
           expect(commit.commit_author_id).not_to be_nil
@@ -276,6 +325,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
         end
 
         it 'assigns the correct commit users to diff commits' do
+          pipeline.run
+
           commit = MergeRequestDiffCommit.find_by(sha: 'COMMIT1')
 
           expect(commit.commit_author.name).to eq('Commit Author')
@@ -297,6 +348,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       end
 
       it 'imports labels' do
+        pipeline.run
+
         expect(imported_mr.labels.pluck(:title)).to contain_exactly('imported label 1', 'imported label 2')
       end
     end
@@ -305,6 +358,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       let(:attributes) { { 'milestone' => { 'title' => 'imported milestone' } } }
 
       it 'imports milestone' do
+        pipeline.run
+
         expect(imported_mr.milestone.title).to eq(attributes.dig('milestone', 'title'))
       end
     end
@@ -329,6 +384,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
         let(:key) { 'merge_request_assignees' }
 
         it 'imports mr assignees' do
+          pipeline.run
+
           assignees = imported_mr.merge_request_assignees
 
           expect(assignees.pluck(:user_id)).to contain_exactly(user.id, another_user.id)
@@ -339,6 +396,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
         let(:key) { 'approvals' }
 
         it 'imports mr approvals' do
+          pipeline.run
+
           approvals = imported_mr.approvals
 
           expect(approvals.pluck(:user_id)).to contain_exactly(user.id, another_user.id)
@@ -349,6 +408,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
         let(:key) { 'merge_request_reviewers' }
 
         it 'imports mr reviewers' do
+          pipeline.run
+
           reviewers = imported_mr.merge_request_reviewers
 
           expect(reviewers.pluck(:user_id)).to contain_exactly(user.id, another_user.id)
@@ -391,6 +452,8 @@ RSpec.describe BulkImports::Projects::Pipelines::MergeRequestsPipeline, feature_
       end
 
       it 'imports merge_requests and maps user references to placeholder users', :aggregate_failures do
+        pipeline.run
+
         merge_request = project.merge_requests.last
         approval = merge_request.approvals.first
         metrics = merge_request.metrics
diff --git a/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb
index 2b39c2e8104..ba119c0930d 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb
@@ -18,9 +18,8 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Command do
   describe '#dry_run?' do
     subject { command.dry_run? }
 
-    let(:command) { described_class.new(dry_run: dry_run, execution_policy_dry_run: execution_policy_dry_run) }
+    let(:command) { described_class.new(dry_run: dry_run) }
     let(:dry_run) { false }
-    let(:execution_policy_dry_run) { false }
 
     it { is_expected.to eq(false) }
 
@@ -29,12 +28,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Command do
 
       it { is_expected.to eq(true) }
     end
-
-    context 'when execution_policy_dry_run is true' do
-      let(:execution_policy_dry_run) { true }
-
-      it { is_expected.to eq(true) }
-    end
   end
 
   context 'handling of origin_ref' do
diff --git a/spec/lib/gitlab/ci/pipeline/chain/limit/rate_limit_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/limit/rate_limit_spec.rb
index 9976c8b6f02..3b98b1ec7a9 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/limit/rate_limit_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/limit/rate_limit_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::Limit::RateLimit, :freeze_time, :c
   let_it_be(:project, reload: true) { create(:project, namespace: namespace) }
 
   let(:save_incompleted) { false }
-  let(:execution_policy_dry_run) { nil }
   let(:throttle_message) do
     'Too many pipelines created in the last minute. Try again later.'
   end
@@ -17,8 +16,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::Limit::RateLimit, :freeze_time, :c
     Gitlab::Ci::Pipeline::Chain::Command.new(
       project: project,
       current_user: user,
-      save_incompleted: save_incompleted,
-      execution_policy_dry_run: execution_policy_dry_run
+      save_incompleted: save_incompleted
     )
   end
 
@@ -90,8 +88,10 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::Limit::RateLimit, :freeze_time, :c
       it_behaves_like 'excluded from rate limits'
     end
 
-    context 'with pipeline execution policy dry run', feature_category: :security_policy_management do
-      let(:execution_policy_dry_run) { true }
+    context 'with creating_policy_pipeline? is true', feature_category: :security_policy_management do
+      before do
+        allow(command).to receive_message_chain(:pipeline_policy_context, :creating_policy_pipeline?).and_return(true)
+      end
 
       it_behaves_like 'excluded from rate limits'
     end
diff --git a/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb
index c9686e371b9..48fdc7f6e49 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Skip, feature_category: :pipeline_co
 
   context 'when [ci skip] should be ignored' do
     let(:command) do
-      double('command', project: project, current_user: user, ignore_skip_ci: true, execution_policy_pipelines: nil)
+      double('command', project: project, current_user: user, ignore_skip_ci: true, pipeline_policy_context: nil)
     end
 
     it 'does not break the chain' do
@@ -71,7 +71,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Skip, feature_category: :pipeline_co
   context 'when pipeline should be skipped but not persisted' do
     let(:command) do
       double('command', project: project, current_user: user, ignore_skip_ci: false, save_incompleted: false,
-        execution_policy_pipelines: nil)
+        pipeline_policy_context: nil)
     end
 
     before do
diff --git a/spec/lib/gitlab/github_import/importer/events/merged_spec.rb b/spec/lib/gitlab/github_import/importer/events/merged_spec.rb
index 7a7a0fb3267..1e1b19c7fc3 100644
--- a/spec/lib/gitlab/github_import/importer/events/merged_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/events/merged_spec.rb
@@ -106,15 +106,6 @@ RSpec.describe Gitlab::GithubImport::Importer::Events::Merged, feature_category:
       )
     end
 
-    it 'creates a merged by note' do
-      expect { importer.execute(issue_event) }.to change { Note.count }.by(1)
-
-      last_note = merge_request.notes.last
-      expect(last_note.created_at).to eq(issue_event.created_at)
-      expect(last_note.author).to eq(merge_request.author)
-      expect(last_note.note).to eq("*Merged by: #{user.username} at #{issue_event.created_at}*")
-    end
-
     context 'when commit ID is present' do
       let!(:commit) { create(:commit, project: project) }
       let(:commit_id) { commit.id }
diff --git a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
index 572fca2bada..82c34d0cbc7 100644
--- a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
@@ -3,23 +3,49 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redis_shared_state, feature_category: :importers do
-  let(:project) { create(:project, :repository) }
-  let(:client) { double(:client) }
-  let(:user) { create(:user) }
-  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
-  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
-  let(:merged_at) { Time.new(2017, 1, 1, 12, 17) }
+  include Import::UserMappingHelper
+
+  let_it_be(:imported_from) { ::Import::HasImportSource::IMPORT_SOURCES[:github] }
+  let_it_be(:user_representation_1) { Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice') }
+  let_it_be(:user_representation_2) { Gitlab::GithubImport::Representation::User.new(id: 5, login: 'bob') }
+  let_it_be_with_reload(:project) do
+    create(:project, :repository, :with_import_url, :import_user_mapping_enabled, import_type: ::Import::SOURCE_GITHUB)
+  end
+
+  let_it_be(:source_user_1) do
+    create(
+      :import_source_user,
+      source_user_identifier: user_representation_1.id,
+      source_hostname: project.import_url,
+      import_type: ::Import::SOURCE_GITHUB,
+      namespace: project.root_ancestor
+    )
+  end
+
+  let_it_be(:source_user_2) do
+    create(
+      :import_source_user,
+      source_user_identifier: user_representation_2.id,
+      source_hostname: project.import_url,
+      import_type: ::Import::SOURCE_GITHUB,
+      namespace: project.root_ancestor
+    )
+  end
+
+  let_it_be(:client) { double(:client) }
+  let_it_be(:user) { create(:user) }
+
+  let(:created_at) { DateTime.strptime('2024-11-05T20:10:15Z') }
+  let(:updated_at) { DateTime.strptime('2024-11-06T20:10:15Z') }
+  let(:merged_at) { DateTime.strptime('2024-11-07T20:10:15Z') }
 
   let(:source_commit) { project.repository.commit('feature') }
   let(:target_commit) { project.repository.commit('master') }
   let(:milestone) { create(:milestone, project: project) }
   let(:description) { 'This is my pull request' }
   let(:state) { :closed }
-  let_it_be(:imported_from) { ::Import::HasImportSource::IMPORT_SOURCES[:github] }
 
   let(:pull_request) do
-    alice = Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice')
-
     Gitlab::GithubImport::Representation::PullRequest.new(
       iid: 42,
       title: 'My Pull Request',
@@ -30,11 +56,11 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
       target_branch_sha: target_commit.id,
       source_repository_id: 400,
       target_repository_id: 200,
-      source_repository_owner: 'alice',
+      source_repository_owner: user_representation_1.login,
       state: state,
       milestone_number: milestone.iid,
-      author: alice,
-      assignee: alice,
+      author: user_representation_1,
+      assignee: user_representation_2,
       created_at: created_at,
       updated_at: updated_at,
       merged_at: state == :closed && merged_at
@@ -44,29 +70,36 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
   let(:importer) { described_class.new(pull_request, project, client) }
 
   describe '#execute' do
-    let(:mr) { double(:merge_request, id: 10, merged?: false) }
+    it 'imports the pull request and assignees' do
+      expect(importer).to receive(:insert_git_data)
 
-    it 'imports the pull request' do
-      expect(importer)
-        .to receive(:create_merge_request)
-        .and_return([mr, false])
+      expect { importer.execute }.to change { MergeRequest.count }.by(1)
 
-      expect(importer)
-        .to receive(:set_merge_request_assignees)
-        .with(mr)
+      created_merge_request = MergeRequest.last
+      created_mr_assignees = created_merge_request.assignees
 
-      expect(importer)
-        .to receive(:insert_git_data)
-        .with(mr, false)
+      expect(created_merge_request.author_id).to eq(source_user_1.mapped_user_id)
+      expect(created_mr_assignees).to match_array([source_user_2.mapped_user])
 
-      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
-        .to receive(:cache_database_id)
-        .with(mr.id)
-
-      importer.execute
+      expect(created_merge_request).to have_attributes(
+        iid: pull_request.iid,
+        title: pull_request.truncated_title,
+        description: description,
+        source_project_id: project.id,
+        target_project_id: project.id,
+        source_branch: pull_request.formatted_source_branch,
+        target_branch: pull_request.target_branch,
+        state_id: MergeRequest.available_states[:merged],
+        milestone_id: milestone.id,
+        author_id: source_user_1.mapped_user_id,
+        created_at: created_at,
+        updated_at: updated_at,
+        imported_from: ::Import::SOURCE_GITHUB.to_s
+      )
     end
 
     it 'caches the created MR ID even if importer later fails' do
+      mr = create(:merge_request, :merged, author: user)
       error = StandardError.new('mocked error')
 
       allow_next_instance_of(described_class) do |importer|
@@ -86,6 +119,34 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
 
       expect { importer.execute }.to raise_error(error)
     end
+
+    it 'pushes placeholder references to the store' do
+      importer.execute
+
+      user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+      created_merge_request = MergeRequest.last
+      created_mr_assignee = created_merge_request.merge_request_assignees.first # we only import one PR assignee
+
+      expect(user_references).to match_array([
+        ['MergeRequest', created_merge_request.id, 'author_id', source_user_1.id],
+        ['MergeRequestAssignee', created_mr_assignee.id, 'user_id', source_user_2.id]
+      ])
+    end
+
+    context 'when user mapping is disabled' do
+      before do
+        project.build_or_assign_import_data(data: { user_contribution_mapping_enabled: false })
+        allow(importer.user_finder).to receive(:user_id_for).and_return(nil)
+      end
+
+      it 'does not push any placeholder references' do
+        importer.execute
+
+        user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+        expect(user_references).to be_empty
+      end
+    end
   end
 
   describe '#create_merge_request' do
@@ -96,69 +157,24 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
         .and_return(milestone.id)
     end
 
-    context 'when the author could be found' do
-      before do
-        allow(importer.user_finder)
-          .to receive(:author_id_for)
-          .with(pull_request)
-          .and_return([user.id, true])
-      end
+    it 'creates a merge request with placeholder author' do
+      expect { importer.create_merge_request }.to change { MergeRequest.count }.from(0).to(1)
 
-      it 'imports the pull request with the pull request author as the merge request author' do
-        expect(importer)
-          .to receive(:insert_and_return_id)
-          .with(
-            {
-              iid: 42,
-              title: 'My Pull Request',
-              description: 'This is my pull request',
-              source_project_id: project.id,
-              target_project_id: project.id,
-              source_branch: 'github/fork/alice/feature',
-              target_branch: 'master',
-              state_id: 3,
-              milestone_id: milestone.id,
-              author_id: user.id,
-              created_at: created_at,
-              updated_at: updated_at,
-              imported_from: imported_from
-            },
-            project.merge_requests
-          )
-          .and_call_original
+      created_merge_request = MergeRequest.last
 
-        importer.create_merge_request
-      end
+      expect(created_merge_request.author_id).to eq(source_user_1.mapped_user_id)
+    end
 
-      it 'returns the created merge request' do
-        mr, exists = importer.create_merge_request
-
-        expect(mr).to be_instance_of(MergeRequest)
-        expect(exists).to eq(false)
-      end
-
-      context 'when the description has user mentions' do
-        let(:description) { 'You can ask @knejad by emailing xyz@gitlab.com' }
-
-        it 'adds backticks to the username' do
-          expect(importer).to receive(:insert_and_return_id).with(
-            a_hash_including(description: "You can ask `@knejad` by emailing xyz@gitlab.com"),
-            project.merge_requests
-          ).and_call_original
-
-          importer.create_merge_request
-        end
-      end
-
-      context 'when the source and target branch are identical' do
+    context 'when user mapping is disabled' do
+      context 'when the author could be found' do
         before do
-          allow(pull_request).to receive_messages(
-            source_repository_id: pull_request.target_repository_id,
-            source_branch: 'master'
-          )
+          allow(importer.user_finder)
+            .to receive(:author_id_for)
+            .with(pull_request)
+            .and_return([user.id, true])
         end
 
-        it 'uses a generated source branch name for the merge request' do
+        it 'imports the pull request with the pull request author as the merge request author' do
           expect(importer)
             .to receive(:insert_and_return_id)
             .with(
@@ -168,7 +184,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
                 description: 'This is my pull request',
                 source_project_id: project.id,
                 target_project_id: project.id,
-                source_branch: 'master-42',
+                source_branch: 'github/fork/alice/feature',
                 target_branch: 'master',
                 state_id: 3,
                 milestone_id: milestone.id,
@@ -183,63 +199,118 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
 
           importer.create_merge_request
         end
+
+        it 'returns the created merge request' do
+          mr, exists = importer.create_merge_request
+
+          expect(mr).to be_instance_of(MergeRequest)
+          expect(exists).to eq(false)
+        end
+
+        context 'when the description has user mentions' do
+          let(:description) { 'You can ask @knejad by emailing xyz@gitlab.com' }
+
+          it 'adds backticks to the username' do
+            expect(importer).to receive(:insert_and_return_id).with(
+              a_hash_including(description: "You can ask `@knejad` by emailing xyz@gitlab.com"),
+              project.merge_requests
+            ).and_call_original
+
+            importer.create_merge_request
+          end
+        end
+
+        context 'when the source and target branch are identical' do
+          before do
+            allow(pull_request).to receive_messages(
+              source_repository_id: pull_request.target_repository_id,
+              source_branch: 'master'
+            )
+          end
+
+          it 'uses a generated source branch name for the merge request' do
+            expect(importer)
+              .to receive(:insert_and_return_id)
+              .with(
+                {
+                  iid: 42,
+                  title: 'My Pull Request',
+                  description: 'This is my pull request',
+                  source_project_id: project.id,
+                  target_project_id: project.id,
+                  source_branch: 'master-42',
+                  target_branch: 'master',
+                  state_id: 3,
+                  milestone_id: milestone.id,
+                  author_id: user.id,
+                  created_at: created_at,
+                  updated_at: updated_at,
+                  imported_from: imported_from
+                },
+                project.merge_requests
+              )
+              .and_call_original
+
+            importer.create_merge_request
+          end
+        end
+
+        context 'when the import fails due to a foreign key error' do
+          it 'does not raise any errors' do
+            expect(importer)
+              .to receive(:insert_and_return_id)
+              .and_raise(ActiveRecord::InvalidForeignKey, 'invalid foreign key')
+
+            expect { importer.create_merge_request }.not_to raise_error
+          end
+        end
+
+        context 'when the merge request already exists' do
+          it 'returns the existing merge request' do
+            mr1, exists1 = importer.create_merge_request
+            mr2, exists2 = importer.create_merge_request
+
+            expect(mr2).to eq(mr1)
+            expect(exists1).to eq(false)
+            expect(exists2).to eq(true)
+          end
+        end
       end
 
-      context 'when the import fails due to a foreign key error' do
-        it 'does not raise any errors' do
+      context 'when the author could not be found' do
+        before do
+          allow(importer.user_finder)
+            .to receive(:author_id_for)
+            .with(pull_request)
+            .and_return([project.creator_id, false])
+        end
+
+        it 'imports the pull request with the project creator as the merge request author' do
           expect(importer)
             .to receive(:insert_and_return_id)
-            .and_raise(ActiveRecord::InvalidForeignKey, 'invalid foreign key')
+            .with(
+              {
+                iid: 42,
+                title: 'My Pull Request',
+                description: "*Created by: alice*\n\nThis is my pull request",
+                source_project_id: project.id,
+                target_project_id: project.id,
+                source_branch: 'github/fork/alice/feature',
+                target_branch: 'master',
+                state_id: 3,
+                milestone_id: milestone.id,
+                author_id: project.creator_id,
+                created_at: created_at,
+                updated_at: updated_at,
+                imported_from: imported_from
+              },
+              project.merge_requests
+            )
+            .and_call_original
 
-          expect { importer.create_merge_request }.not_to raise_error
+          importer.create_merge_request
         end
       end
-
-      context 'when the merge request already exists' do
-        it 'returns the existing merge request' do
-          mr1, exists1 = importer.create_merge_request
-          mr2, exists2 = importer.create_merge_request
-
-          expect(mr2).to eq(mr1)
-          expect(exists1).to eq(false)
-          expect(exists2).to eq(true)
-        end
-      end
-    end
-
-    context 'when the author could not be found' do
-      before do
-        allow(importer.user_finder)
-          .to receive(:author_id_for)
-          .with(pull_request)
-          .and_return([project.creator_id, false])
-      end
-
-      it 'imports the pull request with the project creator as the merge request author' do
-        expect(importer)
-          .to receive(:insert_and_return_id)
-          .with(
-            {
-              iid: 42,
-              title: 'My Pull Request',
-              description: "*Created by: alice*\n\nThis is my pull request",
-              source_project_id: project.id,
-              target_project_id: project.id,
-              source_branch: 'github/fork/alice/feature',
-              target_branch: 'master',
-              state_id: 3,
-              milestone_id: milestone.id,
-              author_id: project.creator_id,
-              created_at: created_at,
-              updated_at: updated_at,
-              imported_from: imported_from
-            },
-            project.merge_requests
-          )
-          .and_call_original
-
-        importer.create_merge_request
-      end
     end
 
     context 'when merge request is invalid' do
@@ -307,6 +378,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitla
     end
 
     context 'when merge request is open' do
+      let(:project) { create(:project, :repository) }
       let(:state) { :opened }
 
       it 'creates the source branch' do
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb
index d0d74b8b33e..381bdcb119a 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests/merged_by_importer_spec.rb
@@ -3,9 +3,23 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::PullRequests::MergedByImporter, :clean_gitlab_redis_shared_state, feature_category: :importers do
-  let_it_be(:merge_request) { create(:merged_merge_request) }
+  include Import::UserMappingHelper
+
+  let_it_be(:project) do
+    create(:project, :with_import_url, :import_user_mapping_enabled, import_type: ::Import::SOURCE_GITHUB)
+  end
+
+  let_it_be(:merge_request) { create(:merged_merge_request, project: project) }
+  let_it_be(:merger_source_user) do
+    create(
+      :import_source_user,
+      source_user_identifier: 999,
+      source_hostname: project.import_url,
+      import_type: ::Import::SOURCE_GITHUB,
+      namespace: project.root_ancestor
+    )
+  end
 
-  let(:project) { merge_request.project }
   let(:merged_at) { Time.utc(2017, 1, 1, 12) }
   let(:client_double) do
     instance_double(Gitlab::GithubImport::Client, user: { id: 999, login: 'merger', email: 'merger@email.com' })
@@ -29,64 +43,93 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::MergedByImporter, :
     allow(client_double).to receive_message_chain(:octokit, :last_response, :headers).and_return({ etag: nil })
   end
 
-  shared_examples 'adds a note referencing the merger user' do
-    it 'adds a note referencing the merger user' do
+  describe '#execute', :aggregate_failures do
+    it 'upserts merge request metrics with merged_by details' do
       expect { subject.execute }
-        .to change { Note.count }.by(1)
+        .to not_change { Note.count }
         .and not_change(merge_request, :updated_at)
 
       metrics = merge_request.metrics.reload
-      expect(metrics.merged_by).to be_nil
+      expect(metrics.merged_by_id).to eq(merger_source_user.mapped_user_id)
       expect(metrics.merged_at).to eq(merged_at)
-
-      last_note = merge_request.notes.last
-      expect(last_note.created_at).to eq(merged_at)
-      expect(last_note.author).to eq(project.creator)
-      expect(last_note.note).to eq("*Merged by: merger at #{merged_at}*")
-      expect(last_note.imported_from).to eq('github')
     end
-  end
-
-  context 'when the merger user can be mapped' do
-    it 'assigns the merged by user when mapped' do
-      merge_user = create(:user, email: 'merger@email.com')
 
+    it 'pushes placeholder references to the store' do
       subject.execute
 
+      user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
       metrics = merge_request.metrics.reload
-      expect(metrics.merged_by).to eq(merge_user)
-      expect(metrics.merged_at).to eq(merged_at)
+
+      expect(user_references).to match_array([
+        ['MergeRequest::Metrics', metrics.id, 'merged_by_id', merger_source_user.id]
+      ])
     end
-  end
 
-  context 'when the merger user cannot be mapped to a gitlab user' do
-    it_behaves_like 'adds a note referencing the merger user'
-
-    context 'when original user cannot be found on github' do
+    context 'when user mapping is disabled' do
       before do
-        allow(client_double).to receive(:user).and_raise(Octokit::NotFound)
+        project.build_or_assign_import_data(data: { user_contribution_mapping_enabled: false })
       end
 
-      it_behaves_like 'adds a note referencing the merger user'
-    end
-  end
+      shared_examples 'adds a note referencing the merger user' do
+        it 'adds a note referencing the merger user' do
+          expect { subject.execute }
+            .to change { Note.count }.by(1)
+            .and not_change(merge_request, :updated_at)
 
-  context 'when the merger user is not provided' do
-    let(:merger_user) { nil }
+          metrics = merge_request.metrics.reload
+          expect(metrics.merged_by).to be_nil
+          expect(metrics.merged_at).to eq(merged_at)
 
-    it 'adds a note referencing the merger user' do
-      expect { subject.execute }
-        .to change { Note.count }.by(1)
-        .and not_change(merge_request, :updated_at)
+          last_note = merge_request.notes.last
+          expect(last_note.created_at).to eq(merged_at)
+          expect(last_note.author).to eq(project.creator)
+          expect(last_note.note).to eq("*Merged by: merger at #{merged_at}*")
+          expect(last_note.imported_from).to eq('github')
+        end
+      end
 
-      metrics = merge_request.metrics.reload
-      expect(metrics.merged_by).to be_nil
-      expect(metrics.merged_at).to eq(merged_at)
+      context 'when the merger user can be mapped' do
+        it 'assigns the merged by user when mapped' do
+          merge_user = create(:user, email: 'merger@email.com')
 
-      last_note = merge_request.notes.last
-      expect(last_note.created_at).to eq(merged_at)
-      expect(last_note.author).to eq(project.creator)
-      expect(last_note.note).to eq("*Merged by: ghost at #{merged_at}*")
+          subject.execute
+
+          metrics = merge_request.metrics.reload
+          expect(metrics.merged_by).to eq(merge_user)
+          expect(metrics.merged_at).to eq(merged_at)
+        end
+      end
+
+      context 'when the merger user cannot be mapped to a gitlab user' do
+        it_behaves_like 'adds a note referencing the merger user'
+
+        context 'when original user cannot be found on github' do
+          before do
+            allow(client_double).to receive(:user).and_raise(Octokit::NotFound)
+          end
+
+          it_behaves_like 'adds a note referencing the merger user'
+        end
+      end
+
+      context 'when the merger user is not provided' do
+        let(:merger_user) { nil }
+
+        it 'adds a note referencing the merger user' do
+          expect { subject.execute }
+            .to change { Note.count }.by(1)
+            .and not_change(merge_request, :updated_at)
+
+          metrics = merge_request.metrics.reload
+          expect(metrics.merged_by).to be_nil
+          expect(metrics.merged_at).to eq(merged_at)
+
+          last_note = merge_request.notes.last
+          expect(last_note.created_at).to eq(merged_at)
+          expect(last_note.author).to eq(project.creator)
+          expect(last_note.note).to eq("*Merged by: ghost at #{merged_at}*")
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests/review_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests/review_importer_spec.rb
index ffb14f06be4..c15b71fa5c7 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests/review_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests/review_importer_spec.rb
@@ -3,12 +3,26 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :clean_gitlab_redis_shared_state, feature_category: :importers do
+  include Import::UserMappingHelper
   using RSpec::Parameterized::TableSyntax
 
-  let_it_be(:merge_request) { create(:merge_request) }
+  let_it_be(:project) do
+    create(:project, :with_import_url, :import_user_mapping_enabled, import_type: ::Import::SOURCE_GITHUB)
+  end
 
-  let(:project) { merge_request.project }
+  let_it_be(:source_user) do
+    create(
+      :import_source_user,
+      source_user_identifier: 999,
+      source_hostname: project.import_url,
+      import_type: ::Import::SOURCE_GITHUB,
+      namespace: project.root_ancestor
+    )
+  end
+
+  let_it_be_with_reload(:merge_request) { create(:merge_request, source_project: project) }
   let(:submitted_at) { Time.new(2017, 1, 1, 12).utc }
+
   let(:client_double) do
     instance_double(
       'Gitlab::GithubImport::Client',
@@ -52,13 +66,12 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
 
     context 'when because of concurrency an attempt of duplication appeared' do
       before do
-        allow(MergeRequestReviewer)
-          .to receive(:create!).and_raise(ActiveRecord::RecordNotUnique)
+        create(:merge_request_reviewer, merge_request: merge_request, reviewer: author)
       end
 
       it 'does not change Merge Request reviewers', :aggregate_failures do
+        expect(MergeRequestReviewer).to receive(:create!).and_raise(ActiveRecord::RecordNotUnique)
         expect { subject.execute }.not_to change { MergeRequestReviewer.count }
-
         expect(merge_request.reviewers).to contain_exactly(author)
       end
     end
@@ -73,8 +86,8 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
     end
   end
 
-  context 'when the review author can be mapped to a gitlab user' do
-    let_it_be(:author) { create(:user, email: 'author@email.com') }
+  context 'when user mapping is enabled' do
+    let_it_be(:author) { source_user.mapped_user }
 
     context 'when the review has no note text' do
       context 'when the review is "APPROVED"' do
@@ -93,6 +106,22 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
           expect(last_note.system_note_metadata.action).to eq('approved')
         end
 
+        it 'pushes placeholder references for reviewer and system note' do
+          subject.execute
+
+          user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+          created_approval = merge_request.approvals.last
+          created_reviewer = merge_request.merge_request_reviewers.last
+          system_note = merge_request.notes.last
+
+          expect(user_references).to match_array([
+            ['Approval', created_approval.id, 'user_id', source_user.id],
+            ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id],
+            ['Note', system_note.id, 'author_id', source_user.id]
+          ])
+        end
+
         context 'when the user already approved the merge request' do
           before do
             create(:approval, merge_request: merge_request, user: author)
@@ -103,6 +132,18 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
               .to change { Note.count }.by(0)
               .and change { Approval.count }.by(0)
           end
+
+          it 'only pushes placeholder references for reviewer' do
+            subject.execute
+
+            user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+            created_reviewer = merge_request.merge_request_reviewers.last
+
+            expect(user_references).to match_array([
+              ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id]
+            ])
+          end
         end
       end
 
@@ -114,6 +155,18 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
         it 'does not create note for the review' do
           expect { subject.execute }.not_to change { Note.count }
         end
+
+        it 'only pushes placeholder references for reviewer' do
+          subject.execute
+
+          user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+          created_reviewer = merge_request.merge_request_reviewers.last
+
+          expect(user_references).to match_array([
+            ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id]
+          ])
+        end
       end
 
       context 'when the review is "CHANGES_REQUESTED"' do
@@ -124,6 +177,18 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
         it 'does not create a note for the review' do
           expect { subject.execute }.not_to change { Note.count }
         end
+
+        it 'only pushes placeholder references for reviewer' do
+          subject.execute
+
+          user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+          created_reviewer = merge_request.merge_request_reviewers.last
+
+          expect(user_references).to match_array([
+            ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id]
+          ])
+        end
       end
     end
 
@@ -148,6 +213,24 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
           expect(system_note.created_at).to eq(submitted_at)
           expect(system_note.system_note_metadata.action).to eq('approved')
         end
+
+        it 'pushes placeholder references for reviewer, system note, and reviewer note' do
+          subject.execute
+
+          user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+          created_approval = merge_request.approvals.last
+          created_reviewer = merge_request.merge_request_reviewers.last
+          system_note = merge_request.notes.where(system: true).last
+          note = merge_request.notes.where(system: false).last
+
+          expect(user_references).to match_array([
+            ['Approval', created_approval.id, 'user_id', source_user.id],
+            ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id],
+            ['Note', system_note.id, 'author_id', source_user.id],
+            ['Note', note.id, 'author_id', source_user.id]
+          ])
+        end
       end
 
       context 'when the review is "COMMENTED"' do
@@ -164,6 +247,20 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
           expect(last_note.author).to eq(author)
           expect(last_note.created_at).to eq(submitted_at)
         end
+
+        it 'pushes placeholder references for reviewer and reviewer note' do
+          subject.execute
+
+          user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+          created_reviewer = merge_request.merge_request_reviewers.last
+          note = merge_request.notes.last
+
+          expect(user_references).to match_array([
+            ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id],
+            ['Note', note.id, 'author_id', source_user.id]
+          ])
+        end
       end
 
       context 'when the review is "CHANGES_REQUESTED"' do
@@ -180,130 +277,265 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewImporter, :cl
           expect(last_note.author).to eq(author)
           expect(last_note.created_at).to eq(submitted_at)
         end
+
+        it 'pushes placeholder references for reviewer and reviewer note' do
+          subject.execute
+
+          user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+          created_reviewer = merge_request.merge_request_reviewers.last
+          note = merge_request.notes.last
+
+          expect(user_references).to match_array([
+            ['MergeRequestReviewer', created_reviewer.id, 'user_id', source_user.id],
+            ['Note', note.id, 'author_id', source_user.id]
+          ])
+        end
       end
     end
   end
 
-  context 'when the review author cannot be mapped to a gitlab user' do
-    context 'when the review has no note text' do
-      context 'when the review is "APPROVED"' do
-        let(:review) { create_review(type: 'APPROVED', note: '') }
+  context 'when user mapping is disabled' do
+    before_all do
+      project.build_or_assign_import_data(data: { user_contribution_mapping_enabled: false })
+    end
 
-        it 'creates a note for the review with *Approved by by<author>*' do
+    after(:all) do
+      project.build_or_assign_import_data(data: { user_contribution_mapping_enabled: true })
+    end
+
+    context 'when the review author can be mapped to a gitlab user' do
+      let_it_be(:author) { create(:user, email: 'author@email.com') }
+
+      context 'when the review has no note text' do
+        context 'when the review is "APPROVED"' do
+          let(:review) { create_review(type: 'APPROVED', note: '') }
+
+          it_behaves_like 'imports an approval for the Merge Request'
+          it_behaves_like 'imports a reviewer for the Merge Request'
+
+          it 'creates a note for the review' do
+            expect { subject.execute }.to change { Note.count }.by(1)
+
+            last_note = merge_request.notes.last
+            expect(last_note.note).to eq('approved this merge request')
+            expect(last_note.author).to eq(author)
+            expect(last_note.created_at).to eq(submitted_at)
+            expect(last_note.system_note_metadata.action).to eq('approved')
+          end
+
+          context 'when the user already approved the merge request' do
+            before do
+              create(:approval, merge_request: merge_request, user: author)
+            end
+
+            it 'does not import second approve and note' do
+              expect { subject.execute }
+                .to change { Note.count }.by(0)
+                .and change { Approval.count }.by(0)
+            end
+          end
+        end
+
+        context 'when the review is "COMMENTED"' do
+          let(:review) { create_review(type: 'COMMENTED', note: '') }
+
+          it_behaves_like 'imports a reviewer for the Merge Request'
+
+          it 'does not create note for the review' do
+            expect { subject.execute }.not_to change { Note.count }
+          end
+        end
+
+        context 'when the review is "CHANGES_REQUESTED"' do
+          let(:review) { create_review(type: 'CHANGES_REQUESTED', note: '') }
+
+          it_behaves_like 'imports a reviewer for the Merge Request'
+
+          it 'does not create a note for the review' do
+            expect { subject.execute }.not_to change { Note.count }
+          end
+        end
+      end
+
+      context 'when the review has a note text' do
+        context 'when the review is "APPROVED"' do
+          let(:review) { create_review(type: 'APPROVED') }
+
+          it_behaves_like 'imports an approval for the Merge Request'
+          it_behaves_like 'imports a reviewer for the Merge Request'
+
+          it 'creates a note for the review' do
+            expect { subject.execute }.to change { Note.count }.by(2)
+
+            note = merge_request.notes.where(system: false).last
+            expect(note.note).to eq("**Review:** Approved\n\nnote")
+            expect(note.author).to eq(author)
+            expect(note.created_at).to eq(submitted_at)
+
+            system_note = merge_request.notes.where(system: true).last
+            expect(system_note.note).to eq('approved this merge request')
+            expect(system_note.author).to eq(author)
+            expect(system_note.created_at).to eq(submitted_at)
+            expect(system_note.system_note_metadata.action).to eq('approved')
+          end
+        end
+
+        context 'when the review is "COMMENTED"' do
+          let(:review) { create_review(type: 'COMMENTED') }
+
+          it 'creates a note for the review' do
+            expect { subject.execute }
+              .to change { Note.count }.by(1)
+              .and not_change(Approval, :count)
+
+            last_note = merge_request.notes.last
+
+            expect(last_note.note).to eq("**Review:** Commented\n\nnote")
+            expect(last_note.author).to eq(author)
+            expect(last_note.created_at).to eq(submitted_at)
+          end
+        end
+
+        context 'when the review is "CHANGES_REQUESTED"' do
+          let(:review) { create_review(type: 'CHANGES_REQUESTED') }
+
+          it 'creates a note for the review' do
+            expect { subject.execute }
+              .to change { Note.count }.by(1)
+              .and not_change(Approval, :count)
+
+            last_note = merge_request.notes.last
+
+            expect(last_note.note).to eq("**Review:** Changes requested\n\nnote")
+            expect(last_note.author).to eq(author)
+            expect(last_note.created_at).to eq(submitted_at)
+          end
+        end
+      end
+    end
+
+    context 'when the review author cannot be mapped to a gitlab user' do
+      context 'when the review has no note text' do
+        context 'when the review is "APPROVED"' do
+          let(:review) { create_review(type: 'APPROVED', note: '') }
+
+          it 'creates a note for the review with *Approved by by<author>*' do
+            expect { subject.execute }
+              .to change { Note.count }.by(1)
+
+            last_note = merge_request.notes.last
+            expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Approved")
+            expect(last_note.author).to eq(project.creator)
+            expect(last_note.created_at).to eq(submitted_at)
+          end
+        end
+
+        context 'when the review is "COMMENTED"' do
+          let(:review) { create_review(type: 'COMMENTED', note: '') }
+
+          it 'creates a note for the review with *Commented by<author>*' do
+            expect { subject.execute }.not_to change { Note.count }
+          end
+        end
+
+        context 'when the review is "CHANGES_REQUESTED"' do
+          let(:review) { create_review(type: 'CHANGES_REQUESTED', note: '') }
+
+          it 'creates a note for the review with *Changes requested by <author>*' do
+            expect { subject.execute }.not_to change { Note.count }
+          end
+        end
+      end
+
+      context 'when original author was deleted in github' do
+        let(:review) { create_review(type: 'APPROVED', note: '', author: nil) }
+
+        it 'creates a note for the review without the author information' do
           expect { subject.execute }
             .to change { Note.count }.by(1)
 
           last_note = merge_request.notes.last
+          expect(last_note.note).to eq('**Review:** Approved')
+          expect(last_note.author).to eq(project.creator)
+          expect(last_note.created_at).to eq(submitted_at)
+        end
+      end
+
+      context 'when original author cannot be found on github' do
+        before do
+          allow(client_double).to receive(:user).and_raise(Octokit::NotFound)
+        end
+
+        let(:review) { create_review(type: 'APPROVED', note: '') }
+
+        it 'creates a note for the review with the author username' do
+          expect { subject.execute }
+            .to change { Note.count }.by(1)
+          last_note = merge_request.notes.last
           expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Approved")
           expect(last_note.author).to eq(project.creator)
           expect(last_note.created_at).to eq(submitted_at)
         end
       end
 
-      context 'when the review is "COMMENTED"' do
-        let(:review) { create_review(type: 'COMMENTED', note: '') }
+      context 'when the submitted_at is not provided' do
+        let(:review) { create_review(type: 'APPROVED', note: '', submitted_at: nil) }
 
-        it 'creates a note for the review with *Commented by<author>*' do
-          expect { subject.execute }.not_to change { Note.count }
-        end
-      end
-
-      context 'when the review is "CHANGES_REQUESTED"' do
-        let(:review) { create_review(type: 'CHANGES_REQUESTED', note: '') }
-
-        it 'creates a note for the review with *Changes requested by <author>*' do
-          expect { subject.execute }.not_to change { Note.count }
-        end
-      end
-    end
-
-    context 'when original author was deleted in github' do
-      let(:review) { create_review(type: 'APPROVED', note: '', author: nil) }
-
-      it 'creates a note for the review without the author information' do
-        expect { subject.execute }
-          .to change { Note.count }.by(1)
-
-        last_note = merge_request.notes.last
-        expect(last_note.note).to eq('**Review:** Approved')
-        expect(last_note.author).to eq(project.creator)
-        expect(last_note.created_at).to eq(submitted_at)
-      end
-    end
-
-    context 'when original author cannot be found on github' do
-      before do
-        allow(client_double).to receive(:user).and_raise(Octokit::NotFound)
-      end
-
-      let(:review) { create_review(type: 'APPROVED', note: '') }
-
-      it 'creates a note for the review with the author username' do
-        expect { subject.execute }
-          .to change { Note.count }.by(1)
-        last_note = merge_request.notes.last
-        expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Approved")
-        expect(last_note.author).to eq(project.creator)
-        expect(last_note.created_at).to eq(submitted_at)
-      end
-    end
-
-    context 'when the submitted_at is not provided' do
-      let(:review) { create_review(type: 'APPROVED', note: '', submitted_at: nil) }
-
-      it 'creates a note for the review without the author information' do
-        expect { subject.execute }.to change { Note.count }.by(1)
-
-        last_note = merge_request.notes.last
-
-        expect(last_note.created_at)
-          .to be_within(1.second).of(merge_request.updated_at)
-      end
-    end
-
-    context 'when the review has a note text' do
-      context 'when the review is "APPROVED"' do
-        let(:review) { create_review(type: 'APPROVED') }
-
-        it 'creates a note for the review with *Approved by by<author>*' do
-          expect { subject.execute }
-            .to change { Note.count }.by(1)
+        it 'creates a note for the review without the author information' do
+          expect { subject.execute }.to change { Note.count }.by(1)
 
           last_note = merge_request.notes.last
 
-          expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Approved\n\nnote")
-          expect(last_note.author).to eq(project.creator)
-          expect(last_note.created_at).to eq(submitted_at)
+          expect(last_note.created_at)
+            .to be_within(1.second).of(merge_request.updated_at)
         end
       end
 
-      context 'when the review is "COMMENTED"' do
-        let(:review) { create_review(type: 'COMMENTED') }
+      context 'when the review has a note text' do
+        context 'when the review is "APPROVED"' do
+          let(:review) { create_review(type: 'APPROVED') }
 
-        it 'creates a note for the review with *Commented by<author>*' do
-          expect { subject.execute }
-            .to change { Note.count }.by(1)
+          it 'creates a note for the review with *Approved by by<author>*' do
+            expect { subject.execute }
+              .to change { Note.count }.by(1)
 
-          last_note = merge_request.notes.last
+            last_note = merge_request.notes.last
 
-          expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Commented\n\nnote")
-          expect(last_note.author).to eq(project.creator)
-          expect(last_note.created_at).to eq(submitted_at)
+            expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Approved\n\nnote")
+            expect(last_note.author).to eq(project.creator)
+            expect(last_note.created_at).to eq(submitted_at)
+          end
         end
-      end
 
-      context 'when the review is "CHANGES_REQUESTED"' do
-        let(:review) { create_review(type: 'CHANGES_REQUESTED') }
+        context 'when the review is "COMMENTED"' do
+          let(:review) { create_review(type: 'COMMENTED') }
 
-        it 'creates a note for the review with *Changes requested by <author>*' do
-          expect { subject.execute }
-            .to change { Note.count }.by(1)
+          it 'creates a note for the review with *Commented by<author>*' do
+            expect { subject.execute }
+              .to change { Note.count }.by(1)
 
-          last_note = merge_request.notes.last
+            last_note = merge_request.notes.last
 
-          expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Changes requested\n\nnote")
-          expect(last_note.author).to eq(project.creator)
-          expect(last_note.created_at).to eq(submitted_at)
+            expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Commented\n\nnote")
+            expect(last_note.author).to eq(project.creator)
+            expect(last_note.created_at).to eq(submitted_at)
+          end
+        end
+
+        context 'when the review is "CHANGES_REQUESTED"' do
+          let(:review) { create_review(type: 'CHANGES_REQUESTED') }
+
+          it 'creates a note for the review with *Changes requested by <author>*' do
+            expect { subject.execute }
+              .to change { Note.count }.by(1)
+
+            last_note = merge_request.notes.last
+
+            expect(last_note.note).to eq("*Created by: author*\n\n**Review:** Changes requested\n\nnote")
+            expect(last_note.author).to eq(project.creator)
+            expect(last_note.created_at).to eq(submitted_at)
+          end
         end
       end
     end
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests/review_request_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests/review_request_importer_spec.rb
index b231d8eb6b5..595e7ea195c 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests/review_request_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests/review_request_importer_spec.rb
@@ -3,12 +3,22 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewRequestImporter, :clean_gitlab_redis_shared_state, feature_category: :importers do
-  subject(:importer) { described_class.new(review_request, project, client) }
+  include Import::UserMappingHelper
+
+  let_it_be(:project) { create(:project, :with_import_url, :import_user_mapping_enabled) }
+  let_it_be(:reviewer) { create(:user, username: 'alice') }
+  let_it_be(:source_user) do
+    create(
+      :import_source_user,
+      source_user_identifier: 1,
+      source_hostname: project.import_url,
+      import_type: ::Import::SOURCE_GITHUB,
+      namespace: project.root_ancestor
+    )
+  end
 
-  let_it_be(:project) { create(:project) }
   let(:client) { instance_double('Gitlab::GithubImport::Client') }
   let(:merge_request) { create(:merge_request) }
-  let(:reviewer) { create(:user, username: 'alice') }
   let(:review_request) do
     Gitlab::GithubImport::Representation::PullRequests::ReviewRequests.from_json_hash(
       merge_request_id: merge_request.id,
@@ -19,17 +29,54 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequests::ReviewRequestImport
     )
   end
 
-  before do
-    allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
-      allow(finder).to receive(:find).with(1, reviewer.username).and_return(reviewer.id)
-      allow(finder).to receive(:find).with(2, 'foo').and_return(nil)
+  subject(:importer) { described_class.new(review_request, project, client) }
+
+  it 'imports unique merge request reviewers as placeholders', :aggregate_failures do
+    expect { 2.times { importer.execute } }.not_to raise_error
+
+    reviewers = merge_request.reviewers
+
+    expect(reviewers.size).to eq(2)
+    expect(reviewers.all?(&:placeholder?)).to be(true)
+    expect(reviewers).to include(source_user.mapped_user)
+  end
+
+  it 'pushes placeholder references for unique merge request reviewers' do
+    expect { 2.times { importer.execute } }.not_to raise_error
+
+    user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+    # The existing placeholder will always have a lower id than the one created during import
+    # so we can assume the first reviewer is for source_user when sorted by user_id
+    created_reviewers = merge_request.merge_request_reviewers.sort_by(&:user_id)
+    new_source_user_id = Import::SourceUser.last.id
+
+    expect(user_references).to match_array([
+      ['MergeRequestReviewer', created_reviewers.first.id, 'user_id', source_user.id],
+      ['MergeRequestReviewer', created_reviewers.second.id, 'user_id', new_source_user_id]
+    ])
+  end
+
+  context 'when user contribution mapping is disabled' do
+    before do
+      project.build_or_assign_import_data(data: { user_contribution_mapping_enabled: false })
+      allow_next_instance_of(Gitlab::GithubImport::UserFinder) do |finder|
+        allow(finder).to receive(:find).with(1, reviewer.username).and_return(reviewer.id)
+        allow(finder).to receive(:find).with(2, 'foo').and_return(nil)
+      end
+    end
+
+    it 'imports unique merge request reviewers that were found' do
+      expect { 2.times { importer.execute } }.not_to raise_error
+
+      expect(merge_request.reviewers.size).to eq(1)
+      expect(merge_request.reviewers.first.id).to eq reviewer.id
+    end
+
+    it 'does not push any placeholder references' do
+      user_references = placeholder_user_references(::Import::SOURCE_GITHUB, project.import_state.id)
+
+      expect(user_references).to be_empty
     end
   end
-
-  it 'imports merge request reviewers that were found' do
-    importer.execute
-
-    expect(merge_request.reviewers.size).to eq 1
-    expect(merge_request.reviewers[0].id).to eq reviewer.id
-  end
 end
diff --git a/spec/lib/gitlab/github_import/representation/pull_requests/review_requests_spec.rb b/spec/lib/gitlab/github_import/representation/pull_requests/review_requests_spec.rb
index 0259fbedee3..1411b582ea7 100644
--- a/spec/lib/gitlab/github_import/representation/pull_requests/review_requests_spec.rb
+++ b/spec/lib/gitlab/github_import/representation/pull_requests/review_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::GithubImport::Representation::PullRequests::ReviewRequests do
+RSpec.describe Gitlab::GithubImport::Representation::PullRequests::ReviewRequests, feature_category: :importers do
   shared_examples 'Review requests' do
     it 'returns an instance of Review Request' do
       expect(review_requests).to be_an_instance_of(described_class)
diff --git a/spec/lib/gitlab/import/merge_request_helpers_spec.rb b/spec/lib/gitlab/import/merge_request_helpers_spec.rb
index 35a88dacfd7..d38eca9d52a 100644
--- a/spec/lib/gitlab/import/merge_request_helpers_spec.rb
+++ b/spec/lib/gitlab/import/merge_request_helpers_spec.rb
@@ -2,9 +2,10 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Import::MergeRequestHelpers, type: :helper do
+RSpec.describe Gitlab::Import::MergeRequestHelpers, type: :helper, feature_category: :importers do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
+  let_it_be(:merge_request) { create(:merge_request, source_project: project, iid: 999) }
 
   describe '.create_merge_request_without_hooks' do
     let(:iid) { 42 }
@@ -68,8 +69,6 @@ RSpec.describe Gitlab::Import::MergeRequestHelpers, type: :helper do
   end
 
   describe '.insert_merge_request_reviewers' do
-    let_it_be(:merge_request) { create(:merge_request) }
-
     subject { helper.insert_merge_request_reviewers(merge_request, reviewers) }
 
     context 'when reviewers are not present' do
@@ -88,4 +87,36 @@ RSpec.describe Gitlab::Import::MergeRequestHelpers, type: :helper do
       end
     end
   end
+
+  describe '.create_approval!', :aggregate_failures do
+    let(:submitted_at) { Time.utc(2023, 1, 1, 1) }
+
+    subject(:create_approval) { helper.create_approval!(project.id, merge_request.id, user.id, submitted_at) }
+
+    it 'creates an approval and system note and returns them' do
+      approval, note = create_approval
+
+      expect(approval).to be_a(Approval)
+      expect(approval).to have_attributes(
+        merge_request_id: merge_request.id,
+        user_id: user.id,
+        created_at: submitted_at,
+        updated_at: submitted_at
+      )
+
+      expect(note).to be_a(Note)
+      expect(note).to have_attributes(
+        importing: true,
+        noteable_id: merge_request.id,
+        noteable_type: 'MergeRequest',
+        project_id: project.id,
+        author_id: user.id,
+        note: 'approved this merge request',
+        system: true,
+        created_at: submitted_at,
+        updated_at: submitted_at
+      )
+      expect(note.system_note_metadata).to have_attributes(action: 'approved')
+    end
+  end
 end
diff --git a/spec/migrations/20241024062434_queue_create_missing_external_links_for_vulnerabilities_spec.rb b/spec/migrations/20241024062434_queue_create_missing_external_links_for_vulnerabilities_spec.rb
index 151b31b243c..00bb15bb4a2 100644
--- a/spec/migrations/20241024062434_queue_create_missing_external_links_for_vulnerabilities_spec.rb
+++ b/spec/migrations/20241024062434_queue_create_missing_external_links_for_vulnerabilities_spec.rb
@@ -6,20 +6,14 @@ require_migration!
 RSpec.describe QueueCreateMissingExternalLinksForVulnerabilities, feature_category: :vulnerability_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
-  it 'schedules a new batched migration' do
+  it 'does not schedule a new batched migration' do
     reversible_migration do |migration|
       migration.before -> {
         expect(batched_migration).not_to have_scheduled_batched_migration
       }
 
       migration.after -> {
-        expect(batched_migration).to have_scheduled_batched_migration(
-          table_name: :project_settings,
-          column_name: :project_id,
-          interval: described_class::DELAY_INTERVAL,
-          batch_size: described_class::BATCH_SIZE,
-          sub_batch_size: described_class::SUB_BATCH_SIZE
-        )
+        expect(batched_migration).not_to have_scheduled_batched_migration
       }
     end
   end
diff --git a/spec/models/commit_signatures/gpg_signature_spec.rb b/spec/models/commit_signatures/gpg_signature_spec.rb
index 41fc0bd7bc4..5f27212ac33 100644
--- a/spec/models/commit_signatures/gpg_signature_spec.rb
+++ b/spec/models/commit_signatures/gpg_signature_spec.rb
@@ -136,9 +136,27 @@ RSpec.describe CommitSignatures::GpgSignature do
       context 'when commit author does not match the gpg_key author' do
         let(:commit_author) { create(:user) }
 
-        it 'returns existing verification status' do
-          expect(signature.reverified_status).to eq('verified')
+        it 'returns unverified_author_email' do
+          expect(signature.reverified_status).to eq('unverified_author_email')
         end
+
+        context 'when check_for_mailmapped_commit_emails feature flag is disabled' do
+          before do
+            stub_feature_flags(check_for_mailmapped_commit_emails: false)
+          end
+
+          it 'verification status is unmodified' do
+            expect(signature.reverified_status).to eq('verified')
+          end
+        end
+      end
+    end
+
+    context 'when verification_status not verified' do
+      let(:verification_status) { :unverified }
+
+      it 'returns the signature verification status' do
+        expect(signature.reverified_status).to eq('unverified')
       end
     end
 
diff --git a/spec/models/packages/nuget/metadatum_spec.rb b/spec/models/packages/nuget/metadatum_spec.rb
index 0bf02ef19a3..2d69b555332 100644
--- a/spec/models/packages/nuget/metadatum_spec.rb
+++ b/spec/models/packages/nuget/metadatum_spec.rb
@@ -7,31 +7,10 @@ RSpec.describe Packages::Nuget::Metadatum, type: :model, feature_category: :pack
 
   describe 'relationships' do
     it { is_expected.to belong_to(:package).class_name('Packages::Nuget::Package').inverse_of(:nuget_metadatum) }
-
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it 'belongs to `legacy_package`' do
-      is_expected.to belong_to(:legacy_package).conditions(package_type: :nuget).class_name('Packages::Package')
-        .inverse_of(:nuget_metadatum).with_foreign_key(:package_id)
-    end
   end
 
   describe 'validations' do
     it { is_expected.to validate_presence_of(:package) }
-
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it { is_expected.not_to validate_presence_of(:legacy_package) }
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      it { is_expected.to validate_presence_of(:legacy_package) }
-      it { is_expected.not_to validate_presence_of(:package) }
-    end
-
     it { is_expected.to validate_presence_of(:authors) }
     it { is_expected.to validate_length_of(:authors).is_at_most(described_class::MAX_AUTHORS_LENGTH) }
     it { is_expected.to validate_presence_of(:description) }
@@ -70,37 +49,13 @@ RSpec.describe Packages::Nuget::Metadatum, type: :model, feature_category: :pack
           it 'raises the error' do
             expect { build(:nuget_metadatum, package: package) }.to raise_error(ActiveRecord::AssociationTypeMismatch)
           end
-
-          context 'when nuget_extract_nuget_package_model is disabled' do
-            before do
-              stub_feature_flags(nuget_extract_nuget_package_model: false)
-            end
-
-            it 'adds the validation error' do
-              nuget_metadatum = build(:nuget_metadatum, legacy_package: package, package: nil)
-
-              expect(nuget_metadatum).not_to be_valid
-              expect(nuget_metadatum.errors.to_a).to include('Package type must be NuGet')
-            end
-          end
         end
       end
     end
   end
 
   describe 'delegations' do
-    # TODO: Change `with_prefix(:package)` to `with_prefix` with the rollout of
-    # the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it { is_expected.to delegate_method(:version).to(:package).with_prefix(:package) }
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      it { is_expected.to delegate_method(:version).to(:legacy_package).with_prefix(:package) }
-    end
+    it { is_expected.to delegate_method(:version).to(:package).with_prefix }
   end
 
   describe '.normalized_version_in' do
diff --git a/spec/models/packages/nuget/symbol_spec.rb b/spec/models/packages/nuget/symbol_spec.rb
index 2b6b2bac4d9..7a39697735c 100644
--- a/spec/models/packages/nuget/symbol_spec.rb
+++ b/spec/models/packages/nuget/symbol_spec.rb
@@ -12,31 +12,10 @@ RSpec.describe Packages::Nuget::Symbol, type: :model, feature_category: :package
   describe 'relationships' do
     it { is_expected.to belong_to(:package).class_name('Packages::Nuget::Package').inverse_of(:nuget_symbols) }
     it { is_expected.to belong_to(:project) }
-
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it 'belongs legacy_package' do
-      is_expected.to belong_to(:legacy_package).conditions(package_type: :nuget).class_name('Packages::Package')
-        .inverse_of(:nuget_symbols).with_foreign_key(:package_id)
-    end
   end
 
   describe 'validations' do
     it { is_expected.to validate_presence_of(:package) }
-
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it { is_expected.not_to validate_presence_of(:legacy_package) }
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      it { is_expected.to validate_presence_of(:legacy_package) }
-      it { is_expected.not_to validate_presence_of(:package) }
-    end
-
     it { is_expected.to validate_presence_of(:file) }
     it { is_expected.to validate_presence_of(:file_path) }
     it { is_expected.to validate_presence_of(:signature) }
@@ -49,15 +28,6 @@ RSpec.describe Packages::Nuget::Symbol, type: :model, feature_category: :package
   describe 'delegations' do
     it { is_expected.to delegate_method(:project_id).to(:package) }
     it { is_expected.to delegate_method(:project).to(:package) }
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      it { is_expected.to delegate_method(:project_id).to(:legacy_package) }
-      it { is_expected.to delegate_method(:project).to(:legacy_package) }
-    end
   end
 
   describe 'scopes' do
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index 37102666906..0b487554908 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -17,17 +17,8 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
     it { is_expected.to have_many(:dependency_links).inverse_of(:package) }
     it { is_expected.to have_many(:tags).inverse_of(:package) }
     it { is_expected.to have_many(:build_infos).inverse_of(:package) }
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it { is_expected.to have_many(:installable_nuget_package_files).inverse_of(:package) }
     it { is_expected.to have_one(:maven_metadatum).inverse_of(:package) }
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it { is_expected.to have_one(:nuget_metadatum).inverse_of(:package) }
     it { is_expected.to have_one(:npm_metadatum).inverse_of(:package) }
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    it { is_expected.to have_many(:nuget_symbols).inverse_of(:package) }
   end
 
   describe '.sort_by_attribute' do
@@ -116,23 +107,6 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
       it { is_expected.to allow_value("my.app-11.07.2018").for(:name) }
       it { is_expected.not_to allow_value("my(dom$$$ain)com.my-app").for(:name) }
 
-      # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-      context 'nuget package' do
-        subject { build_stubbed(:nuget_package) }
-
-        it { is_expected.to allow_value('My.Package').for(:name) }
-        it { is_expected.to allow_value('My.Package.Mvc').for(:name) }
-        it { is_expected.to allow_value('MyPackage').for(:name) }
-        it { is_expected.to allow_value('My.23.Package').for(:name) }
-        it { is_expected.to allow_value('My23Package').for(:name) }
-        it { is_expected.to allow_value('runtime.my-test64.runtime.package.Mvc').for(:name) }
-        it { is_expected.to allow_value('my_package').for(:name) }
-        it { is_expected.not_to allow_value('My/package').for(:name) }
-        it { is_expected.not_to allow_value('../../../my_package').for(:name) }
-        it { is_expected.not_to allow_value('%2e%2e%2fmy_package').for(:name) }
-      end
-
       context 'npm package' do
         subject { build_stubbed(:npm_package) }
 
@@ -176,22 +150,6 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
       end
 
       it_behaves_like 'validating version to be SemVer compliant for', :npm_package
-
-      # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-      context 'nuget package' do
-        subject { build_stubbed(:nuget_package) }
-
-        it { is_expected.to allow_value('1.2').for(:version) }
-        it { is_expected.to allow_value('1.2.3').for(:version) }
-        it { is_expected.to allow_value('1.2.3.4').for(:version) }
-        it { is_expected.to allow_value('1.2.3-beta').for(:version) }
-        it { is_expected.to allow_value('1.2.3-alpha.3').for(:version) }
-        it { is_expected.not_to allow_value('1').for(:version) }
-        it { is_expected.not_to allow_value('1./2.3').for(:version) }
-        it { is_expected.not_to allow_value('../../../../../1.2.3').for(:version) }
-        it { is_expected.not_to allow_value('%2e%2e%2f1.2.3').for(:version) }
-      end
     end
 
     describe '#npm_package_already_taken' do
@@ -494,19 +452,6 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
     it { is_expected.to contain_exactly(package1) }
   end
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  describe '.without_nuget_temporary_name' do
-    let!(:package1) { create(:nuget_package) }
-    let!(:package2) { create(:nuget_package, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
-
-    subject { described_class.without_nuget_temporary_name }
-
-    it 'does not include nuget temporary packages' do
-      expect(subject).to eq([package1])
-    end
-  end
-
   describe '.limit_recent' do
     let!(:package1) { create(:nuget_package) }
     let!(:package2) { create(:nuget_package) }
@@ -587,29 +532,6 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
       it { is_expected.to match_array([nuget_package]) }
     end
 
-    # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-    describe '.with_nuget_version_or_normalized_version' do
-      let_it_be(:nuget_package) { create(:nuget_package, :with_metadatum, version: '1.0.7+r3456') }
-
-      before do
-        nuget_package.nuget_metadatum.update_column(:normalized_version, '1.0.7')
-      end
-
-      subject { described_class.with_nuget_version_or_normalized_version(version, with_normalized: with_normalized) }
-
-      where(:version, :with_normalized, :expected) do
-        '1.0.7'       | true  | [ref(:nuget_package)]
-        '1.0.7'       | false | []
-        '1.0.7+r3456' | true  | [ref(:nuget_package)]
-        '1.0.7+r3456' | false | [ref(:nuget_package)]
-      end
-
-      with_them do
-        it { is_expected.to match_array(expected) }
-      end
-    end
-
     context 'status scopes' do
       let_it_be(:default_package) { create(:maven_package, :default) }
       let_it_be(:hidden_package) { create(:maven_package, :hidden) }
@@ -984,21 +906,6 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
     end
   end
 
-  # TODO: Remove with the rollout of the FF nuget_extract_nuget_package_model
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/499602
-  describe '#normalized_nuget_version' do
-    let_it_be(:package) { create(:nuget_package, :with_metadatum, version: '1.0') }
-    let(:normalized_version) { '1.0.0' }
-
-    subject { package.normalized_nuget_version }
-
-    before do
-      package.nuget_metadatum.update_column(:normalized_version, normalized_version)
-    end
-
-    it { is_expected.to eq(normalized_version) }
-  end
-
   describe '#publish_creation_event' do
     let_it_be(:project) { create(:project) }
 
@@ -1049,19 +956,5 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis
         end
       end
     end
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      context 'for package format nuget' do
-        let(:format) { :nuget }
-
-        it 'maps to Packages::Package' do
-          is_expected.to eq(described_class)
-        end
-      end
-    end
   end
 end
diff --git a/spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb b/spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb
index c7bdff9dd61..249b0a97272 100644
--- a/spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb
+++ b/spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Packages::Nuget::PackagesMetadataPresenter, feature_category: :pa
   let_it_be(:project) { create(:project) }
   let_it_be(:packages) { create_list(:nuget_package, 5, :with_metadatum, name: 'Dummy.Package', project: project) }
 
-  let(:presenter) { described_class.new(project.packages) }
+  let(:presenter) { described_class.new(::Packages::Nuget::Package.for_projects(project)) }
 
   describe '#count' do
     subject { presenter.count }
@@ -30,11 +30,14 @@ RSpec.describe Packages::Nuget::PackagesMetadataPresenter, feature_category: :pa
     end
 
     it 'avoids N+1 database queries' do
-      control = ActiveRecord::QueryRecorder.new { described_class.new(project.packages).items }
+      control = ActiveRecord::QueryRecorder.new do
+        described_class.new(::Packages::Nuget::Package.for_projects(project)).items
+      end
 
       create(:nuget_package, :with_metadatum, name: 'Dummy.Package', project: project)
 
-      expect { described_class.new(project.packages).items }.not_to exceed_query_limit(control)
+      expect { described_class.new(::Packages::Nuget::Package.for_projects(project)).items }
+        .not_to exceed_query_limit(control)
     end
 
     it 'returns an array' do
diff --git a/spec/presenters/packages/nuget/search_results_presenter_spec.rb b/spec/presenters/packages/nuget/search_results_presenter_spec.rb
index f477a34e306..f4fa6979b63 100644
--- a/spec/presenters/packages/nuget/search_results_presenter_spec.rb
+++ b/spec/presenters/packages/nuget/search_results_presenter_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Packages::Nuget::SearchResultsPresenter, feature_category: :packa
 
   let(:package_ids) { [package_a, *packages_b, *packages_c].map(&:id) }
   let(:packages) do
-    ::Packages::Package.for_projects(project).order(Arel.sql("POSITION(id::text IN '#{package_ids.join(',')}')"))
+    ::Packages::Nuget::Package.for_projects(project).order(Arel.sql("POSITION(id::text IN '#{package_ids.join(',')}')"))
   end
 
   let(:search_results) do
diff --git a/spec/services/packages/nuget/search_service_spec.rb b/spec/services/packages/nuget/search_service_spec.rb
index 097e89e65c0..d0ab686917e 100644
--- a/spec/services/packages/nuget/search_service_spec.rb
+++ b/spec/services/packages/nuget/search_service_spec.rb
@@ -7,6 +7,12 @@ RSpec.describe Packages::Nuget::SearchService, feature_category: :package_regist
   let_it_be(:group) { create(:group) }
   let_it_be(:subgroup) { create(:group, parent: group) }
   let_it_be(:project) { create(:project, namespace: subgroup) }
+  let_it_be_with_refind(:package_a) { create(:nuget_package, project: project, name: 'DummyPackageA') }
+  let_it_be(:packages_b) { create_list(:nuget_package, 5, project: project, name: 'DummyPackageB') }
+  let_it_be(:packages_c) { create_list(:nuget_package, 5, project: project, name: 'DummyPackageC') }
+  let_it_be(:package_d) { create(:nuget_package, project: project, name: 'FooBarD') }
+  let_it_be(:other_package_a) { create(:nuget_package, name: 'DummyPackageA') }
+  let_it_be(:other_package_b) { create(:nuget_package, name: 'DummyPackageB') }
 
   let(:search_term) { 'ummy' }
   let(:per_page) { 5 }
@@ -121,123 +127,52 @@ RSpec.describe Packages::Nuget::SearchService, feature_category: :package_regist
       end
     end
 
-    context 'when nuget_extract_nuget_package_model is enabled' do
-      let_it_be_with_refind(:package_a) { create(:nuget_package, project: project, name: 'DummyPackageA') }
-      let_it_be(:packages_b) { create_list(:nuget_package, 5, project: project, name: 'DummyPackageB') }
-      let_it_be(:packages_c) { create_list(:nuget_package, 5, project: project, name: 'DummyPackageC') }
-      let_it_be(:package_d) { create(:nuget_package, project: project, name: 'FooBarD') }
-      let_it_be(:other_package_a) { create(:nuget_package, name: 'DummyPackageA') }
-      let_it_be(:other_package_b) { create(:nuget_package, name: 'DummyPackageB') }
+    context 'with project' do
+      let(:target) { project }
 
-      context 'with project' do
-        let(:target) { project }
+      before_all do
+        project.add_developer(user)
+      end
 
+      it_behaves_like 'handling all the conditions'
+    end
+
+    context 'with subgroup' do
+      let(:target) { subgroup }
+
+      before_all do
+        subgroup.add_developer(user)
+      end
+
+      it_behaves_like 'handling all the conditions'
+    end
+
+    context 'with group' do
+      let(:target) { group }
+
+      context 'when user is a group member' do
         before_all do
-          project.add_developer(user)
+          group.add_developer(user)
         end
 
         it_behaves_like 'handling all the conditions'
       end
 
-      context 'with subgroup' do
-        let(:target) { subgroup }
-
-        before_all do
-          subgroup.add_developer(user)
-        end
-
-        it_behaves_like 'handling all the conditions'
-      end
-
-      context 'with group' do
-        let(:target) { group }
-
-        context 'when user is a group member' do
+      context 'when user is not a group member' do
+        context 'with public registry in private group' do
           before_all do
-            group.add_developer(user)
+            [subgroup, group, project].each do |entity|
+              entity.reload.update_column(:visibility_level, Gitlab::VisibilityLevel.const_get(:PRIVATE, false))
+            end
+            project.project_feature.update!(package_registry_access_level: ::ProjectFeature::PUBLIC)
+          end
+
+          before do
+            stub_application_setting(package_registry_allow_anyone_to_pull_option: true)
           end
 
           it_behaves_like 'handling all the conditions'
         end
-
-        context 'when user is not a group member' do
-          context 'with public registry in private group' do
-            before_all do
-              [subgroup, group, project].each do |entity|
-                entity.reload.update_column(:visibility_level, Gitlab::VisibilityLevel.const_get(:PRIVATE, false))
-              end
-              project.project_feature.update!(package_registry_access_level: ::ProjectFeature::PUBLIC)
-            end
-
-            before do
-              stub_application_setting(package_registry_allow_anyone_to_pull_option: true)
-            end
-
-            it_behaves_like 'handling all the conditions'
-          end
-        end
-      end
-    end
-
-    context 'when nuget_extract_nuget_package_model is disabled' do
-      let_it_be_with_refind(:package_a) { create(:nuget_package_legacy, project: project, name: 'DummyPackageA') }
-      let_it_be(:packages_b) { create_list(:nuget_package_legacy, 5, project: project, name: 'DummyPackageB') }
-      let_it_be(:packages_c) { create_list(:nuget_package_legacy, 5, project: project, name: 'DummyPackageC') }
-      let_it_be(:package_d) { create(:nuget_package_legacy, project: project, name: 'FooBarD') }
-      let_it_be(:other_package_a) { create(:nuget_package_legacy, name: 'DummyPackageA') }
-      let_it_be(:other_package_b) { create(:nuget_package_legacy, name: 'DummyPackageB') }
-
-      before do
-        stub_feature_flags(nuget_extract_nuget_package_model: false)
-      end
-
-      context 'with project' do
-        let(:target) { project }
-
-        before_all do
-          project.add_developer(user)
-        end
-
-        it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-      end
-
-      context 'with subgroup' do
-        let(:target) { subgroup }
-
-        before_all do
-          subgroup.add_developer(user)
-        end
-
-        it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-      end
-
-      context 'with group' do
-        let(:target) { group }
-
-        context 'when user is a group member' do
-          before_all do
-            group.add_developer(user)
-          end
-
-          it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-        end
-
-        context 'when user is not a group member' do
-          context 'with public registry in private group' do
-            before_all do
-              [subgroup, group, project].each do |entity|
-                entity.reload.update_column(:visibility_level, Gitlab::VisibilityLevel.const_get(:PRIVATE, false))
-              end
-              project.project_feature.update!(package_registry_access_level: ::ProjectFeature::PUBLIC)
-            end
-
-            before do
-              stub_application_setting(package_registry_allow_anyone_to_pull_option: true)
-            end
-
-            it_behaves_like 'handling all the conditions', factory: :nuget_package_legacy
-          end
-        end
       end
     end
 
diff --git a/spec/services/packages/nuget/symbols/create_symbol_files_service_spec.rb b/spec/services/packages/nuget/symbols/create_symbol_files_service_spec.rb
index 55b08761c27..9707386ec21 100644
--- a/spec/services/packages/nuget/symbols/create_symbol_files_service_spec.rb
+++ b/spec/services/packages/nuget/symbols/create_symbol_files_service_spec.rb
@@ -37,24 +37,6 @@ RSpec.describe Packages::Nuget::Symbols::CreateSymbolFilesService, feature_categ
         expect { subject }.to change { package.nuget_symbols.count }.by(1)
         expect(package.nuget_symbols.last.project_id).to eq(package.project_id)
       end
-
-      context 'when nuget_extract_nuget_package_model is disabled' do
-        let_it_be(:package) { create(:nuget_package_legacy) }
-
-        before do
-          stub_feature_flags(nuget_extract_nuget_package_model: false)
-        end
-
-        it 'creates a symbol record and extracts the signature', :aggregate_failures do
-          expect_next_instance_of(Packages::Nuget::Symbols::ExtractSignatureAndChecksumService,
-            instance_of(File)) do |service|
-            expect(service).to receive(:execute).and_call_original
-          end
-
-          expect { subject }.to change { package.nuget_symbols.count }.by(1)
-          expect(package.nuget_symbols.last.project_id).to eq(package.project_id)
-        end
-      end
     end
 
     context 'when symbol files hit the limit' do
diff --git a/spec/support/helpers/login_helpers.rb b/spec/support/helpers/login_helpers.rb
index 10020e8dc7a..600b652acf4 100644
--- a/spec/support/helpers/login_helpers.rb
+++ b/spec/support/helpers/login_helpers.rb
@@ -62,9 +62,9 @@ module LoginHelpers
   end
 
   # Requires Javascript driver.
-  def gitlab_sign_out
+  def gitlab_sign_out(user = @current_user)
     if has_testid?('super-sidebar')
-      click_on "#{@current_user.name} user’s menu"
+      click_on "#{user.name} user’s menu"
     else
       # This can be removed once https://gitlab.com/gitlab-org/gitlab/-/issues/420121 is complete.
       find(".header-user-dropdown-toggle").click
diff --git a/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
index 33e14783db0..26a3161c786 100644
--- a/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
@@ -299,95 +299,79 @@ RSpec.shared_examples 'handling audit request' do |path:, scope: :project|
     end
   end
 
-  shared_examples 'handling all conditions' do
+  context 'authentication' do
     include_context 'dependency proxy helpers context'
 
-    where(:auth, :request_forward, :visibility, :user_role, :expected_result, :expected_status) do
-      nil                    | true  | :public   | nil        | :reject     | :unauthorized
-      nil                    | false | :public   | nil        | :reject     | :unauthorized
-      nil                    | true  | :private  | nil        | :reject     | :unauthorized
-      nil                    | false | :private  | nil        | :reject     | :unauthorized
-      nil                    | true  | :internal | nil        | :reject     | :unauthorized
-      nil                    | false | :internal | nil        | :reject     | :unauthorized
+    context 'when unauthenticated' do
+      let(:auth) { nil }
+      let(:headers) { {} }
 
-      :oauth                 | true  | :public   | :guest     | :redirect   | :temporary_redirect
-      :oauth                 | true  | :public   | :reporter  | :redirect   | :temporary_redirect
-      :oauth                 | false | :public   | :guest     | :accept     | :ok
-      :oauth                 | false | :public   | :reporter  | :accept     | :ok
-      :oauth                 | true  | :private  | :reporter  | :redirect   | :temporary_redirect
-      :oauth                 | false | :private  | :guest     | :reject     | :forbidden
-      :oauth                 | false | :private  | :reporter  | :accept     | :ok
-      :oauth                 | true  | :private  | :guest     | :redirect   | :temporary_redirect
-      :oauth                 | true  | :internal | :guest     | :redirect   | :temporary_redirect
-      :oauth                 | true  | :internal | :reporter  | :redirect   | :temporary_redirect
-      :oauth                 | false | :internal | :guest     | :accept     | :ok
-      :oauth                 | false | :internal | :reporter  | :accept     | :ok
-
-      :personal_access_token | true  | :public   | :guest     | :redirect   | :temporary_redirect
-      :personal_access_token | true  | :public   | :reporter  | :redirect   | :temporary_redirect
-      :personal_access_token | false | :public   | :guest     | :accept     | :ok
-      :personal_access_token | false | :public   | :reporter  | :accept     | :ok
-      :personal_access_token | true  | :private  | :guest     | :redirect   | :temporary_redirect
-      :personal_access_token | true  | :private  | :reporter  | :redirect   | :temporary_redirect
-      :personal_access_token | false | :private  | :guest     | :reject     | :forbidden # instance might fail
-      :personal_access_token | false | :private  | :reporter  | :accept     | :ok
-      :personal_access_token | true  | :internal | :guest     | :redirect   | :temporary_redirect
-      :personal_access_token | true  | :internal | :reporter  | :redirect   | :temporary_redirect
-      :personal_access_token | false | :internal | :guest     | :accept     | :ok
-      :personal_access_token | false | :internal | :reporter  | :accept     | :ok
-
-      :job_token             | true  | :public   | :developer | :redirect   | :temporary_redirect
-      :job_token             | false | :public   | :developer | :accept     | :ok
-      :job_token             | true  | :private  | :developer | :redirect   | :temporary_redirect
-      :job_token             | false | :private  | :developer | :accept     | :ok
-      :job_token             | true  | :internal | :developer | :redirect   | :temporary_redirect
-      :job_token             | false | :internal | :developer | :accept     | :ok
-
-      :deploy_token          | true  | :public   | nil        | :redirect   | :temporary_redirect
-      :deploy_token          | false | :public   | nil        | :accept     | :ok
-      :deploy_token          | true  | :private  | nil        | :redirect   | :temporary_redirect
-      :deploy_token          | false | :private  | nil        | :accept     | :ok
-      :deploy_token          | true  | :internal | nil        | :redirect   | :temporary_redirect
-      :deploy_token          | false | :internal | nil        | :accept     | :ok
+      it_behaves_like 'reject audit request', status: :unauthorized
     end
 
-    with_them do
-      let(:headers) do
-        build_headers_for_auth_type(auth)
+    context 'when authenticated' do
+      let(:headers) { build_headers_for_auth_type(auth) }
+
+      context 'with request_forward enabled' do
+        let(:auth) { :oauth }
+
+        before do
+          set_npm_package_requests_forwarding(true, scope)
+        end
+
+        it_behaves_like 'redirect audit request', status: :temporary_redirect
       end
 
-      before do
-        project.send("add_#{user_role}", user) if user_role
-        project.update!(visibility: visibility.to_s)
+      context 'with request_forward disabled' do
+        before do
+          set_npm_package_requests_forwarding(false, scope)
+        end
 
-        if %i[instance group].include?(scope)
-          allow_fetch_application_setting(attribute: "npm_package_requests_forwarding", return_value: request_forward)
-        else
-          allow_fetch_cascade_application_setting(attribute: "npm_package_requests_forwarding", return_value: request_forward)
+        context 'with project scope', if: scope == :project do
+          before do
+            project.update!(visibility: 'private')
+          end
+
+          context 'with guest user' do
+            let(:auth) { :oauth }
+
+            before do
+              project.add_guest(user)
+            end
+
+            it_behaves_like 'reject audit request', status: :forbidden
+          end
+
+          %i[oauth personal_access_token job_token deploy_token].each do |auth|
+            context "with #{auth}" do
+              let(:auth) { auth }
+
+              before do
+                project.add_reporter(user)
+              end
+
+              it_behaves_like 'accept audit request', status: :ok
+            end
+          end
+        end
+
+        context 'with group or instance scope', if: %i[group instance].include?(scope) do
+          %i[oauth personal_access_token job_token deploy_token].each do |auth|
+            context "with #{auth}" do
+              let(:auth) { auth }
+
+              before do
+                project.add_reporter(user)
+              end
+
+              it_behaves_like 'reject audit request with error', status: :not_found
+            end
+          end
         end
       end
-
-      example_name = "#{params[:expected_result]} audit request"
-      status = params[:expected_status]
-
-      if %i[instance group].include?(scope) && params[:expected_status] != :unauthorized
-        if params[:request_forward]
-          example_name = 'redirect audit request'
-          status = :temporary_redirect
-        else
-          example_name = 'reject audit request with error'
-          status = :not_found
-        end
-      end
-
-      it_behaves_like example_name, status: status
     end
   end
 
-  context 'with a group namespace' do
-    it_behaves_like 'handling all conditions'
-  end
-
   context 'with a developer' do
     let(:headers) { build_token_auth_header(personal_access_token.token) }
 
@@ -395,7 +379,7 @@ RSpec.shared_examples 'handling audit request' do |path:, scope: :project|
       project.add_developer(user)
     end
 
-    context 'with a job token' do
+    context 'with a job token for a completed job' do
       let(:headers) { build_token_auth_header(job.token) }
 
       before do