diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml
index 3d996595e11..5b75fcfca33 100644
--- a/.rubocop_todo/gitlab/bounded_contexts.yml
+++ b/.rubocop_todo/gitlab/bounded_contexts.yml
@@ -1703,6 +1703,7 @@ Gitlab/BoundedContexts:
     - 'app/services/bulk_imports/repository_bundle_export_service.rb'
     - 'app/services/bulk_imports/tree_export_service.rb'
     - 'app/services/bulk_imports/uploads_export_service.rb'
+    - 'app/services/bulk_imports/user_contributions_export_service.rb'
     - 'app/services/bulk_push_event_payload_service.rb'
     - 'app/services/captcha/captcha_verification_service.rb'
     - 'app/services/chat_names/authorize_user_service.rb'
@@ -2205,6 +2206,7 @@ Gitlab/BoundedContexts:
     - 'app/workers/bulk_imports/relation_export_worker.rb'
     - 'app/workers/bulk_imports/stale_import_worker.rb'
     - 'app/workers/bulk_imports/transform_references_worker.rb'
+    - 'app/workers/bulk_imports/user_contributions_export_worker.rb'
     - 'app/workers/chaos/cpu_spin_worker.rb'
     - 'app/workers/chaos/db_spin_worker.rb'
     - 'app/workers/chaos/kill_worker.rb'
@@ -4605,6 +4607,7 @@ Gitlab/BoundedContexts:
     - 'lib/bulk_imports/source_url_builder.rb'
     - 'lib/bulk_imports/stage.rb'
     - 'lib/bulk_imports/uniquify.rb'
+    - 'lib/bulk_imports/user_contributions_export_mapper.rb'
     - 'lib/bulk_imports/users_mapper.rb'
     - 'lib/bulk_imports/visibility_level.rb'
     - 'lib/carrier_wave_string_file.rb'
diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
index 700482cb46e..5f087c4159c 100644
--- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
+++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
@@ -505,7 +505,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'lib/bulk_imports/error.rb'
     - 'lib/feature/definition.rb'
     - 'lib/feature/shared.rb'
-    - 'lib/generators/gitlab/analytics/internal_events_generator.rb'
     - 'lib/gitlab/audit/auditor.rb'
     - 'lib/gitlab/auth/ldap/access.rb'
     - 'lib/gitlab/auth/user_access_denied_reason.rb'
diff --git a/.rubocop_todo/lint/ambiguous_regexp_literal.yml b/.rubocop_todo/lint/ambiguous_regexp_literal.yml
index cb6735f617a..d00aae4e0fb 100644
--- a/.rubocop_todo/lint/ambiguous_regexp_literal.yml
+++ b/.rubocop_todo/lint/ambiguous_regexp_literal.yml
@@ -2,18 +2,5 @@
 # Cop supports --autocorrect.
 Lint/AmbiguousRegexpLiteral:
   Exclude:
-    - 'lib/api/features.rb'
-    - 'qa/spec/page/element_spec.rb'
-    - 'spec/components/pajamas/avatar_component_spec.rb'
-    - 'spec/features/atom/users_spec.rb'
-    - 'spec/features/issues/user_creates_branch_and_merge_request_spec.rb'
-    - 'spec/features/issues/user_creates_issue_spec.rb'
-    - 'spec/helpers/labels_helper_spec.rb'
-    - 'spec/helpers/users_helper_spec.rb'
-    - 'spec/helpers/visibility_level_helper_spec.rb'
-    - 'spec/initializers/direct_upload_support_spec.rb'
-    - 'spec/initializers/validate_database_config_spec.rb'
-    - 'spec/lib/banzai/filter/references/label_reference_filter_spec.rb'
-    - 'spec/lib/feature_spec.rb'
     - 'spec/serializers/commit_entity_spec.rb'
 
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 6745ca104a9..c70c3cebcf5 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -379,7 +379,6 @@ RSpec/ContextWording:
     - 'ee/spec/lib/gitlab/slash_commands/presenters/issue_show_spec.rb'
     - 'ee/spec/lib/gitlab/status_page/filter/image_filter_spec.rb'
     - 'ee/spec/lib/gitlab/status_page/storage/s3_client_spec.rb'
-    - 'ee/spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb'
     - 'ee/spec/lib/gitlab/tracking/standard_context_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/advanced_search/build_type_metric_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/advanced_search/distribution_metric_spec.rb'
@@ -1920,7 +1919,6 @@ RSpec/ContextWording:
     - 'spec/lib/gitlab/time_tracking_formatter_spec.rb'
     - 'spec/lib/gitlab/tracking/destinations/snowplow_spec.rb'
     - 'spec/lib/gitlab/tracking/incident_management_spec.rb'
-    - 'spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb'
     - 'spec/lib/gitlab/tracking/standard_context_spec.rb'
     - 'spec/lib/gitlab/tracking_spec.rb'
     - 'spec/lib/gitlab/tree_summary_spec.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index 736f20f1984..def25d8c722 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -831,7 +831,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/lib/gitlab/status_page_spec.rb'
     - 'ee/spec/lib/gitlab/subscription_portal/client_spec.rb'
     - 'ee/spec/lib/gitlab/template/custom_templates_spec.rb'
-    - 'ee/spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb'
     - 'ee/spec/lib/gitlab/tracking/standard_context_spec.rb'
     - 'ee/spec/lib/gitlab/tree_summary_spec.rb'
     - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/advanced_search/build_type_metric_spec.rb'
@@ -3909,7 +3908,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/tracking/helpers/weak_password_error_event_spec.rb'
     - 'spec/lib/gitlab/tracking/incident_management_spec.rb'
     - 'spec/lib/gitlab/tracking/service_ping_context_spec.rb'
-    - 'spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb'
     - 'spec/lib/gitlab/tracking/standard_context_spec.rb'
     - 'spec/lib/gitlab/tree_summary_spec.rb'
     - 'spec/lib/gitlab/unicode_spec.rb'
diff --git a/app/assets/javascripts/design_management/components/design_sidebar.vue b/app/assets/javascripts/design_management/components/design_sidebar.vue
index 80e7546d8ec..e3174a995a4 100644
--- a/app/assets/javascripts/design_management/components/design_sidebar.vue
+++ b/app/assets/javascripts/design_management/components/design_sidebar.vue
@@ -5,13 +5,13 @@ import { isLoggedIn } from '~/lib/utils/common_utils';
 
 import { s__, n__ } from '~/locale';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import DesignDisclosure from '~/vue_shared/components/design_management/design_disclosure.vue';
 import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants';
 import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql';
 import { extractDiscussions, extractParticipants } from '../utils/design_management_utils';
 import DesignDiscussion from './design_notes/design_discussion.vue';
 import DescriptionForm from './design_description/description_form.vue';
 import DesignNoteSignedOut from './design_notes/design_note_signed_out.vue';
-import DesignDisclosure from './design_disclosure.vue';
 
 export default {
   components: {
diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue
index 17252dc9c7d..8327e5e56a5 100644
--- a/app/assets/javascripts/members/components/table/members_table.vue
+++ b/app/assets/javascripts/members/components/table/members_table.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlTable, GlBadge } from '@gitlab/ui';
+import { GlTable, GlBadge, GlTooltipDirective, GlLink } from '@gitlab/ui';
 // eslint-disable-next-line no-restricted-imports
 import { mapState } from 'vuex';
 import MembersTableCell from 'ee_else_ce/members/components/table/members_table_cell.vue';
@@ -12,6 +12,7 @@ import {
   canResend,
   canUpdate,
 } from 'ee_else_ce/members/utils';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   FIELD_KEY_ACTIONS,
   FIELDS,
@@ -32,12 +33,13 @@ import MemberSource from './member_source.vue';
 import MemberActivity from './member_activity.vue';
 import MaxRole from './max_role.vue';
 import MembersPagination from './members_pagination.vue';
+import RoleDetailsDrawer from './role_details_drawer.vue';
 
 export default {
-  name: 'MembersTable',
   components: {
     GlTable,
     GlBadge,
+    GlLink,
     MemberAvatar,
     CreatedAt,
     MembersTableCell,
@@ -49,6 +51,7 @@ export default {
     ExpirationDatepicker,
     MemberActivity,
     MembersPagination,
+    RoleDetailsDrawer,
     DisableTwoFactorModal: () =>
       import('ee_component/members/components/modals/disable_two_factor_modal.vue'),
     LdapOverrideConfirmationModal: () =>
@@ -56,6 +59,8 @@ export default {
     UserLimitReachedAlert: () =>
       import('ee_component/members/components/table/user_limit_reached_alert.vue'),
   },
+  directives: { GlTooltip: GlTooltipDirective },
+  mixins: [glFeatureFlagsMixin()],
   inject: ['namespace', 'currentUserId', 'canManageMembers'],
   props: {
     tabQueryParamValue: {
@@ -64,6 +69,11 @@ export default {
       default: '',
     },
   },
+  data() {
+    return {
+      selectedMember: null,
+    };
+  },
   computed: {
     ...mapState({
       members(state) {
@@ -233,9 +243,6 @@ export default {
       show-empty
       :tbody-tr-attr="tbodyTrAttr"
     >
-      <template #head()="{ label }">
-        {{ label }}
-      </template>
       <template #cell(account)="{ item: member }">
         <members-table-cell #default="{ memberType, isCurrentUser }" :member="member">
           <member-avatar
@@ -277,8 +284,20 @@ export default {
       </template>
 
       <template #cell(maxRole)="{ item: member }">
-        <members-table-cell #default="{ permissions }" :member="member">
-          <max-role :permissions="permissions" :member="member" />
+        <members-table-cell #default="{ permissions }" :member="member" data-testid="max-role">
+          <div v-if="glFeatures.showRoleDetailsInDrawer">
+            <gl-link
+              v-gl-tooltip.d0.hover="member.accessLevel.description"
+              class="gl-display-block"
+              @click="selectedMember = member"
+            >
+              {{ member.accessLevel.stringValue }}
+            </gl-link>
+            <gl-badge v-if="member.accessLevel.memberRoleId" class="gl-mt-3" size="sm">
+              {{ s__('MemberRole|Custom role') }}
+            </gl-badge>
+          </div>
+          <max-role v-else :permissions="permissions" :member="member" />
         </members-table-cell>
       </template>
 
@@ -312,5 +331,11 @@ export default {
     <remove-group-link-modal />
     <remove-member-modal />
     <ldap-override-confirmation-modal />
+
+    <role-details-drawer
+      v-if="glFeatures.showRoleDetailsInDrawer"
+      :member="selectedMember"
+      @close="selectedMember = null"
+    />
   </div>
 </template>
diff --git a/app/assets/javascripts/members/components/table/role_details_drawer.vue b/app/assets/javascripts/members/components/table/role_details_drawer.vue
new file mode 100644
index 00000000000..7e4a9b50645
--- /dev/null
+++ b/app/assets/javascripts/members/components/table/role_details_drawer.vue
@@ -0,0 +1,75 @@
+<script>
+import { GlDrawer, GlButton } from '@gitlab/ui';
+import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
+import { getContentWrapperHeight } from '~/lib/utils/dom_utils';
+import { helpPagePath } from '~/helpers/help_page_helper';
+import MembersTableCell from 'ee_else_ce/members/components/table/members_table_cell.vue';
+import MemberAvatar from './member_avatar.vue';
+
+export default {
+  components: { MemberAvatar, MembersTableCell, GlDrawer, GlButton },
+  props: {
+    member: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+  },
+  computed: {
+    viewPermissionsDocPath() {
+      return helpPagePath('user/permissions');
+    },
+  },
+  getContentWrapperHeight,
+  DRAWER_Z_INDEX,
+};
+</script>
+
+<template>
+  <gl-drawer
+    v-if="member"
+    :header-height="$options.getContentWrapperHeight()"
+    header-sticky
+    :z-index="$options.DRAWER_Z_INDEX"
+    open
+    @close="$emit('close')"
+  >
+    <template #title>
+      <h4 class="gl-m-0">{{ s__('MemberRole|Role details') }}</h4>
+    </template>
+
+    <!-- Do not remove this div, it's needed because every top-level element in the drawer's body will get padding and a
+    bottom border applied to it, and we don't want that to be applied to everything. -->
+    <div>
+      <h5 class="gl-mr-6">{{ __('Account') }}</h5>
+      <members-table-cell #default="{ memberType, isCurrentUser }" :member="member">
+        <member-avatar
+          :member-type="memberType"
+          :is-current-user="isCurrentUser"
+          :member="member"
+        />
+      </members-table-cell>
+
+      <hr />
+
+      <dl>
+        <dt class="gl-mb-3" data-testid="role-header">{{ s__('MemberRole|Role') }}</dt>
+        <dd data-testid="role-value">{{ member.accessLevel.stringValue }}</dd>
+
+        <dt class="gl-mt-6 gl-mb-3" data-testid="permissions-header">
+          {{ s__('MemberRole|Permissions') }}
+        </dt>
+        <dd>
+          <gl-button
+            :href="viewPermissionsDocPath"
+            icon="external-link"
+            variant="link"
+            target="_blank"
+          >
+            {{ s__('MemberRole|View permissions') }}
+          </gl-button>
+        </dd>
+      </dl>
+    </div>
+  </gl-drawer>
+</template>
diff --git a/app/assets/javascripts/design_management/components/design_disclosure.vue b/app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue
similarity index 60%
rename from app/assets/javascripts/design_management/components/design_disclosure.vue
rename to app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue
index 4a8f4b6c2d1..a7803ed7d61 100644
--- a/app/assets/javascripts/design_management/components/design_disclosure.vue
+++ b/app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue
@@ -13,7 +13,7 @@ export default {
   <transition name="design-disclosure">
     <aside
       v-if="open"
-      class="design-disclosure gl-w-full gl-display-flex gl-flex-direction-column gl-relative gl-border-l gl-z-0 gl-bg-white gl-top-0 gl-right-0 gl-h-full gl-overflow-y-auto"
+      class="design-disclosure gl-w-full gl-flex gl-flex-col gl-relative gl-border-l gl-z-0 gl-bg-white gl-top-0 gl-right-0 gl-h-full gl-overflow-y-auto"
     >
       <slot></slot>
     </aside>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue
new file mode 100644
index 00000000000..41c78fe334c
--- /dev/null
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue
@@ -0,0 +1,39 @@
+<script>
+import { s__ } from '~/locale';
+import SafeHtml from '~/vue_shared/directives/safe_html';
+
+export default {
+  i18n: {
+    descriptionLabel: s__('DesignManagement|Description'),
+  },
+  directives: {
+    SafeHtml,
+  },
+  props: {
+    design: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="design-description-container">
+    <div class="design-description-view">
+      <div class="design-description-header gl-flex gl-justify-between gl-mb-2">
+        <h3 class="gl-line-height-20! gl-font-lg gl-m-0">
+          {{ $options.i18n.descriptionLabel }}
+        </h3>
+      </div>
+      <div v-if="design.descriptionHtml" class="design-description js-task-list-container">
+        <div
+          ref="gfm-content"
+          v-safe-html="design.descriptionHtml"
+          class="md gl-mb-4"
+          data-testid="design-description-content"
+        ></div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue
index f3e39e11863..fd5e64394c3 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue
@@ -12,6 +12,7 @@ import { DESIGN_DETAIL_LAYOUT_CLASSLIST } from '../constants';
 import { DESIGN_NOT_FOUND_ERROR, DESIGN_VERSION_NOT_EXIST_ERROR } from '../error_messages';
 import DesignPresentation from './design_presentation.vue';
 import DesignToolbar from './design_toolbar.vue';
+import DesignSidebar from './design_sidebar.vue';
 
 const DEFAULT_SCALE = 1;
 const DEFAULT_MAX_SCALE = 2;
@@ -20,6 +21,7 @@ export default {
   WORK_ITEM_ROUTE_NAME,
   components: {
     DesignPresentation,
+    DesignSidebar,
     DesignToolbar,
     GlAlert,
   },
@@ -63,6 +65,7 @@ export default {
       discussions: [],
       workItemId: '',
       workItemTitle: '',
+      isSidebarOpen: true,
     };
   },
   apollo: {
@@ -145,6 +148,9 @@ export default {
     setMaxScale(event) {
       this.maxScale = 1 / event;
     },
+    toggleSidebar() {
+      this.isSidebarOpen = !this.isSidebarOpen;
+    },
   },
 };
 </script>
@@ -154,7 +160,13 @@ export default {
     class="design-detail js-design-detail fixed-top gl-w-full gl-flex gl-justify-content-center gl-flex-col gl-lg-flex-direction-row gl-bg-gray-10"
   >
     <div class="gl-flex gl-overflow-hidden gl-grow gl-flex-col gl-relative">
-      <design-toolbar :work-item-title="workItemTitle" :design="design" :is-loading="isLoading" />
+      <design-toolbar
+        :work-item-title="workItemTitle"
+        :design="design"
+        :is-loading="isLoading"
+        :is-sidebar-open="isSidebarOpen"
+        @toggle-sidebar="toggleSidebar"
+      />
       <div
         class="gl-flex gl-overflow-hidden gl-flex-col gl-lg-flex-direction-row gl-grow gl-relative"
       >
@@ -175,6 +187,7 @@ export default {
             @setMaxScale="setMaxScale"
           />
         </div>
+        <design-sidebar :design="design" :is-loading="isLoading" :is-open="isSidebarOpen" />
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue
new file mode 100644
index 00000000000..e42c99aea9f
--- /dev/null
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue
@@ -0,0 +1,55 @@
+<script>
+import { GlSkeletonLoader, GlEmptyState } from '@gitlab/ui';
+import EMPTY_DISCUSSION_URL from '@gitlab/svgs/dist/illustrations/empty-state/empty-activity-md.svg';
+import DesignDisclosure from '~/vue_shared/components/design_management/design_disclosure.vue';
+import DesignDescription from './design_description.vue';
+
+export default {
+  components: {
+    DesignDescription,
+    DesignDisclosure,
+    GlSkeletonLoader,
+    GlEmptyState,
+  },
+  props: {
+    design: {
+      type: Object,
+      required: true,
+    },
+    isLoading: {
+      type: Boolean,
+      required: true,
+    },
+    isOpen: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  computed: {
+    showDescription() {
+      return !this.isLoading && Boolean(this.design.descriptionHtml);
+    },
+  },
+  EMPTY_DISCUSSION_URL,
+};
+</script>
+
+<template>
+  <design-disclosure :open="isOpen">
+    <template #default>
+      <div class="image-notes gl-h-full gl-pt-0">
+        <design-description v-if="showDescription" :design="design" class="gl-my-5 gl-border-b" />
+        <div v-if="isLoading" class="gl-my-5">
+          <gl-skeleton-loader />
+        </div>
+        <template v-else>
+          <gl-empty-state
+            data-testid="new-discussion-disclaimer"
+            :svg-path="$options.EMPTY_DISCUSSION_URL"
+          />
+          <slot name="reply-form"></slot>
+        </template>
+      </div>
+    </template>
+  </design-disclosure>
+</template>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
index 6dd0d34f92c..380fbb136e2 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
@@ -1,16 +1,25 @@
 <script>
-import { GlIcon, GlSkeletonLoader } from '@gitlab/ui';
+import { GlButton, GlIcon, GlSkeletonLoader, GlTooltipDirective } from '@gitlab/ui';
 import { TYPE_DESIGN } from '~/import/constants';
+import { s__ } from '~/locale';
 import ImportedBadge from '~/vue_shared/components/imported_badge.vue';
 import CloseButton from './close_button.vue';
 
 export default {
+  i18n: {
+    hideCommentsButtonLabel: s__('DesignManagement|Hide comments'),
+    showCommentsButtonLabel: s__('DesignManagement|Show comments'),
+  },
   components: {
+    GlButton,
     GlIcon,
     GlSkeletonLoader,
     ImportedBadge,
     CloseButton,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     workItemTitle: {
       type: String,
@@ -24,6 +33,17 @@ export default {
       type: Boolean,
       required: true,
     },
+    isSidebarOpen: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  computed: {
+    toggleCommentsButtonLabel() {
+      return this.isSidebarOpen
+        ? this.$options.i18n.hideCommentsButtonLabel
+        : this.$options.i18n.showCommentsButtonLabel;
+    },
   },
   TYPE_DESIGN,
 };
@@ -52,6 +72,18 @@ export default {
       </div>
       <close-button class="md:gl-hidden gl-ml-auto" />
     </div>
+    <div class="gl-flex md:gl-flex-row gl-flex-shrink-0 gl-md-ml-auto">
+      <gl-button
+        v-gl-tooltip.bottom
+        category="tertiary"
+        icon="comments"
+        :title="toggleCommentsButtonLabel"
+        :aria-label="toggleCommentsButtonLabel"
+        class="gl-ml-2 gl-mr-6"
+        data-testid="toggle-design-sidebar"
+        @click="$emit('toggle-sidebar')"
+      />
+    </div>
     <close-button class="gl-hidden md:gl-flex" />
   </header>
 </template>
diff --git a/app/graphql/resolvers/work_items/types_resolver.rb b/app/graphql/resolvers/work_items/types_resolver.rb
index 5cd975a2bc2..331d0b3e230 100644
--- a/app/graphql/resolvers/work_items/types_resolver.rb
+++ b/app/graphql/resolvers/work_items/types_resolver.rb
@@ -32,7 +32,8 @@ module Resolvers
 
       def nested_preloads
         {
-          widget_definitions: { allowed_child_types: :allowed_child_types_by_name }
+          widget_definitions: { allowed_child_types: :allowed_child_types_by_name,
+                                allowed_parent_types: :allowed_parent_types_by_name }
         }
       end
     end
diff --git a/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb b/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb
index 8bd70050c7c..758d2844da9 100644
--- a/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb
+++ b/app/graphql/types/work_items/widget_definitions/hierarchy_type.rb
@@ -4,6 +4,7 @@ module Types
   module WorkItems
     module WidgetDefinitions
       # rubocop:disable Graphql/AuthorizeTypes -- authorized in work item type entity
+      # rubocop:disable GraphQL/ExtractType -- no need to extra allowed types into a seperate field
       class HierarchyType < BaseObject
         graphql_name 'WorkItemWidgetDefinitionHierarchy'
         description 'Represents a hierarchy widget definition'
@@ -16,11 +17,22 @@ module Types
           extras: [:parent],
           description: 'Allowed child types for the work item type.'
 
+        field :allowed_parent_types, Types::WorkItems::TypeType.connection_type,
+          null: true,
+          extras: [:parent],
+          complexity: 5,
+          description: 'Allowed parent types for the work item type.'
+
         def allowed_child_types(parent:)
           parent.allowed_child_types(cache: true)
         end
+
+        def allowed_parent_types(parent:)
+          parent.allowed_parent_types(cache: true)
+        end
       end
       # rubocop:enable Graphql/AuthorizeTypes
+      # rubocop:enable GraphQL/ExtractType
     end
   end
 end
diff --git a/app/models/bulk_imports/export.rb b/app/models/bulk_imports/export.rb
index 5c3f8e4b8d4..29f078a1527 100644
--- a/app/models/bulk_imports/export.rb
+++ b/app/models/bulk_imports/export.rb
@@ -22,6 +22,8 @@ module BulkImports
 
     validate :portable_relation?
 
+    scope :for_status, ->(status) { where(status: status) }
+
     state_machine :status, initial: :started do
       state :started, value: STARTED
       state :finished, value: FINISHED
@@ -38,6 +40,12 @@ module BulkImports
       event :fail_op do
         transition any => :failed
       end
+
+      after_transition any => :finished do |export|
+        if export.config.user_contributions_relation?(export.relation)
+          UserContributionsExportMapper.new(export.portable).clear_cache
+        end
+      end
     end
 
     def portable_relation?
diff --git a/app/models/bulk_imports/file_transfer/base_config.rb b/app/models/bulk_imports/file_transfer/base_config.rb
index 32fc794627c..bdc51d3e8a0 100644
--- a/app/models/bulk_imports/file_transfer/base_config.rb
+++ b/app/models/bulk_imports/file_transfer/base_config.rb
@@ -7,6 +7,7 @@ module BulkImports
 
       UPLOADS_RELATION = 'uploads'
       SELF_RELATION = 'self'
+      USER_CONTRIBUTIONS_RELATION = 'user_contributions'
 
       def initialize(portable)
         @portable = portable
@@ -53,6 +54,10 @@ module BulkImports
         file_relations.include?(relation)
       end
 
+      def user_contributions_relation?(relation)
+        relation == USER_CONTRIBUTIONS_RELATION
+      end
+
       def tree_relation_definition_for(relation)
         return unless tree_relation?(relation)
 
diff --git a/app/models/concerns/importable.rb b/app/models/concerns/importable.rb
index 227a817df49..306a6e14723 100644
--- a/app/models/concerns/importable.rb
+++ b/app/models/concerns/importable.rb
@@ -3,6 +3,7 @@
 module Importable
   extend ActiveSupport::Concern
 
+  attr_accessor :user_contributions
   attr_accessor :importing
   alias_method :importing?, :importing
 end
diff --git a/app/models/group.rb b/app/models/group.rb
index 7f266ce1012..b3c408d3bea 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -20,6 +20,7 @@ class Group < Namespace
   include ChronicDurationAttribute
   include RunnerTokenExpirationInterval
   include Todoable
+  include Importable
 
   extend ::Gitlab::Utils::Override
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 9e5f31993b3..e6fa789439f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -46,6 +46,7 @@ class Project < ApplicationRecord
   include IgnorableColumns
   include CrossDatabaseIgnoredTables
   include UseSqlFunctionForPrimaryKeyLookups
+  include Importable
 
   ignore_column :emails_disabled, remove_with: '16.3', remove_after: '2023-08-22'
 
diff --git a/app/models/user.rb b/app/models/user.rb
index ec638a90e07..b7ea304fc4d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -641,6 +641,7 @@ class User < MainClusterwide::ApplicationRecord
   scope :dormant, -> { with_state(:active).human_or_service_user.where('last_activity_on <= ?', Gitlab::CurrentSettings.deactivate_dormant_users_period.day.ago.to_date) }
   scope :with_no_activity, -> { with_state(:active).human_or_service_user.where(last_activity_on: nil).where('created_at <= ?', MINIMUM_DAYS_CREATED.day.ago.to_date) }
   scope :by_provider_and_extern_uid, ->(provider, extern_uid) { joins(:identities).merge(Identity.with_extern_uid(provider, extern_uid)) }
+  scope :by_ids, ->(ids) { where(id: ids) }
   scope :by_ids_or_usernames, ->(ids, usernames) { where(username: usernames).or(where(id: ids)) }
   scope :without_forbidden_states, -> { where.not(state: FORBIDDEN_SEARCH_STATES) }
   scope :trusted, -> do
diff --git a/app/models/work_items/type.rb b/app/models/work_items/type.rb
index 5b10662850a..3746892c775 100644
--- a/app/models/work_items/type.rb
+++ b/app/models/work_items/type.rb
@@ -62,9 +62,14 @@ module WorkItems
       inverse_of: :work_item_type, class_name: 'WorkItems::WidgetDefinition'
     has_many :child_restrictions, class_name: 'WorkItems::HierarchyRestriction', foreign_key: :parent_type_id,
       inverse_of: :parent_type
+    has_many :parent_restrictions, class_name: 'WorkItems::HierarchyRestriction', foreign_key: :child_type_id,
+      inverse_of: :child_type
     has_many :allowed_child_types_by_name, -> { order_by_name_asc },
       through: :child_restrictions, class_name: 'WorkItems::Type',
       foreign_key: :child_type_id, source: :child_type
+    has_many :allowed_parent_types_by_name, -> { order_by_name_asc },
+      through: :parent_restrictions, class_name: 'WorkItems::Type',
+      foreign_key: :parent_type_id, source: :parent_type
 
     before_validation :strip_whitespace
     after_save :clear_reactive_cache!
@@ -133,15 +138,24 @@ module WorkItems
     end
 
     def calculate_reactive_cache
-      allowed_child_types_by_name
+      {
+        allowed_child_types_by_name: allowed_child_types_by_name,
+        allowed_parent_types_by_name: allowed_parent_types_by_name
+      }
     end
 
     def allowed_child_types(cache: false)
-      cached_data = cache ? with_reactive_cache { |query_data| query_data } : nil
+      cached_data = cache ? with_reactive_cache { |query_data| query_data[:allowed_child_types_by_name] } : nil
 
       cached_data || allowed_child_types_by_name
     end
 
+    def allowed_parent_types(cache: false)
+      cached_data = cache ? with_reactive_cache { |query_data| query_data[:allowed_parent_types_by_name] } : nil
+
+      cached_data || allowed_parent_types_by_name
+    end
+
     private
 
     def strip_whitespace
diff --git a/app/services/bulk_imports/user_contributions_export_service.rb b/app/services/bulk_imports/user_contributions_export_service.rb
new file mode 100644
index 00000000000..a184a34e79b
--- /dev/null
+++ b/app/services/bulk_imports/user_contributions_export_service.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module BulkImports
+  class UserContributionsExportService
+    def initialize(user_id, portable, jid)
+      @user = User.find(user_id)
+      @portable = portable
+      @jid = jid
+    end
+
+    def execute
+      # Set up query to get cached users and set it as user_contributions on the portable model
+      @portable.user_contributions = UserContributionsExportMapper.new(@portable).get_contributing_users
+      relation = BulkImports::FileTransfer::BaseConfig::USER_CONTRIBUTIONS_RELATION
+
+      RelationExportService.new(@user, @portable, relation, @jid).execute
+    end
+  end
+end
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 5e0f591d2d7..1963e60fd0c 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2757,6 +2757,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: bulk_imports_user_contributions_export
+  :worker_name: BulkImports::UserContributionsExportWorker
+  :feature_category: :importers
+  :has_external_dependencies: false
+  :urgency: :low
+  :resource_boundary: :memory
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: chat_notification
   :worker_name: ChatNotificationWorker
   :feature_category: :integrations
diff --git a/app/workers/bulk_imports/relation_export_worker.rb b/app/workers/bulk_imports/relation_export_worker.rb
index 90941e7583b..8d49e557b2a 100644
--- a/app/workers/bulk_imports/relation_export_worker.rb
+++ b/app/workers/bulk_imports/relation_export_worker.rb
@@ -37,6 +37,11 @@ module BulkImports
       if Gitlab::Utils.to_boolean(batched) && config.batchable_relation?(relation)
         log_extra_metadata_on_done(:batched, true)
         BatchedRelationExportService.new(user, portable, relation, jid).execute
+      elsif config.user_contributions_relation?(relation)
+        return if Feature.disabled?(:bulk_import_user_mapping, portable)
+
+        log_extra_metadata_on_done(:batched, false)
+        UserContributionsExportWorker.perform_async(portable_id, portable_class, user_id)
       else
         log_extra_metadata_on_done(:batched, false)
         RelationExportService.new(user, portable, relation, jid).execute
diff --git a/app/workers/bulk_imports/user_contributions_export_worker.rb b/app/workers/bulk_imports/user_contributions_export_worker.rb
new file mode 100644
index 00000000000..bd0f7e27733
--- /dev/null
+++ b/app/workers/bulk_imports/user_contributions_export_worker.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module BulkImports
+  class UserContributionsExportWorker
+    include ApplicationWorker
+
+    idempotent!
+    data_consistency :sticky
+    feature_category :importers
+    worker_resource_boundary :memory
+
+    REENQUEUE_DELAY = 20.seconds
+    EXPORT_TIMEOUT = 6.hours
+
+    def perform(portable_id, portable_class, user_id, enqueued_at = nil)
+      @portable = portable_class.classify.constantize.find(portable_id)
+      @user_id = user_id
+      @enqueued_at = enqueued_at || Time.current
+
+      # wait for all other exports to finish so that all contributions will be present
+      return log_error('No other exports were created for more than 6 hours') if job_stuck_without_exports?
+      return re_enqueue if exports_still_processing?
+
+      UserContributionsExportService.new(@user_id, @portable, @jid).execute
+    end
+
+    private
+
+    attr_reader :portable, :user_id, :enqueued_at
+
+    def no_exports?
+      portable.bulk_import_exports.empty?
+    end
+
+    def job_stuck_without_exports?
+      has_been_enqueued_longer_limit = enqueued_at < EXPORT_TIMEOUT.ago
+      no_exports? && has_been_enqueued_longer_limit
+    end
+
+    def exports_still_processing?
+      started_exports = portable.bulk_import_exports.for_status(BulkImports::Export::STARTED)
+      started_exports.any? || no_exports?
+    end
+
+    def re_enqueue
+      self.class.perform_in(REENQUEUE_DELAY, portable.id, portable.class.name, user_id, enqueued_at)
+    end
+
+    def log_base_data
+      log = { importer: 'gitlab_migration' }
+      log.merge!(Gitlab::ImportExport::LogUtil.exportable_to_log_payload(portable))
+      log
+    end
+
+    def log_error(reason)
+      message = "Unable to begin user_contributions export: #{reason}"
+      Gitlab::Export::Logger.error(message: message, **log_base_data)
+    end
+  end
+end
diff --git a/config/events/schema.json b/config/events/schema.json
index b4705ef4eb7..4e59daa478a 100644
--- a/config/events/schema.json
+++ b/config/events/schema.json
@@ -3,8 +3,6 @@
   "required": [
     "description",
     "action",
-    "product_section",
-    "product_stage",
     "product_group",
     "introduced_by_url",
     "milestone",
diff --git a/config/feature_flags/wip/show_role_details_in_drawer.yml b/config/feature_flags/wip/show_role_details_in_drawer.yml
new file mode 100644
index 00000000000..b9328415d1d
--- /dev/null
+++ b/config/feature_flags/wip/show_role_details_in_drawer.yml
@@ -0,0 +1,9 @@
+---
+name: show_role_details_in_drawer
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/456280
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152914
+rollout_issue_url: 
+milestone: '17.1'
+group: group::authorization
+type: wip
+default_enabled: false
diff --git a/config/metrics/schema/base.json b/config/metrics/schema/base.json
index 727a7d7bc20..a28e694eb81 100644
--- a/config/metrics/schema/base.json
+++ b/config/metrics/schema/base.json
@@ -6,8 +6,6 @@
     "value_type",
     "status",
     "product_group",
-    "product_section",
-    "product_stage",
     "time_frame",
     "data_source",
     "distribution",
@@ -22,16 +20,6 @@
     "description": {
       "type": "string"
     },
-    "product_section": {
-      "type": [
-        "string"
-      ]
-    },
-    "product_stage": {
-      "type": [
-        "string"
-      ]
-    },
     "product_group": {
       "$ref": "product_groups.json"
     },
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 17c62720686..79fbc7c2720 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -159,6 +159,8 @@
   - 1
 - - bulk_imports_transform_references
   - 1
+- - bulk_imports_user_contributions_export
+  - 1
 - - chaos
   - 2
 - - chat_notification
diff --git a/db/migrate/20240517072604_add_not_valid_foreign_key_to_namespaces_parent.rb b/db/migrate/20240517072604_add_not_valid_foreign_key_to_namespaces_parent.rb
new file mode 100644
index 00000000000..3935faa1e3a
--- /dev/null
+++ b/db/migrate/20240517072604_add_not_valid_foreign_key_to_namespaces_parent.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddNotValidForeignKeyToNamespacesParent < Gitlab::Database::Migration[2.2]
+  TABLE_NAME = :namespaces
+  REFERENCING_TABLE_NAME = :namespaces
+  COLUMN_NAME = :parent_id
+
+  disable_ddl_transaction!
+
+  milestone '17.1'
+
+  def up
+    add_concurrent_foreign_key(
+      TABLE_NAME, REFERENCING_TABLE_NAME, column: COLUMN_NAME, on_delete: :restrict, validate: false
+    )
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key_if_exists(TABLE_NAME, column: COLUMN_NAME)
+    end
+  end
+end
diff --git a/db/post_migrate/20240510134106_add_epics_issue_id_not_null_constraint.rb b/db/post_migrate/20240510134106_add_epics_issue_id_not_null_constraint.rb
new file mode 100644
index 00000000000..f67a963d23e
--- /dev/null
+++ b/db/post_migrate/20240510134106_add_epics_issue_id_not_null_constraint.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddEpicsIssueIdNotNullConstraint < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  disable_ddl_transaction!
+
+  def up
+    add_not_null_constraint :epics, :issue_id, validate: false
+  end
+
+  def down
+    remove_not_null_constraint :epics, :issue_id
+  end
+end
diff --git a/db/schema_migrations/20240510134106 b/db/schema_migrations/20240510134106
new file mode 100644
index 00000000000..82201469ab3
--- /dev/null
+++ b/db/schema_migrations/20240510134106
@@ -0,0 +1 @@
+8ec5848ee1cd2e3e2f60a383136fcc53917f006e47d84a3ad6871630f83ddc12
\ No newline at end of file
diff --git a/db/schema_migrations/20240517072604 b/db/schema_migrations/20240517072604
new file mode 100644
index 00000000000..067f5bc1795
--- /dev/null
+++ b/db/schema_migrations/20240517072604
@@ -0,0 +1 @@
+61b5a352961628b3d8c513c38b8cbaf0ad443a9eeba2b9b01ebcdfd215cc6c53
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 4e71c36c79a..2b868cf34b6 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -21221,6 +21221,9 @@ ALTER TABLE workspaces
 ALTER TABLE vulnerability_scanners
     ADD CONSTRAINT check_37608c9db5 CHECK ((char_length(vendor) <= 255)) NOT VALID;
 
+ALTER TABLE epics
+    ADD CONSTRAINT check_450724d1bb CHECK ((issue_id IS NOT NULL)) NOT VALID;
+
 ALTER TABLE sprints
     ADD CONSTRAINT check_ccd8a1eae0 CHECK ((start_date IS NOT NULL)) NOT VALID;
 
@@ -30809,6 +30812,9 @@ ALTER TABLE ONLY merge_requests
 ALTER TABLE ONLY merge_request_metrics
     ADD CONSTRAINT fk_7f28d925f3 FOREIGN KEY (merged_by_id) REFERENCES users(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY namespaces
+    ADD CONSTRAINT fk_7f813d8c90 FOREIGN KEY (parent_id) REFERENCES namespaces(id) ON DELETE RESTRICT NOT VALID;
+
 ALTER TABLE ONLY group_import_states
     ADD CONSTRAINT fk_8053b3ebd6 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 104c4da58c6..86d66397477 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -32188,6 +32188,7 @@ Represents a hierarchy widget definition.
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="workitemwidgetdefinitionhierarchyallowedchildtypes"></a>`allowedChildTypes` | [`WorkItemTypeConnection`](#workitemtypeconnection) | Allowed child types for the work item type. (see [Connections](#connections)) |
+| <a id="workitemwidgetdefinitionhierarchyallowedparenttypes"></a>`allowedParentTypes` | [`WorkItemTypeConnection`](#workitemtypeconnection) | Allowed parent types for the work item type. (see [Connections](#connections)) |
 | <a id="workitemwidgetdefinitionhierarchytype"></a>`type` | [`WorkItemWidgetType!`](#workitemwidgettype) | Widget type. |
 
 ### `WorkItemWidgetDefinitionLabels`
diff --git a/doc/development/internal_analytics/review_guidelines.md b/doc/development/internal_analytics/review_guidelines.md
index 09fedd72920..9dfe6b8d787 100644
--- a/doc/development/internal_analytics/review_guidelines.md
+++ b/doc/development/internal_analytics/review_guidelines.md
@@ -20,7 +20,7 @@ This includes but is not limited to:
   - files in [`ee/config/metrics`](https://gitlab.com/gitlab-org/gitlab/-/tree/master/ee/config/metrics).
   - [`schema.json`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/schema.json).
 - Internal events, for example files in [`config/events`](https://gitlab.com/gitlab-org/gitlab/-/tree/master/config/events).
-- Analytics Instrumentation tooling, for example [`InternalEventsGenerator`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/generators/gitlab/analytics/internal_events_generator.rb).
+- Analytics Instrumentation tooling, for example [`Internal events CLI`](https://gitlab.com/gitlab-org/gitlab/blob/master/scripts/internal_events/cli.rb).
 
 In most cases, an Analytics Instrumentation review is automatically added, but it can also be requested manually if the automations miss the relevant change.
 
diff --git a/doc/development/work_items.md b/doc/development/work_items.md
index 831aada30f1..9d6618442da 100644
--- a/doc/development/work_items.md
+++ b/doc/development/work_items.md
@@ -456,3 +456,7 @@ in [GitLab.com](https://gitlab.com).
 For implementation details, this [MR](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93231) can be used
 as a reference. The MR covers the definition of new unique actions, event tracking in the code and also
 adding the new unique actions to the required aggregate counters.
+
+## Related topics
+
+- [Design management](../user/project/issues/design_management.md)
diff --git a/doc/user/group/saml_sso/group_sync.md b/doc/user/group/saml_sso/group_sync.md
index 93d0d73f83f..5a28aa3e30e 100644
--- a/doc/user/group/saml_sso/group_sync.md
+++ b/doc/user/group/saml_sso/group_sync.md
@@ -55,11 +55,17 @@ To link the SAML groups:
 
 ![SAML Group Links](img/saml_group_links_v13_9.png)
 
+### How role conflicts are resolved
+
+#### Members of multiple mapped SAML groups
+
 If a user is a member of multiple SAML groups mapped to the same GitLab group,
 the user gets the highest role from the groups. For example, if one group
 is linked as Guest and another Maintainer, a user in both groups gets the Maintainer
 role.
 
+#### Parent group role is higher than child group
+
 Users granted:
 
 - A higher role with Group Sync are displayed as having
diff --git a/doc/user/packages/container_registry/img/container_registry_hover_path_13_4.png b/doc/user/packages/container_registry/img/container_registry_hover_path_13_4.png
deleted file mode 100644
index 2d16c11fe61..00000000000
Binary files a/doc/user/packages/container_registry/img/container_registry_hover_path_13_4.png and /dev/null differ
diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md
index 9381d08c270..542b3b71e1f 100644
--- a/doc/user/packages/container_registry/index.md
+++ b/doc/user/packages/container_registry/index.md
@@ -15,9 +15,9 @@ You can use the integrated container registry to store container images for each
 To enable the container registry for your GitLab instance, see the [administrator documentation](../../../administration/packages/container_registry.md).
 
 NOTE:
-If you pull Docker container images from Docker Hub, you can use the
+If you pull container images from Docker Hub, you can use the
 [GitLab Dependency Proxy](../dependency_proxy/index.md#use-the-dependency-proxy-for-docker-images) to avoid
-rate limits and speed up your pipelines. For more information about the Docker Registry, see [the documentation](https://distribution.github.io/distribution/about/).
+rate limits and speed up your pipelines.
 
 ## View the container registry
 
@@ -45,7 +45,7 @@ You can use the container registry **Tag Details** page to view a list of tags a
 You can view details about each tag, such as when it was published, how much storage it consumes,
 and the manifest and configuration digests.
 
-You can search, sort (by tag name), filter, and [delete](delete_container_registry_images.md#use-the-gitlab-ui)
+You can search, sort (by tag name), and [delete](delete_container_registry_images.md#use-the-gitlab-ui)
 tags on this page. You can share a filtered view by copying the URL from your browser.
 
 ## Use container images from the container registry
@@ -54,9 +54,7 @@ To download and run a container image hosted in the container registry:
 
 1. On the left sidebar, select **Search or go to** and find your project or group.
 1. Select **Deploy > Container Registry**.
-1. Find the container image you want to work with and select **Copy**.
-
-    ![Container Registry image URL](img/container_registry_hover_path_13_4.png)
+1. Find the container image you want to work with and select **Copy image path** （**{copy-to-clipboard}**）.
 
 1. Use `docker run` with the copied link:
 
@@ -99,11 +97,18 @@ registry.example.com/mynamespace/myproject/my/image:rc1
 
 ## Move or rename container registry repositories
 
-Moving or renaming existing container registry repositories is not supported after you have pushed
-container images. The container images are stored in a path that matches the repository path. To move
-or rename a repository with a container registry, you must delete all existing container images.
-Community suggestions to work around this known issue are shared in
-[issue 18383](https://gitlab.com/gitlab-org/gitlab/-/issues/18383#possible-workaround).
+The path of a container repository always matches the related project's repository path,
+so renaming or moving only the container registry is not possible. Instead, you can
+[rename](../../project/working_with_projects.md#rename-a-repository) or [move](../../project/settings/migrate_projects.md)
+the entire project.
+
+Renaming projects with populated container repositories is only supported on GitLab.com.
+
+On a self-managed instance, you can delete all container images before moving or renaming
+a group or project. Alternatively, [issue 18383](https://gitlab.com/gitlab-org/gitlab/-/issues/18383#possible-workaround)
+contains community suggestions to work around this limitation. [Epic 9459](https://gitlab.com/groups/gitlab-org/-/epics/9459)
+proposes adding support for moving projects and groups with container repositories
+to self-managed GitLab.
 
 ## Disable the container registry for a project
 
@@ -114,7 +119,7 @@ You can, however, remove the container registry for a project:
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Settings > General**.
 1. Expand the **Visibility, project features, permissions** section
-   and disable **Container Registry**.
+   and disable **Container registry**.
 1. Select **Save changes**.
 
 The **Deploy > Container Registry** entry is removed from the project's sidebar.
@@ -130,7 +135,7 @@ see [Container registry visibility permissions](#container-registry-visibility-p
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Settings > General**.
 1. Expand the section **Visibility, project features, permissions**.
-1. Under **Container Registry**, select an option from the dropdown list:
+1. Under **Container registry**, select an option from the dropdown list:
 
    - **Everyone With Access** (Default): The container registry is visible to everyone with access
      to the project. If the project is public, the container registry is also public. If the project
@@ -148,7 +153,7 @@ The ability to view the container registry and pull container images is controll
 visibility permissions. You can change the visibility through the [visibility setting on the UI](#change-visibility-of-the-container-registry)
 or the [API](../../../api/container_registry.md#change-the-visibility-of-the-container-registry).
 [Other permissions](../../permissions.md) such as updating the container registry and pushing or deleting container images are not affected by
-this setting. However, disabling the container registry disables all Container Registry operations.
+this setting. However, disabling the container registry disables all container registry operations.
 
 |                                                                                                                   |                                               | Anonymous<br/>(Everyone on internet) | Guest | Reporter, Developer, Maintainer, Owner |
 |-------------------------------------------------------------------------------------------------------------------|-----------------------------------------------|--------------------------------------|-------|----------------------------------------|
diff --git a/doc/user/packages/generic_packages/index.md b/doc/user/packages/generic_packages/index.md
index 9eaa1254a5b..af59215bdbe 100644
--- a/doc/user/packages/generic_packages/index.md
+++ b/doc/user/packages/generic_packages/index.md
@@ -50,7 +50,7 @@ PUT /projects/:id/packages/generic/:package_name/:package_version/:file_name?sta
 | `id`              | integer/string | yes      | The ID or [URL-encoded path of the project](../../../api/rest/index.md#namespaced-path-encoding). |
 | `package_name`    | string         | yes      | The package name. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
 | `package_version` | string         | yes      | The package version. The following regex validates this: `\A(\.?[\w\+-]+\.?)+\z`. You can test your version strings on [Rubular](https://rubular.com/r/aNCV0wG5K14uq8). |
-| `file_name`       | string         | yes      | The filename. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
+| `file_name`       | string         | yes      | The filename. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), underscores (`_`), or slashes (`/`). |
 | `status`          | string         | no       | The package status. It can be `default` or `hidden`. Hidden packages do not appear in the UI or [package API list endpoints](../../../api/packages.md). |
 | `select`          | string         | no       | The response payload. By default, the response is empty. Valid values are: `package_file`. `package_file` returns details of the package file record created by this request. |
 
@@ -62,6 +62,12 @@ Example request using a personal access token:
 curl --header "PRIVATE-TOKEN: <your_access_token>" \
      --upload-file path/to/file.txt \
      "https://gitlab.example.com/api/v4/projects/24/packages/generic/my_package/0.0.1/file.txt"
+
+<!-- Or with a full path file -->
+
+curl --user "user:<your_access_token>" \
+     --upload-file path/to/file.txt \
+     "https://gitlab.example.com/api/v4/projects/24/packages/generic/my_package/0.0.1/path/to/file.txt"
 ```
 
 Example response without attribute `select`:
diff --git a/doc/user/project/integrations/beyond_identity.md b/doc/user/project/integrations/beyond_identity.md
index 5e91dc3a307..57bba922947 100644
--- a/doc/user/project/integrations/beyond_identity.md
+++ b/doc/user/project/integrations/beyond_identity.md
@@ -35,12 +35,20 @@ To enable the Beyond Identity integration for your instance:
 1. Select **Save changes**.
 
 The Beyond Identity integration for your instance is now enabled.
-When a user adds a GPG key to their profile, the key is verified.
-If the key wasn't issued by the Beyond Identity Authenticator or the email used in their GitLab
-profile is different from the email assigned to the key in the Beyond Identity Authenticator, it's rejected.
+
+## GPG key verificatioon
+
+When a user adds a GPG key to their profile, the key is verified:
+
+- If the key wasn't issued by the Beyond Identity Authenticator, it's accepted.
+- If the key was issued by the Beyond Identity Authenticator, but the key is invalid, it's rejected.
+  For example: the email used in the user's GitLab profile is different from the email assigned to
+  the key in the Beyond Identity Authenticator.
 
 When a user pushes a commit, GitLab checks that the commit was signed by a GPG signature uploaded to the
-user profile. If the signature cannot be verified, the push is rejected. Web commits are accepted without a signature.
+user profile.
+If the signature cannot be verified, the push is rejected.
+Web commits are accepted without a signature.
 
 ## Skip push check for service accounts
 
diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md
index 8086be5b63c..8034023c7e6 100644
--- a/doc/user/project/repository/branches/default.md
+++ b/doc/user/project/repository/branches/default.md
@@ -28,8 +28,8 @@ GitLab checks first for specific customizations, then checks at a broader level,
 using the GitLab default only if no customizations are set:
 
 1. A [project-specific](#change-the-default-branch-name-for-a-project) custom default branch name.
-1. A [subgroup-level](#group-level-custom-initial-branch-name) custom default branch name.
-1. A [group-level](#group-level-custom-initial-branch-name) custom default branch name.
+1. [Custom group default branch name](#group-level-custom-initial-branch-name) specified in project's direct subgroup.
+1. [Custom group default branch name](#group-level-custom-initial-branch-name) specified in project's root group.
 1. An [instance-level](#instance-level-custom-initial-branch-name) custom default branch name.
 1. If no custom default branch name is set at any level, GitLab defaults to `main`.
 
@@ -323,4 +323,4 @@ with the value of `endCursor`:
 When you configured a default branch in a subgroup that contains another subgroup that contains a project,
 the default branch is not inherited.
 
-We are tracking this problem in [issue 462425](https://gitlab.com/gitlab-org/gitlab/-/issues/462425).
+We are tracking this problem in [issue 327208](https://gitlab.com/gitlab-org/gitlab/-/issues/327208).
diff --git a/generator_templates/gitlab_internal_events/event_definition.yml b/generator_templates/gitlab_internal_events/event_definition.yml
deleted file mode 100644
index 713a089d8b5..00000000000
--- a/generator_templates/gitlab_internal_events/event_definition.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-description: <%= args.last %>
-internal_events: true
-action: <%= event %>
-label_description:
-property_description:
-value_description:
-extra_properties:
-identifiers:<%= event_identifiers %>
-product_section: <%= Gitlab::Analytics::GroupFetcher.section_text(options.fetch(:group)) %>
-product_stage: <%= Gitlab::Analytics::GroupFetcher.stage_text(options.fetch(:group)) %>
-product_group: <%= options.fetch(:group) %>
-milestone: "<%= milestone %>"
-introduced_by_url: <%= options.fetch(:mr) %>
-distributions:<%= distributions %>
-tiers:<%= tiers %>
diff --git a/generator_templates/gitlab_internal_events/metric_definition.yml b/generator_templates/gitlab_internal_events/metric_definition.yml
deleted file mode 100644
index 99435815891..00000000000
--- a/generator_templates/gitlab_internal_events/metric_definition.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-key_path: <%= args.second %>
-description: <%= args.last %>
-product_section: <%= Gitlab::Analytics::GroupFetcher.section_text(options.fetch(:group)) %>
-product_stage: <%= Gitlab::Analytics::GroupFetcher.stage_text(options.fetch(:group)) %>
-product_group: <%= options.fetch(:group) %>
-performance_indicator_type: []
-value_type: number
-status: active
-milestone: "<%= milestone %>"
-introduced_by_url: <%= options.fetch(:mr) %>
-time_frame: <%= args.third %>
-data_source: internal_events
-data_category: optional
-distribution:<%= distributions %>
-tier:<%= tiers %>
-options:
-  events:
-    - <%= event %>
-events:
-  - name: <%= event %><%= unique %>
diff --git a/lib/api/entities/ml/mlflow/run_info.rb b/lib/api/entities/ml/mlflow/run_info.rb
index 46634107fac..5040a4d552c 100644
--- a/lib/api/entities/ml/mlflow/run_info.rb
+++ b/lib/api/entities/ml/mlflow/run_info.rb
@@ -44,10 +44,10 @@ module API
           # Example: http://127.0.0.1:3000/api/v4/projects/20/packages/generic/ml_experiment_1/1/
           # Note: legacy format
           def generic_package_uri
-            path = api_v4_projects_packages_generic_package_version_path(
+            path = api_v4_projects_packages_generic_package_version___path___path(
               id: object.project.id, package_name: '', file_name: ''
             )
-            path = path.delete_suffix('/package_version')
+            path = path.delete_suffix('/package_version/(/path/)')
 
             [path, object.artifact_root].join('')
           end
diff --git a/lib/api/features.rb b/lib/api/features.rb
index 9142591aebd..d7d787593b9 100644
--- a/lib/api/features.rb
+++ b/lib/api/features.rb
@@ -20,7 +20,7 @@ module API
         when '0', 'false'
           false
         else
-          raise BadValueError unless params[:value].match? /^\d+(\.\d+)?$/
+          raise BadValueError unless params[:value].match?(/^\d+(\.\d+)?$/)
 
           # https://github.com/jnunemaker/flipper/blob/master/lib/flipper/typecast.rb#L47
           if params[:value].to_s.include?('.')
diff --git a/lib/api/generic_packages.rb b/lib/api/generic_packages.rb
index 56188392288..aacef907861 100644
--- a/lib/api/generic_packages.rb
+++ b/lib/api/generic_packages.rb
@@ -25,7 +25,7 @@ module API
       route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true, deploy_token_allowed: true
 
       namespace ':id/packages/generic' do
-        namespace ':package_name/*package_version/:file_name', requirements: GENERIC_PACKAGES_REQUIREMENTS do
+        namespace ':package_name/*package_version/(*path/):file_name', requirements: GENERIC_PACKAGES_REQUIREMENTS do
           desc 'Workhorse authorize generic package file' do
             detail 'This feature was introduced in GitLab 13.5'
             success code: 200
@@ -68,6 +68,7 @@ module API
           params do
             requires :package_name, type: String, desc: 'Package name', regexp: Gitlab::Regex.generic_package_name_regex, file_path: true
             requires :package_version, type: String, desc: 'Package version', regexp: Gitlab::Regex.generic_package_version_regex
+            optional :path, type: String, desc: 'File directory path', file_path: true
             requires :file_name, type: String, desc: 'Package file name', regexp: Gitlab::Regex.generic_package_file_name_regex, file_path: true
             optional :status, type: String, values: ALLOWED_STATUSES, desc: 'Package status'
             requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: 'The package file to be published (generated by Multipart middleware)', documentation: { type: 'file' }
@@ -83,8 +84,10 @@ module API
             bad_request!('File is too large') if max_file_size_exceeded?
 
             track_package_event('push_package', :generic, project: project, namespace: project.namespace)
-
-            create_package_file_params = declared_params.merge(build: current_authenticated_job)
+            create_package_file_params = declared_params.merge(
+              file_name: encoded_file_name,
+              build: current_authenticated_job
+            )
             package_file = ::Packages::Generic::CreatePackageFileService
               .new(project, current_user, create_package_file_params)
               .execute
@@ -116,6 +119,7 @@ module API
           params do
             requires :package_name, type: String, desc: 'Package name', regexp: Gitlab::Regex.generic_package_name_regex, file_path: true
             requires :package_version, type: String, desc: 'Package version', regexp: Gitlab::Regex.generic_package_version_regex
+            optional :path, type: String, desc: 'File directory path', file_path: true
             requires :file_name, type: String, desc: 'Package file name', regexp: Gitlab::Regex.generic_package_file_name_regex, file_path: true
           end
 
@@ -127,7 +131,7 @@ module API
             authorize_read_package!(project)
 
             package = ::Packages::Generic::PackageFinder.new(project).execute!(params[:package_name], params[:package_version])
-            package_file = ::Packages::PackageFileFinder.new(package, params[:file_name]).execute!
+            package_file = ::Packages::PackageFileFinder.new(package, encoded_file_name).execute!
 
             track_package_event('pull_package', :generic, project: project, namespace: project.namespace)
 
@@ -154,6 +158,11 @@ module API
           use_final_store_path: true
         }
       end
+
+      def encoded_file_name
+        file_name = [declared_params[:path], declared_params[:file_name]].compact.join('/')
+        URI.encode_uri_component(file_name)
+      end
     end
   end
 end
diff --git a/lib/bulk_imports/user_contributions_export_mapper.rb b/lib/bulk_imports/user_contributions_export_mapper.rb
new file mode 100644
index 00000000000..6f70fda71da
--- /dev/null
+++ b/lib/bulk_imports/user_contributions_export_mapper.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module BulkImports
+  class UserContributionsExportMapper
+    USER_CONTRIBUTIONS_CACHE_KEY = 'bulk_imports/%{portable_class}/%{portable_id}/user_contribution_ids'
+
+    def initialize(portable)
+      @portable_class = portable.class
+      @portable_id = portable.id
+    end
+
+    def cache_user_contributions_on_record(record)
+      return if !record || record.is_a?(User)
+
+      user_references = record.attribute_names & ::Gitlab::ImportExport::Base::RelationFactory::USER_REFERENCES
+      return if user_references.empty?
+
+      user_ids = user_references.filter_map { |reference| record.try(reference) }
+      import_cache.set_add(generate_cache_key, user_ids, timeout: timeout) if user_ids.present?
+    end
+
+    def get_contributing_users
+      user_ids = import_cache.values_from_set(generate_cache_key)
+      User.by_ids(user_ids)
+    end
+
+    def clear_cache
+      import_cache.expire(generate_cache_key, 0)
+    end
+
+    private
+
+    attr_reader :portable_class, :portable_id
+
+    def generate_cache_key
+      Kernel.format(USER_CONTRIBUTIONS_CACHE_KEY, portable_class: portable_class, portable_id: portable_id)
+    end
+
+    def import_cache
+      Gitlab::Cache::Import::Caching
+    end
+
+    def timeout
+      ::Gitlab::Cache::Import::Caching::LONGER_TIMEOUT
+    end
+  end
+end
diff --git a/lib/generators/gitlab/analytics/group_fetcher.rb b/lib/generators/gitlab/analytics/group_fetcher.rb
deleted file mode 100644
index 4a60d8f75bd..00000000000
--- a/lib/generators/gitlab/analytics/group_fetcher.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Analytics
-    class GroupFetcher
-      class << self
-        def group_unknown?(group)
-          return false if groups.empty?
-
-          !groups.has_key?(group)
-        end
-
-        def stage_text(group)
-          groups[group]&.fetch(:stage) || ''
-        end
-
-        def section_text(group)
-          groups.dig(group, :section) || ''
-        end
-
-        private
-
-        # Output looks like { "import_and_integrate" => { stage: "manage", section: "dev" } ... }
-        # Returns {} if stages.yml cannot be fetched and parsed
-        def groups
-          return @groups if @groups
-
-          response = Gitlab::HTTP.get('https://gitlab.com/gitlab-com/www-gitlab-com/raw/master/data/stages.yml')
-          raise "Unable to load stages.yml" unless response.success?
-
-          data = YAML.safe_load(response.body)
-
-          groups_data = {}
-
-          data['stages'].each do |stage_name, stage_data|
-            stage_data['groups'].each_key do |group_name|
-              groups_data[group_name] = { stage: stage_name, section: stage_data['section'] }
-            end
-          end
-
-          @groups = groups_data.sort_by { |key, _value| key }.to_h
-        rescue StandardError
-          @groups = {}
-        end
-      end
-    end
-  end
-end
diff --git a/lib/generators/gitlab/analytics/internal_events_generator.rb b/lib/generators/gitlab/analytics/internal_events_generator.rb
deleted file mode 100644
index 2e3d273b68d..00000000000
--- a/lib/generators/gitlab/analytics/internal_events_generator.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails/generators'
-
-module Gitlab
-  module Analytics
-    class InternalEventsGenerator < Rails::Generators::Base
-      TIME_FRAME_DIRS = {
-        'all' => 'counts_all',
-        '7d' => 'counts_7d',
-        '28d' => 'counts_28d'
-      }.freeze
-      TIME_FRAMES_DEFAULT = TIME_FRAME_DIRS.keys.freeze
-      TIME_FRAMES_ALLOWED_FOR_UNIQUE = (TIME_FRAMES_DEFAULT - ['all']).freeze
-
-      ALLOWED_TIERS = %w[free premium ultimate].freeze
-
-      NEGATIVE_ANSWERS = %w[no n No NO N].freeze
-      POSITIVE_ANSWERS = %w[yes y Yes YES Y].freeze
-      TOP_LEVEL_DIR = 'config'
-      TOP_LEVEL_DIR_EE = 'ee'
-      DESCRIPTION_MIN_LENGTH = 50
-
-      DESCRIPTION_INQUIRY = %(
-        Please describe in at least #{DESCRIPTION_MIN_LENGTH} characters
-        what %{entity} %{entity_type} represents,
-        consider mentioning: %{considerations}.
-        Your answer will be processed by a full-text search tool and help others find and reuse this %{entity_type}.
-      ).freeze
-
-      source_root File.expand_path('../../../../generator_templates/gitlab_internal_events', __dir__)
-
-      desc 'Generates metric definitions and event definition yml files'
-
-      class_option :skip_namespace,
-        hide: true
-      class_option :skip_collision_check,
-        hide: true
-      class_option :time_frames,
-        optional: true,
-        type: :array,
-        banner: TIME_FRAMES_DEFAULT,
-        desc: "Indicates the metrics time frames. Please select one or more from: #{TIME_FRAMES_DEFAULT}"
-      class_option :tiers,
-        optional: true,
-        default: ALLOWED_TIERS,
-        type: :array,
-        banner: ALLOWED_TIERS,
-        desc: "Indicates the metric's GitLab subscription tiers. Please select one or more from: #{ALLOWED_TIERS}"
-      class_option :group,
-        type: :string,
-        optional: false,
-        desc: "Name of group that added this metric. " \
-              "See https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/stages.yml"
-      class_option :mr,
-        type: :string,
-        optional: false,
-        desc: 'Merge Request that adds this metric'
-      class_option :event,
-        type: :string,
-        optional: false,
-        desc: 'Name of the event that this metric counts'
-      class_option :unique,
-        type: :string,
-        optional: true,
-        desc: 'Name of the event property that this metric counts'
-
-      def create_metric_file
-        validate!
-
-        unless event_exists?
-          template "event_definition.yml",
-            event_file_path(event),
-            ask_description(event, "event", "what the event is supposed to track, where, and when")
-        end
-
-        time_frames.each do |time_frame|
-          template "metric_definition.yml",
-            metric_file_path(time_frame),
-            key_path(time_frame),
-            time_frame,
-            ask_description(
-              key_path(time_frame),
-              "metric",
-              "events, and event attributes in the description"
-            )
-        end
-      end
-
-      private
-
-      def event_identifiers
-        return unless include_default_event_properties?
-
-        "\n- project\n- user\n- namespace"
-      end
-
-      def include_default_event_properties?
-        question = <<~DESC
-        By convention all events automatically include the following properties:
-        * environment: string,
-        * source: string (eg: ruby, javascript)
-        * user_id: number
-        * project_id: number
-        * namespace_id: number
-        * plan: string (eg: free, premium, ultimate)
-        Would you like to add default properties to the event? Y(es)/N(o)
-        DESC
-
-        answer = Gitlab::TaskHelpers.prompt(question, POSITIVE_ANSWERS + NEGATIVE_ANSWERS)
-        POSITIVE_ANSWERS.include?(answer)
-      end
-
-      def event_file_path(event)
-        path = File.join(TOP_LEVEL_DIR, 'events', "#{event}.yml")
-        path = File.join(TOP_LEVEL_DIR_EE, path) unless free?
-        path
-      end
-
-      def event
-        options[:event]
-      end
-
-      def unique
-        return unless with_unique?
-
-        "\n    unique: #{options.fetch(:unique)}"
-      end
-
-      def ask_description(entity, type, considerations)
-        say("")
-        desc = ask(format(DESCRIPTION_INQUIRY, entity: entity, entity_type: type, considerations: considerations))
-
-        while desc.length < DESCRIPTION_MIN_LENGTH
-          error_msg = <<~ERROR
-            Provided description is too short: #{desc.length} of required #{DESCRIPTION_MIN_LENGTH} characters
-          ERROR
-
-          say(set_color(error_msg, :red))
-
-          desc = ask("Please provide description that is #{DESCRIPTION_MIN_LENGTH} characters long.\n")
-        end
-        desc
-      end
-
-      def distributions
-        dist = "\n"
-        dist += "- ce\n" if free?
-
-        "#{dist}- ee"
-      end
-
-      def tiers
-        "\n- #{options[:tiers].join("\n- ")}"
-      end
-
-      def milestone
-        Gitlab::VERSION.match('(\d+\.\d+)').captures.first
-      end
-
-      def class_name
-        with_unique? ? 'RedisHLLMetric' : 'TotalCountMetric'
-      end
-
-      def key_path(time_frame)
-        return "count_distinct_#{options[:unique].sub('.', '_')}_from_#{event}_#{time_frame}" if with_unique?
-
-        "count_total_#{event}_#{time_frame}"
-      end
-
-      def metric_file_path(time_frame)
-        path = File.join(TOP_LEVEL_DIR, 'metrics', TIME_FRAME_DIRS[time_frame], "#{key_path(time_frame)}.yml")
-        path = File.join(TOP_LEVEL_DIR_EE, path) unless free?
-        path
-      end
-
-      def validate!
-        validate_tiers!
-
-        %i[event mr group].each do |option|
-          raise "The option: --#{option} is  missing" unless options.key? option
-        end
-
-        raise "Unknown group" if GroupFetcher.group_unknown?(options[:group])
-
-        time_frames.each do |time_frame|
-          validate_time_frame!(time_frame)
-
-          validate_key_path!(time_frame)
-        end
-      end
-
-      def validate_time_frame!(time_frame)
-        unless TIME_FRAME_DIRS.key?(time_frame)
-          raise "Invalid time frame: #{time_frame}, allowed options are: #{TIME_FRAMES_DEFAULT}"
-        end
-
-        invalid_time_frame = with_unique? && TIME_FRAMES_ALLOWED_FOR_UNIQUE.exclude?(time_frame)
-
-        raise "Invalid time frame: #{time_frame} for a metric using `unique`" if invalid_time_frame
-      end
-
-      def validate_tiers!
-        wrong_tiers = options[:tiers] - ALLOWED_TIERS
-        unless wrong_tiers.empty?
-          raise "Tiers option included not allowed values: #{wrong_tiers}. Only allowed values are: #{ALLOWED_TIERS}"
-        end
-
-        return unless options[:tiers].empty?
-
-        raise "At least one tier must be present. Please set --tiers option"
-      end
-
-      def validate_key_path!(time_frame)
-        return unless metric_definition_exists?(time_frame)
-
-        raise "Metric definition with key path '#{key_path(time_frame)}' already exists"
-      end
-
-      def event_exists?
-        return true if ::Gitlab::UsageDataCounters::HLLRedisCounter.known_event?(event)
-
-        existing_events_from_definitions.include?(event)
-      end
-
-      def existing_events_from_definitions
-        events_glob_path = File.join(TOP_LEVEL_DIR, 'events', "*.yml")
-        ee_events_glob_path = File.join(TOP_LEVEL_DIR_EE, events_glob_path)
-
-        [ee_events_glob_path, events_glob_path].flat_map do |glob_path|
-          Dir.glob(glob_path).map do |path|
-            YAML.safe_load(File.read(path))["action"]
-          end
-        end
-      end
-
-      def with_unique?
-        options.key?(:unique)
-      end
-
-      def free?
-        options[:tiers].include? "free"
-      end
-
-      def time_frames
-        @time_frames ||= options[:time_frames] || default_time_frames
-      end
-
-      def default_time_frames
-        with_unique? ? TIME_FRAMES_ALLOWED_FOR_UNIQUE : TIME_FRAMES_DEFAULT
-      end
-
-      def directory
-        @directory ||= TIME_FRAME_DIRS.find { |d| d.match?(input_dir) }
-      end
-
-      def metric_definitions
-        @definitions ||= Gitlab::Usage::MetricDefinition.definitions
-      end
-
-      def metric_definition_exists?(time_frame)
-        metric_definitions[key_path(time_frame)].present?
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/import_export/base/relation_factory.rb b/lib/gitlab/import_export/base/relation_factory.rb
index 966fd15270e..1711dd169a5 100644
--- a/lib/gitlab/import_export/base/relation_factory.rb
+++ b/lib/gitlab/import_export/base/relation_factory.rb
@@ -8,7 +8,7 @@ module Gitlab
 
         IMPORTED_OBJECT_MAX_RETRIES = 5
 
-        OVERRIDES = {}.freeze
+        OVERRIDES = { user_contributions: :user }.freeze
         EXISTING_OBJECT_RELATIONS = %i[].freeze
 
         # This represents all relations that have unique key on `project_id` or `group_id`
@@ -41,6 +41,9 @@ module Gitlab
           # There are scenarios where the model is pluralized (e.g.
           # MergeRequest::Metrics), and we don't want to force it to singular
           # with #classify.
+          overridden_relation = OVERRIDES.with_indifferent_access[relation_name]
+          relation_name = overridden_relation if overridden_relation
+
           relation_name.to_s.classify.constantize
         rescue NameError
           relation_name.to_s.constantize
diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml
index 7a91cfb340a..b5b5c07e2e5 100644
--- a/lib/gitlab/import_export/group/import_export.yml
+++ b/lib/gitlab/import_export/group/import_export.yml
@@ -15,12 +15,17 @@ tree:
     - members:
       - :user
     - :namespace_settings
+    - :user_contributions
 
 included_attributes:
   user:
     - :id
     - :public_email
     - :username
+  user_contributions:
+    - :public_email
+    - :username
+    - :name
   author:
     - :name
   namespace_settings:
diff --git a/lib/gitlab/import_export/group/relation_factory.rb b/lib/gitlab/import_export/group/relation_factory.rb
index 664ef5358ef..a97e8a32ad7 100644
--- a/lib/gitlab/import_export/group/relation_factory.rb
+++ b/lib/gitlab/import_export/group/relation_factory.rb
@@ -8,7 +8,8 @@ module Gitlab
           labels: :group_labels,
           label: :group_label,
           parent: :epic,
-          iterations_cadences: 'Iterations::Cadence'
+          iterations_cadences: 'Iterations::Cadence',
+          user_contributions: :user
         }.freeze
 
         EXISTING_OBJECT_RELATIONS = %i[
diff --git a/lib/gitlab/import_export/json/streaming_serializer.rb b/lib/gitlab/import_export/json/streaming_serializer.rb
index b951f0de3de..1ea68fcfa8b 100644
--- a/lib/gitlab/import_export/json/streaming_serializer.rb
+++ b/lib/gitlab/import_export/json/streaming_serializer.rb
@@ -5,6 +5,7 @@ module Gitlab
     module Json
       class StreamingSerializer
         include Gitlab::ImportExport::CommandLineUtil
+        include Gitlab::Utils::StrongMemoize
 
         BATCH_SIZE = 100
         SMALLER_BATCH_SIZE = 2
@@ -176,6 +177,8 @@ module Gitlab
               items << exportable_json_record(record, options, key)
 
               increment_exported_objects_counter
+
+              after_read_callback(record)
             end
           end
 
@@ -187,6 +190,8 @@ module Gitlab
 
           json = exportable_json_record(record, options, key)
 
+          after_read_callback(record)
+
           json_writer.write_relation(@exportable_path, key, json)
 
           increment_exported_objects_counter
@@ -252,6 +257,10 @@ module Gitlab
         end
 
         def after_read_callback(record)
+          if Feature.enabled?(:bulk_import_user_mapping, exportable)
+            user_contributions_export_mapper.cache_user_contributions_on_record(record)
+          end
+
           remove_cached_external_diff(record)
         end
 
@@ -261,6 +270,11 @@ module Gitlab
           record.merge_request_diff&.remove_cached_external_diff
         end
 
+        def user_contributions_export_mapper
+          BulkImports::UserContributionsExportMapper.new(exportable)
+        end
+        strong_memoize_attr :user_contributions_export_mapper
+
         def log_base_data
           log = { importer: 'Import/Export' }
           log.merge!(Gitlab::ImportExport::LogUtil.exportable_to_log_payload(exportable))
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index 22cf8962be9..2e035d1cf9b 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -122,6 +122,7 @@ tree:
         - label:
           - :priorities
     - :service_desk_setting
+    - :user_contributions
   group_members:
     - :user
 
@@ -146,6 +147,10 @@ included_attributes:
     - :id
     - :public_email
     - :username
+  user_contributions:
+    - :public_email
+    - :username
+    - :name
   author:
     - :name
   approvals:
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb
index bb84de94363..fccc570c881 100644
--- a/lib/gitlab/import_export/project/relation_factory.rb
+++ b/lib/gitlab/import_export/project/relation_factory.rb
@@ -41,7 +41,8 @@ module Gitlab
                       commit_author: 'MergeRequest::DiffCommitUser',
                       committer: 'MergeRequest::DiffCommitUser',
                       merge_request_diff_commits: 'MergeRequestDiffCommit',
-                      work_item_type: 'WorkItems::Type' }.freeze
+                      work_item_type: 'WorkItems::Type',
+                      user_contributions: 'User' }.freeze
 
         BUILD_MODELS = %i[Ci::Build Ci::Bridge commit_status generic_commit_status].freeze
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c2c297f2aea..736ba58b3ee 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -31777,6 +31777,12 @@ msgstr ""
 msgid "MemberRole|Permissions"
 msgstr ""
 
+msgid "MemberRole|Role"
+msgstr ""
+
+msgid "MemberRole|Role details"
+msgstr ""
+
 msgid "MemberRole|Role is assigned to one or more group members. Remove role from all group members, then delete role."
 msgstr ""
 
@@ -31798,6 +31804,9 @@ msgstr ""
 msgid "MemberRole|To delete custom role, remove role from all group members."
 msgstr ""
 
+msgid "MemberRole|View permissions"
+msgstr ""
+
 msgid "MemberRole|You can create a custom role by adding specific %{linkStart}permissions to a base role.%{linkEnd}"
 msgstr ""
 
diff --git a/scripts/internal_events/cli/event.rb b/scripts/internal_events/cli/event.rb
index fecc490b4cc..792a2426e29 100755
--- a/scripts/internal_events/cli/event.rb
+++ b/scripts/internal_events/cli/event.rb
@@ -12,8 +12,6 @@ module InternalEventsCli
     :value_type,
     :extra_properties,
     :identifiers,
-    :product_section,
-    :product_stage,
     :product_group,
     :milestone,
     :introduced_by_url,
@@ -23,8 +21,6 @@ module InternalEventsCli
 
   EVENT_DEFAULTS = {
     internal_events: true,
-    product_section: nil,
-    product_stage: nil,
     product_group: nil,
     introduced_by_url: 'TODO'
   }.freeze
diff --git a/scripts/internal_events/cli/event_definer.rb b/scripts/internal_events/cli/event_definer.rb
index 6e8d9a096c6..559031b1890 100755
--- a/scripts/internal_events/cli/event_definer.rb
+++ b/scripts/internal_events/cli/event_definer.rb
@@ -44,7 +44,7 @@ module InternalEventsCli
       prompt_for_action
       prompt_for_identifiers
       prompt_for_url
-      prompt_for_product_ownership
+      prompt_for_product_group
       prompt_for_tier
 
       outcome = create_event_file
@@ -105,16 +105,12 @@ module InternalEventsCli
       event.introduced_by_url = prompt_for_text('Which MR URL will merge the event definition?')
     end
 
-    def prompt_for_product_ownership
+    def prompt_for_product_group
       new_page!(5, 7, STEPS)
 
-      ownership = prompt_for_group_ownership({
-        product_section: 'Which section will own the event?',
-        product_stage: 'Which stage will own the event?',
-        product_group: 'Which group will own the event?'
-      })
+      product_group = prompt_for_group_ownership('Which group will own the event?')
 
-      event.bulk_assign(ownership)
+      event.product_group = product_group
     end
 
     def prompt_for_tier
diff --git a/scripts/internal_events/cli/helpers/group_ownership.rb b/scripts/internal_events/cli/helpers/group_ownership.rb
index 9846f0ca2f5..659864f701e 100755
--- a/scripts/internal_events/cli/helpers/group_ownership.rb
+++ b/scripts/internal_events/cli/helpers/group_ownership.rb
@@ -6,65 +6,86 @@ module InternalEventsCli
     module GroupOwnership
       STAGES_YML = 'https://gitlab.com/gitlab-com/www-gitlab-com/-/raw/master/data/stages.yml'
 
-      def prompt_for_group_ownership(messages, defaults = {})
-        groups = fetch_group_choices
-
-        if groups
-          prompt_for_ownership_from_ssot(messages[:product_group], defaults, groups)
+      def prompt_for_group_ownership(message, defaults = {})
+        if available_groups.any?
+          prompt_for_ownership_from_ssot(message, defaults)
         else
-          prompt_for_ownership_manually(messages, defaults)
+          prompt_for_ownership_manually(message, defaults)
         end
       end
 
+      def find_stage(group)
+        available_groups[group]&.fetch(:stage)
+      end
+
+      def find_section(group)
+        available_groups[group]&.fetch(:section)
+      end
+
       private
 
-      def prompt_for_ownership_from_ssot(prompt, defaults, groups)
-        sorted_defaults = defaults.values_at(:product_section, :product_stage, :product_group)
-        default = sorted_defaults.join(':')
+      def prompt_for_ownership_from_ssot(prompt, defaults)
+        sorted_defaults = defaults.values_at(:section, :stage, :product_group)
+        group = sorted_defaults.last
+        default = sorted_defaults.compact.join(':') # compact because not all groups have a section
 
-        cli.select(prompt, groups, **select_opts, **filter_opts) do |menu|
-          if sorted_defaults.all?
-            if groups.any? { |group| group[:name] == default }
+        cli.select(prompt, group_choices, **select_opts, **filter_opts) do |menu|
+          if group
+            if available_groups[group]
               # We have a complete group selection -> set as default in menu
               menu.default(default)
             else
-              cli.error format_error(">>> Failed to find group matching #{default}. Select another.\n")
+              cli.error format_error(">>> Failed to find group matching #{group}. Select another.\n")
             end
-          elsif sorted_defaults.any?
-            # We have a partial selection -> filter the list by the most unique field
-            menu.instance_variable_set(:@filter, sorted_defaults.compact.last.split(''))
+          elsif default
+            # We have a section and/or stage in common
+            menu.instance_variable_set(:@filter, default.split(''))
           end
         end
       end
 
-      def prompt_for_ownership_manually(messages, defaults)
-        {
-          product_section: prompt_for_text(messages[:product_section], defaults[:product_section]),
-          product_stage: prompt_for_text(messages[:product_stage], defaults[:product_stage]),
-          product_group: prompt_for_text(messages[:product_group], defaults[:product_group])
-        }
+      def prompt_for_ownership_manually(message, defaults)
+        prompt_for_text(message, defaults[:product_group])
       end
 
       # @return Array[<Hash - matches #prompt_for_ownership_manually output format>]
-      def fetch_group_choices
-        response = Timeout.timeout(5) { Net::HTTP.get(URI(STAGES_YML)) }
-        stages = YAML.safe_load(response)
-
-        stages['stages'].flat_map do |stage, value|
-          value['groups'].map do |group, _|
-            section = value['section']
-
-            {
-              name: [section, stage, group].join(':'),
-              value: {
-                product_group: group,
-                product_section: section,
-                product_stage: stage
-              }
-            }
-          end
+      def group_choices
+        available_groups.map do |group, ownership|
+          {
+            name: ownership.values_at(:section, :stage, :group).compact.join(':'),
+            value: group
+          }
         end
+      end
+
+      # Output looks like:
+      #   {
+      #     "import_and_integrate" => { stage: "manage", section: "dev", group: "import_and_integrate" },
+      #     ...
+      #   }
+      def available_groups
+        # rubocop:disable Gitlab/ModuleWithInstanceVariables -- memoization is acceptable use
+        # https://docs.gitlab.com/ee/development/module_with_instance_variables.html#acceptable-use
+        return @available_groups if @available_groups
+
+        response = Timeout.timeout(5) { Net::HTTP.get(URI(STAGES_YML)) }
+        data = YAML.safe_load(response)
+
+        @available_groups = data['stages'].flat_map do |stage_name, stage_data|
+          stage_data['groups'].map do |group_name, _|
+            [
+              group_name,
+              {
+                group: group_name,
+                stage: stage_name,
+                section: stage_data['section']
+              }
+            ]
+          end
+        end.to_h
       rescue StandardError
+        @available_groups = {}
+        # rubocop:enable Gitlab/ModuleWithInstanceVariables
       end
     end
   end
diff --git a/scripts/internal_events/cli/metric.rb b/scripts/internal_events/cli/metric.rb
index 5bb46d3d136..d7af021179e 100755
--- a/scripts/internal_events/cli/metric.rb
+++ b/scripts/internal_events/cli/metric.rb
@@ -4,8 +4,6 @@ module InternalEventsCli
   NEW_METRIC_FIELDS = [
     :key_path,
     :description,
-    :product_section,
-    :product_stage,
     :product_group,
     :performance_indicator_type,
     :value_type,
@@ -31,8 +29,6 @@ module InternalEventsCli
   ].freeze
 
   METRIC_DEFAULTS = {
-    product_section: nil,
-    product_stage: nil,
     product_group: nil,
     introduced_by_url: 'TODO',
     value_type: 'number',
diff --git a/scripts/internal_events/cli/metric_definer.rb b/scripts/internal_events/cli/metric_definer.rb
index afd8d36dfa1..f5aca88e0c0 100755
--- a/scripts/internal_events/cli/metric_definer.rb
+++ b/scripts/internal_events/cli/metric_definer.rb
@@ -40,7 +40,7 @@ module InternalEventsCli
 
       prompt_for_description
       defaults = prompt_for_copying_event_properties
-      prompt_for_product_ownership(defaults)
+      prompt_for_product_group(defaults)
       prompt_for_url(defaults)
       prompt_for_tier(defaults)
       outcomes = create_metric_files
@@ -172,9 +172,12 @@ module InternalEventsCli
 
     # Check existing event files for attributes to copy over
     def prompt_for_copying_event_properties
-      defaults = collect_values_for_shared_event_properties
+      shared_values = collect_values_for_shared_event_properties
+      defaults = shared_values.except(:stage, :section)
 
-      return {} if defaults.none?
+      return {} if shared_values.none?
+
+      return shared_values if defaults.none?
 
       new_page!(5, 9, STEPS)
 
@@ -192,7 +195,7 @@ module InternalEventsCli
         menu.choice 'Modify attributes'
       end
 
-      defaults
+      shared_values
     end
 
     def collect_values_for_shared_event_properties
@@ -200,9 +203,9 @@ module InternalEventsCli
 
       selected_events.each do |event|
         fields[:introduced_by_url] << event.introduced_by_url
-        fields[:product_section] << event.product_section
-        fields[:product_stage] << event.product_stage
         fields[:product_group] << event.product_group
+        fields[:stage] << find_stage(event.product_group)
+        fields[:section] << find_section(event.product_group)
         fields[:distribution] << event.distributions&.sort
         fields[:tier] << event.tiers&.sort
       end
@@ -215,18 +218,11 @@ module InternalEventsCli
       end
     end
 
-    def prompt_for_product_ownership(defaults)
-      assign_shared_attrs(:product_section, :product_stage, :product_group) do
+    def prompt_for_product_group(defaults)
+      assign_shared_attr(:product_group) do
         new_page!(6, 9, STEPS)
 
-        prompt_for_group_ownership(
-          {
-            product_section: 'Which section owns the metric?',
-            product_stage: 'Which stage owns the metric?',
-            product_group: 'Which group owns the metric?'
-          },
-          defaults.slice(:product_section, :product_stage, :product_group)
-        )
+        prompt_for_group_ownership('Which group owns the metric?', defaults)
       end
     end
 
diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping
index e053339c02a..b2f2dbb2904 100755
--- a/scripts/verify-tff-mapping
+++ b/scripts/verify-tff-mapping
@@ -80,12 +80,39 @@ tests = [
     expected: ['spec/rubocop/cop/gettext/static_identifier_spec.rb']
   },
 
+  {
+    explanation: 'Map Ruby config to respective specs',
+    changed_file: 'config/application.rb',
+    expected: ['spec/config/application_spec.rb']
+  },
+  {
+    explanation: 'Map YAML config to respective specs',
+    changed_file: 'config/mail_room.yml',
+    expected: ['spec/config/mail_room_spec.rb']
+  },
+
   {
     explanation: 'Initializers should map to respective spec',
     changed_file: 'config/initializers/action_mailer_hooks.rb',
     expected: ['spec/initializers/action_mailer_hooks_spec.rb']
   },
 
+  {
+    explanation: 'FOSS Snowplow definitions map to event validation spec',
+    changed_file: 'config/events/status_page_incident_unpublished.yml',
+    expected: ['spec/lib/gitlab/tracking/event_definition_validate_all_spec.rb']
+  },
+  {
+    explanation: 'EE Snowplow definitions map to event validation spec',
+    changed_file: 'ee/config/events/licenses_list_viewed.yml',
+    expected: ['spec/lib/gitlab/tracking/event_definition_validate_all_spec.rb']
+  },
+  {
+    explanation: 'Snowplow schema maps to event validation spec',
+    changed_file: 'config/events/schema.json',
+    expected: ['spec/lib/gitlab/tracking/event_definition_validate_all_spec.rb']
+  },
+
   {
     explanation: 'DB structure should map to schema spec',
     changed_file: 'db/structure.sql',
@@ -432,8 +459,8 @@ if failed_tests.any?
   exit 1
 end
 
-bad_sources = YAML.load_file(mapping_file)['mapping'].filter_map do |map|
-  Array(map['source']).any? { |source| source.match(/(?<!\\)\.\w+\z/)&.string }
+bad_sources = YAML.load_file(mapping_file)['mapping'].flat_map do |map|
+  Array(map['source']).filter_map { |source| source.match(/(?<!\\)\.\w+\z/)&.string }
 end
 
 if bad_sources.any?
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb
index f801f93686c..f488ddebbbf 100644
--- a/spec/features/atom/users_spec.rb
+++ b/spec/features/atom/users_spec.rb
@@ -79,7 +79,7 @@ RSpec.describe "User Feed", feature_category: :devops_reports do
       end
 
       it 'has XHTML summaries in notes' do
-        expect(body).to match /Bug confirmed <gl-emoji[^>]*>/
+        expect(body).to match(/Bug confirmed <gl-emoji[^>]*>/)
       end
 
       it 'has XHTML summaries in merge request descriptions' do
diff --git a/spec/features/groups/members/manage_groups_spec.rb b/spec/features/groups/members/manage_groups_spec.rb
index 9531ebd3c35..5eefeeda1c5 100644
--- a/spec/features/groups/members/manage_groups_spec.rb
+++ b/spec/features/groups/members/manage_groups_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe 'Groups > Members > Manage groups', :js, feature_category: :group
   let_it_be(:user) { create(:user) }
 
   before do
+    stub_feature_flags(show_role_details_in_drawer: false)
     sign_in(user)
   end
 
diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index 000a44492a6..f2af908828d 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe 'Groups > Members > Manage members', feature_category: :groups_an
   let_it_be(:group) { create(:group) }
 
   before do
+    stub_feature_flags(show_role_details_in_drawer: false)
     sign_in(user1)
   end
 
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
index 8a93a768e97..239e8914c74 100644
--- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
@@ -180,7 +180,7 @@ RSpec.describe 'User creates branch and merge request on issue page', :js, featu
         it 'disables the create branch button', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/27985' do
           expect(page).to have_css('.create-mr-dropdown-wrap .unavailable:not(.hidden)')
           expect(page).to have_css('.create-mr-dropdown-wrap .available.hidden', visible: false)
-          expect(page).to have_content /Related merge requests/
+          expect(page).to have_content(/Related merge requests/)
         end
       end
 
diff --git a/spec/features/issues/user_creates_issue_spec.rb b/spec/features/issues/user_creates_issue_spec.rb
index 09114ba4b80..4e526564571 100644
--- a/spec/features/issues/user_creates_issue_spec.rb
+++ b/spec/features/issues/user_creates_issue_spec.rb
@@ -153,7 +153,7 @@ RSpec.describe "User creates issue", feature_category: :team_planning do
       it "doesn't add double newline to end of a single attachment markdown" do
         dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
 
-        expect(page.find_field("issue_description").value).not_to match /\n\n$/
+        expect(page.find_field("issue_description").value).not_to match(/\n\n$/)
       end
 
       it "cancels a file upload correctly", :capybara_ignore_server_errors do
diff --git a/spec/features/projects/members/groups_with_access_list_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb
index 439c2f1a28a..0b859919645 100644
--- a/spec/features/projects/members/groups_with_access_list_spec.rb
+++ b/spec/features/projects/members/groups_with_access_list_spec.rb
@@ -18,6 +18,7 @@ RSpec.describe 'Projects > Members > Groups with access list', :js, feature_cate
 
   before do
     travel_to Time.now.utc.beginning_of_day
+    stub_feature_flags(show_role_details_in_drawer: false)
 
     project.add_maintainer(user)
     sign_in(user)
diff --git a/spec/features/projects/members/manage_members_spec.rb b/spec/features/projects/members/manage_members_spec.rb
index e6b6241c2fe..59c3d51415f 100644
--- a/spec/features/projects/members/manage_members_spec.rb
+++ b/spec/features/projects/members/manage_members_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe 'Projects > Members > Manage members', :js, feature_category: :on
     project.add_owner(project_owner)
     group.add_owner(group_owner)
 
+    stub_feature_flags(show_role_details_in_drawer: false)
     sign_in(group_owner)
   end
 
diff --git a/spec/finders/user_group_notification_settings_finder_spec.rb b/spec/finders/user_group_notification_settings_finder_spec.rb
index 83d0d343c04..66bd2bf92dd 100644
--- a/spec/finders/user_group_notification_settings_finder_spec.rb
+++ b/spec/finders/user_group_notification_settings_finder_spec.rb
@@ -71,22 +71,6 @@ RSpec.describe UserGroupNotificationSettingsFinder, feature_category: :team_plan
         end
       end
 
-      context 'when the group has parent_id set but that does not belong to any group' do
-        let_it_be(:group) { create(:group) }
-        let_it_be(:groups) { [group] }
-
-        before do
-          # Let's set a parent_id for a group that definitely doesn't exist
-          group.update_columns(parent_id: 19283746)
-        end
-
-        it 'returns a default Global notification setting' do
-          expect(subject.count).to eq(1)
-          expect(attributes(&:level)).to match_array(['global'])
-          expect(attributes(&:notification_email)).to match_array([nil])
-        end
-      end
-
       context 'when the group has a private parent' do
         let_it_be(:ancestor) { create(:group, :private) }
         let_it_be(:group) { create(:group, :private, parent: ancestor) }
diff --git a/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml b/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml
index 482ca841d37..0155bbd6c80 100644
--- a/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml
+++ b/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml
@@ -2,8 +2,6 @@
 description: Internal Event CLI is opened
 internal_events: true
 action: internal_events_cli_opened
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 milestone: '16.6'
 introduced_by_url: TODO
diff --git a/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml b/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml
index 59572589de1..3841530ca5d 100644
--- a/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml
+++ b/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml
@@ -6,8 +6,6 @@ identifiers:
 - project
 - namespace
 - user
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 milestone: '16.6'
 introduced_by_url: TODO
diff --git a/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml b/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml
index f3de8f957ec..f0a3b932084 100644
--- a/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml
+++ b/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml
@@ -6,8 +6,6 @@ identifiers:
 - project
 - namespace
 - user
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 milestone: '16.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143433
diff --git a/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml b/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml
index 1f9b6e5e86c..6a6b9fa5eae 100644
--- a/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml
+++ b/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml
@@ -6,8 +6,6 @@ identifiers:
 - project
 - namespace
 - user
-product_section: core_platform
-product_stage: manage
 product_group: import_and_integrate
 milestone: '16.6'
 introduced_by_url: TODO
diff --git a/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml b/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml
index 41720dc68b2..ce1633cdf3f 100644
--- a/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml
+++ b/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml
@@ -6,8 +6,6 @@ identifiers:
 - project
 - namespace
 - user
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 milestone: '16.6'
 introduced_by_url: TODO
diff --git a/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml
index 647fe9e04b2..4e3f2918031 100644
--- a/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_internal_events_cli_used_monthly
 description: Monthly count of when an event was defined using the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml
index 700b4610618..b9bb0c3580c 100644
--- a/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_internal_events_cli_used_weekly
 description: Weekly count of when an event was defined using the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml
index b9c918e9a9d..91297eb80f2 100644
--- a/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_internal_events_cli_used
 description: Total count of when an event was defined using the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml
index a0aa259e207..03f1a41dfec 100644
--- a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_random_name_monthly
 description: Monthly count of unique users random metric string
-product_section: core_platform
-product_stage: manage
 product_group: import_and_integrate
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml
index d3e3f91e51a..efa1df68b72 100644
--- a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_random_name_weekly
 description: Weekly count of unique users random metric string
-product_section: core_platform
-product_stage: manage
 product_group: import_and_integrate
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml b/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml
index 09f23b07b17..d6b2a0c40bf 100644
--- a/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_project_id_from_internal_events_cli_closed_and_internal_events_cli_used_monthly
 description: Monthly count of unique projects where a defition file was created with the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml b/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml
index 5b6ebcfb11a..9df22f38254 100644
--- a/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_project_id_from_internal_events_cli_closed_and_internal_events_cli_used_weekly
 description: Weekly count of unique projects where a defition file was created with the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml
index a4f8ffb54c1..6a07c346ca5 100644
--- a/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_internal_events_cli_used
 description: Total count of when an event was defined using the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml
index 1b96ecd40b1..d866143a50b 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_internal_events_cli_used_monthly
 description: Monthly count of unique users who defined an internal event using the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml
index 5e34991a87d..d0f4edc384b 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_internal_events_cli_used_weekly
 description: Weekly count of unique users who defined an internal event using the CLI
-product_section: analytics
-product_stage: monitor
 product_group: analytics_instrumentation
 performance_indicator_type: []
 value_type: number
diff --git a/spec/fixtures/scripts/internal_events/new_metrics.yml b/spec/fixtures/scripts/internal_events/new_metrics.yml
index 2a207ee84f4..d05b05a2712 100644
--- a/spec/fixtures/scripts/internal_events/new_metrics.yml
+++ b/spec/fixtures/scripts/internal_events/new_metrics.yml
@@ -118,7 +118,7 @@
     - "\n" # Select: Total count of events
     - "when an event was defined using the CLI\n" # Input description
     - "2\n" # Enum-select: Modify attributes
-    - "\n" # Accept group/section/stage from event definition
+    - "\n" # Accept group from event definition
     - "\n" # Accept URL from event definition
     - "2\n" # Override tier -> Select: [premium, ultimate]
     - "y\n" # Create file
diff --git a/spec/frontend/design_management/components/design_sidebar_spec.js b/spec/frontend/design_management/components/design_sidebar_spec.js
index ec72d620793..2851ac24980 100644
--- a/spec/frontend/design_management/components/design_sidebar_spec.js
+++ b/spec/frontend/design_management/components/design_sidebar_spec.js
@@ -5,7 +5,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue';
 import DesignNoteSignedOut from '~/design_management/components/design_notes/design_note_signed_out.vue';
 import DesignSidebar from '~/design_management/components/design_sidebar.vue';
-import DesignDisclosure from '~/design_management/components/design_disclosure.vue';
+import DesignDisclosure from '~/vue_shared/components/design_management/design_disclosure.vue';
 import DescriptionForm from '~/design_management/components/design_description/description_form.vue';
 import updateActiveDiscussionMutation from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql';
 import design from '../mock_data/design';
diff --git a/spec/frontend/members/components/table/members_table_spec.js b/spec/frontend/members/components/table/members_table_spec.js
index c676675773d..242efbbbabe 100644
--- a/spec/frontend/members/components/table/members_table_spec.js
+++ b/spec/frontend/members/components/table/members_table_spec.js
@@ -1,7 +1,8 @@
-import { GlTable } from '@gitlab/ui';
-import Vue from 'vue';
+import { GlTable, GlLink, GlBadge } from '@gitlab/ui';
+import Vue, { nextTick } from 'vue';
 // eslint-disable-next-line no-restricted-imports
 import Vuex from 'vuex';
+import { cloneDeep } from 'lodash';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import CreatedAt from '~/members/components/table/created_at.vue';
 import ExpirationDatepicker from '~/members/components/table/expiration_datepicker.vue';
@@ -12,6 +13,7 @@ import MemberActivity from '~/members/components/table/member_activity.vue';
 import MembersTable from '~/members/components/table/members_table.vue';
 import MembersPagination from '~/members/components/table/members_pagination.vue';
 import MaxRole from '~/members/components/table/max_role.vue';
+import RoleDetailsDrawer from '~/members/components/table/role_details_drawer.vue';
 import {
   MEMBER_TYPES,
   MEMBER_STATE_CREATED,
@@ -56,7 +58,7 @@ describe('MembersTable', () => {
     });
   };
 
-  const createComponent = (state, provide = {}) => {
+  const createComponent = (state, { showRoleDetailsInDrawer = true } = {}) => {
     wrapper = mountExtended(MembersTable, {
       propsData: {
         tabQueryParamValue: TAB_QUERY_PARAM_VALUES.invite,
@@ -69,22 +71,21 @@ describe('MembersTable', () => {
         namespace: MEMBER_TYPES.invite,
         namespaceReachedLimit: false,
         namespaceUserLimit: 1,
-        ...provide,
+        glFeatures: { showRoleDetailsInDrawer },
+      },
+      stubs: {
+        RemoveGroupLinkModal: true,
+        RemoveMemberModal: true,
+        MemberActions: true,
+        MaxRole: true,
       },
-      stubs: [
-        'member-avatar',
-        'member-source',
-        'created-at',
-        'member-actions',
-        'max-role',
-        'remove-group-link-modal',
-        'remove-member-modal',
-        'expiration-datepicker',
-      ],
     });
   };
 
   const findTable = () => wrapper.findComponent(GlTable);
+  const findRoleDetailsDrawer = () => wrapper.findComponent(RoleDetailsDrawer);
+  const findMaxRoleLink = () => wrapper.findByTestId('max-role').findComponent(GlLink);
+  const findCustomRoleBadge = () => wrapper.findByTestId('max-role').findComponent(GlBadge);
   const findTableCellByMemberId = (tableCellLabel, memberId) =>
     wrapper
       .findByTestId(`members-table-row-${memberId}`)
@@ -96,7 +97,7 @@ describe('MembersTable', () => {
       canUpdate: true,
     };
 
-    it.each`
+    describe.each`
       field           | label           | member             | expectedComponent
       ${'account'}    | ${'Account'}    | ${memberMock}      | ${MemberAvatar}
       ${'source'}     | ${'Source'}     | ${memberMock}      | ${MemberSource}
@@ -105,24 +106,48 @@ describe('MembersTable', () => {
       ${'maxRole'}    | ${'Max role'}   | ${memberCanUpdate} | ${MaxRole}
       ${'expiration'} | ${'Expiration'} | ${memberMock}      | ${ExpirationDatepicker}
       ${'activity'}   | ${'Activity'}   | ${memberMock}      | ${MemberActivity}
-    `('renders the $label field', ({ field, label, member, expectedComponent }) => {
-      createComponent({
-        members: [member],
-        tableFields: [field],
+    `('$label field', ({ field, label, member, expectedComponent }) => {
+      beforeEach(() => {
+        createComponent(
+          { members: [member], tableFields: [field] },
+          { showRoleDetailsInDrawer: false },
+        );
       });
 
-      expect(wrapper.findByText(label, { selector: '[role="columnheader"] > div' }).exists()).toBe(
-        true,
-      );
+      it('shows the table header', () => {
+        expect(wrapper.findByText(label, { selector: 'th span' }).exists()).toBe(true);
+      });
 
-      if (expectedComponent) {
-        expect(
-          wrapper
-            .find(`[data-label="${label}"][role="cell"]`)
-            .findComponent(expectedComponent)
-            .exists(),
-        ).toBe(true);
-      }
+      it('shows the expected component', () => {
+        expect(wrapper.findComponent(expectedComponent).exists()).toBe(true);
+      });
+    });
+
+    describe('Max role column', () => {
+      const createMaxRoleComponent = (member = memberMock) => {
+        createComponent({ members: [member], tableFields: ['maxRole'] });
+      };
+
+      it('shows the max role link', () => {
+        createMaxRoleComponent();
+
+        expect(findMaxRoleLink().text()).toBe('Owner');
+      });
+
+      it('does not show the "Custom role" badge', () => {
+        createMaxRoleComponent();
+
+        expect(findCustomRoleBadge().exists()).toBe(false);
+      });
+
+      it('shows the "Custom role" badge', () => {
+        const member = cloneDeep(memberMock);
+        member.accessLevel.memberRoleId = 1;
+        createMaxRoleComponent(member);
+
+        expect(findCustomRoleBadge().props('size')).toBe('sm');
+        expect(findCustomRoleBadge().text()).toBe('Custom role');
+      });
     });
 
     describe('Invited column', () => {
@@ -268,6 +293,38 @@ describe('MembersTable', () => {
     });
   });
 
+  describe('role details drawer', () => {
+    it('shows role details drawer', () => {
+      createComponent();
+      // Drawer should start off with no member passed to it.
+      expect(findRoleDetailsDrawer().props('member')).toBe(null);
+    });
+
+    it('does not show role details drawer if showRoleDetailsInDrawer feature flag is off', () => {
+      createComponent(null, { showRoleDetailsInDrawer: false });
+
+      expect(findRoleDetailsDrawer().exists()).toBe(false);
+    });
+
+    describe('with member selected', () => {
+      beforeEach(() => {
+        createComponent({ members: [memberMock], tableFields: ['maxRole'] });
+        return findMaxRoleLink().trigger('click');
+      });
+
+      it('passes member to drawer', () => {
+        expect(findRoleDetailsDrawer().props('member')).toBe(memberMock);
+      });
+
+      it('clears member when drawer is closed', async () => {
+        await findRoleDetailsDrawer().vm.$emit('close');
+        await nextTick();
+
+        expect(findRoleDetailsDrawer().props('member')).toBe(null);
+      });
+    });
+  });
+
   it('adds QA testid to table row', () => {
     createComponent();
 
diff --git a/spec/frontend/members/components/table/role_details_drawer_spec.js b/spec/frontend/members/components/table/role_details_drawer_spec.js
new file mode 100644
index 00000000000..69b4c921974
--- /dev/null
+++ b/spec/frontend/members/components/table/role_details_drawer_spec.js
@@ -0,0 +1,73 @@
+import { GlDrawer, GlButton } from '@gitlab/ui';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import RoleDetailsDrawer from '~/members/components/table/role_details_drawer.vue';
+import MembersTableCell from '~/members/components/table/members_table_cell.vue';
+import MemberAvatar from '~/members/components/table/member_avatar.vue';
+import { member as memberData } from '../../mock_data';
+
+describe('Role details drawer', () => {
+  let wrapper;
+
+  const createWrapper = ({ member = memberData } = {}) => {
+    wrapper = shallowMountExtended(RoleDetailsDrawer, {
+      propsData: { member },
+      provide: { currentUserId: memberData.user.id, canManageMembers: false },
+      stubs: { MembersTableCell },
+    });
+  };
+
+  const findDrawer = () => wrapper.findComponent(GlDrawer);
+
+  it('does not show the drawer when there is no member selected', () => {
+    createWrapper({ member: null });
+
+    expect(findDrawer().exists()).toBe(false);
+  });
+
+  describe('when there is a member', () => {
+    beforeEach(() => {
+      createWrapper();
+    });
+
+    it('shows the drawer with expected props', () => {
+      expect(findDrawer().props()).toMatchObject({ headerSticky: true, open: true, zIndex: 252 });
+    });
+
+    it('shows the user avatar', () => {
+      expect(wrapper.findComponent(MembersTableCell).props('member')).toBe(memberData);
+      expect(wrapper.findComponent(MemberAvatar).props()).toMatchObject({
+        memberType: 'user',
+        isCurrentUser: true,
+        member: memberData,
+      });
+    });
+
+    describe('Role name', () => {
+      it('shows the header', () => {
+        expect(wrapper.findByTestId('role-header').text()).toBe('Role');
+      });
+
+      it('shows the role name', () => {
+        expect(wrapper.findByTestId('role-value').text()).toBe('Owner');
+      });
+    });
+
+    describe('Permissions', () => {
+      it('shows the header', () => {
+        expect(wrapper.findByTestId('permissions-header').text()).toBe('Permissions');
+      });
+
+      it('shows the View permissions link', () => {
+        const link = wrapper.findComponent(GlButton);
+
+        expect(link.text()).toBe('View permissions');
+        expect(link.attributes('href')).toBe('/help/user/permissions');
+        expect(link.props()).toMatchObject({
+          icon: 'external-link',
+          variant: 'link',
+          target: '_blank',
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/members/mock_data.js b/spec/frontend/members/mock_data.js
index dd18435e7ff..d9186bf2a5c 100644
--- a/spec/frontend/members/mock_data.js
+++ b/spec/frontend/members/mock_data.js
@@ -113,8 +113,6 @@ export const accessRequest = {
 
 export const members = [member];
 
-export const membersJsonString = JSON.stringify(members);
-
 export const directMember = { ...member, isDirectMember: true };
 export const inheritedMember = { ...member, isDirectMember: false };
 
diff --git a/spec/frontend/design_management/components/design_disclosure_spec.js b/spec/frontend/vue_shared/components/design_management/design_disclosure_spec.js
similarity index 86%
rename from spec/frontend/design_management/components/design_disclosure_spec.js
rename to spec/frontend/vue_shared/components/design_management/design_disclosure_spec.js
index bee6cced8d6..092eaefecf9 100644
--- a/spec/frontend/design_management/components/design_disclosure_spec.js
+++ b/spec/frontend/vue_shared/components/design_management/design_disclosure_spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
-import DesignDisclosure from '~/design_management/components/design_disclosure.vue';
+import DesignDisclosure from '~/vue_shared/components/design_management/design_disclosure.vue';
 
 describe('Design Disclosure', () => {
   let wrapper;
diff --git a/spec/frontend/work_items/components/design_management/design_preview/design_description_spec.js b/spec/frontend/work_items/components/design_management/design_preview/design_description_spec.js
new file mode 100644
index 00000000000..44f095668d9
--- /dev/null
+++ b/spec/frontend/work_items/components/design_management/design_preview/design_description_spec.js
@@ -0,0 +1,25 @@
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import DesignDescription from '~/work_items/components/design_management/design_preview/design_description.vue';
+import mockDesign from './mock_design';
+
+describe('DesignDescription', () => {
+  let wrapper;
+
+  function createComponent() {
+    wrapper = shallowMountExtended(DesignDescription, {
+      propsData: {
+        design: mockDesign,
+      },
+    });
+  }
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  it('renders design description', () => {
+    expect(wrapper.findByTestId('design-description-content').text()).toBe(
+      mockDesign.descriptionHtml,
+    );
+  });
+});
diff --git a/spec/frontend/work_items/components/design_management/design_preview/design_details_spec.js b/spec/frontend/work_items/components/design_management/design_preview/design_details_spec.js
index 00edd22b7f7..00fd20d18af 100644
--- a/spec/frontend/work_items/components/design_management/design_preview/design_details_spec.js
+++ b/spec/frontend/work_items/components/design_management/design_preview/design_details_spec.js
@@ -9,6 +9,7 @@ import getDesignQuery from '~/work_items/components/design_management/graphql/de
 import DesignDetails from '~/work_items/components/design_management/design_preview/design_details.vue';
 import DesignPresentation from '~/work_items/components/design_management/design_preview/design_presentation.vue';
 import DesignToolbar from '~/work_items/components/design_management/design_preview/design_toolbar.vue';
+import DesignSidebar from '~/work_items/components/design_management/design_preview/design_sidebar.vue';
 import { DESIGN_NOT_FOUND_ERROR } from '~/work_items/components/design_management/error_messages';
 import * as utils from '~/work_items/components/design_management/utils';
 import { DESIGN_DETAIL_LAYOUT_CLASSLIST } from '~/work_items/components/design_management/constants';
@@ -41,6 +42,7 @@ describe('DesignDetails', () => {
 
   const findDesignPresentation = () => wrapper.findComponent(DesignPresentation);
   const findDesignToolbar = () => wrapper.findComponent(DesignToolbar);
+  const findDesignSidebar = () => wrapper.findComponent(DesignSidebar);
 
   const getDesignQueryHandler = jest.fn().mockResolvedValue(getDesignResponse);
   const error = new Error('ruh roh some error');
@@ -77,6 +79,7 @@ describe('DesignDetails', () => {
 
     expect(findDesignPresentation().props('isLoading')).toBe(true);
     expect(findDesignToolbar().props('isLoading')).toBe(true);
+    expect(findDesignSidebar().props('isLoading')).toBe(true);
   });
 
   describe('when loaded', () => {
@@ -93,6 +96,15 @@ describe('DesignDetails', () => {
         atVersion: null,
       });
     });
+
+    it('closes sidebar on toggle', async () => {
+      expect(findDesignSidebar().props('isOpen')).toBe(true);
+
+      findDesignToolbar().vm.$emit('toggle-sidebar');
+      await nextTick();
+
+      expect(findDesignSidebar().props('isOpen')).toBe(false);
+    });
   });
 
   describe('when query fails', () => {
diff --git a/spec/frontend/work_items/components/design_management/design_preview/design_sidebar_spec.js b/spec/frontend/work_items/components/design_management/design_preview/design_sidebar_spec.js
new file mode 100644
index 00000000000..6fc3853f962
--- /dev/null
+++ b/spec/frontend/work_items/components/design_management/design_preview/design_sidebar_spec.js
@@ -0,0 +1,51 @@
+import { GlSkeletonLoader, GlEmptyState } from '@gitlab/ui';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import DesignSidebar from '~/work_items/components/design_management/design_preview/design_sidebar.vue';
+import DesignDescription from '~/work_items/components/design_management/design_preview/design_description.vue';
+import DesignDisclosure from '~/vue_shared/components/design_management/design_disclosure.vue';
+import mockDesign from './mock_design';
+
+describe('DesignDescription', () => {
+  let wrapper;
+
+  const findSkeletonLoader = () => wrapper.findComponent(GlSkeletonLoader);
+  const findEmptyState = () => wrapper.findComponent(GlEmptyState);
+  const findDisclosure = () => wrapper.findAllComponents(DesignDisclosure);
+  const findDesignDescription = () => wrapper.findComponent(DesignDescription);
+
+  function createComponent({ isLoading = false } = {}) {
+    wrapper = shallowMountExtended(DesignSidebar, {
+      propsData: {
+        design: mockDesign,
+        isLoading,
+        isOpen: true,
+      },
+    });
+  }
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  it('renders disclosure', () => {
+    expect(findDisclosure().exists()).toBe(true);
+  });
+
+  it('renders design description', () => {
+    expect(findDesignDescription().exists()).toBe(true);
+    expect(findDesignDescription().props()).toMatchObject({
+      design: mockDesign,
+    });
+  });
+
+  it('renders empty state', () => {
+    expect(findEmptyState().exists()).toBe(true);
+    expect(findSkeletonLoader().exists()).toBe(false);
+  });
+
+  it('renders loading state when loading', () => {
+    createComponent({ isLoading: true });
+    expect(findEmptyState().exists()).toBe(false);
+    expect(findSkeletonLoader().exists()).toBe(true);
+  });
+});
diff --git a/spec/frontend/work_items/components/design_management/design_preview/design_toolbar_spec.js b/spec/frontend/work_items/components/design_management/design_preview/design_toolbar_spec.js
index 593e841a563..e278fc966ea 100644
--- a/spec/frontend/work_items/components/design_management/design_preview/design_toolbar_spec.js
+++ b/spec/frontend/work_items/components/design_management/design_preview/design_toolbar_spec.js
@@ -1,3 +1,4 @@
+import { nextTick } from 'vue';
 import { GlSkeletonLoader } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import DesignToolbar from '~/work_items/components/design_management/design_preview/design_toolbar.vue';
@@ -15,6 +16,7 @@ describe('DesignToolbar', () => {
         workItemTitle,
         isLoading,
         design,
+        isSidebarOpen: true,
       },
     });
   }
@@ -55,4 +57,13 @@ describe('DesignToolbar', () => {
 
     expect(wrapper.findComponent(ImportedBadge).exists()).toBe(false);
   });
+
+  it('emits toggle-sidebar event when clicking on toggle sidebar button', async () => {
+    createComponent();
+
+    wrapper.findByTestId('toggle-design-sidebar').vm.$emit('click');
+    await nextTick();
+
+    expect(wrapper.emitted('toggle-sidebar')).toHaveLength(1);
+  });
 });
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb
index 59fb57aa5ac..ee496a7be75 100644
--- a/spec/helpers/labels_helper_spec.rb
+++ b/spec/helpers/labels_helper_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe LabelsHelper do
     context 'with a tooltip argument' do
       context 'set to false' do
         it 'does not include the has-tooltip class' do
-          expect(link_to_label(label_presenter, tooltip: false)).not_to match /has-tooltip/
+          expect(link_to_label(label_presenter, tooltip: false)).not_to match(/has-tooltip/)
         end
       end
     end
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index 3ae63ffc2de..7c8ae28497d 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -541,7 +541,7 @@ RSpec.describe UsersHelper, feature_category: :user_management do
 
       it 'contains resend confirmation e-mail text' do
         expect(user_email_help_text).to include _('Resend confirmation e-mail')
-        expect(user_email_help_text).to match /Please click the link in the confirmation email before continuing. It was sent to.*#{user.unconfirmed_email}/
+        expect(user_email_help_text).to match(/Please click the link in the confirmation email before continuing. It was sent to.*#{user.unconfirmed_email}/)
       end
     end
   end
diff --git a/spec/helpers/visibility_level_helper_spec.rb b/spec/helpers/visibility_level_helper_spec.rb
index 4af7fae400e..c2027c35ab3 100644
--- a/spec/helpers/visibility_level_helper_spec.rb
+++ b/spec/helpers/visibility_level_helper_spec.rb
@@ -14,20 +14,20 @@ RSpec.describe VisibilityLevelHelper, feature_category: :system_access do
     context 'used with a Project' do
       it 'delegates projects to #project_visibility_icon_description' do
         expect(visibility_icon_description(project))
-          .to match /project/i
+          .to match(/project/i)
       end
 
       context 'used with a ProjectPresenter' do
         it 'delegates projects to #project_visibility_icon_description' do
           expect(visibility_icon_description(project.present))
-            .to match /project/i
+            .to match(/project/i)
         end
       end
 
       context 'used with a Group' do
         it 'delegates groups to #group_visibility_icon_description' do
           expect(visibility_icon_description(group))
-            .to match /group/i
+            .to match(/group/i)
         end
       end
     end
@@ -61,7 +61,7 @@ RSpec.describe VisibilityLevelHelper, feature_category: :system_access do
 
       it 'returns different project related descriptions depending on visibility level' do
         expect(descriptions.uniq.size).to eq(descriptions.size)
-        expect(descriptions).to all match /project/i
+        expect(descriptions).to all match(/project/i)
       end
     end
 
@@ -76,7 +76,7 @@ RSpec.describe VisibilityLevelHelper, feature_category: :system_access do
 
       it 'returns different group related descriptions depending on visibility level' do
         expect(descriptions.uniq.size).to eq(descriptions.size)
-        expect(descriptions).to all match /group/i
+        expect(descriptions).to all match(/group/i)
       end
 
       it 'returns default description for public group' do
@@ -92,7 +92,7 @@ RSpec.describe VisibilityLevelHelper, feature_category: :system_access do
         end
 
         it 'returns updated description for public visibility option in group general settings' do
-          expect(public_option_description).to match /^The group, any public projects, and any of their members, issues, and merge requests can be viewed without authentication./
+          expect(public_option_description).to match(/^The group, any public projects, and any of their members, issues, and merge requests can be viewed without authentication./)
         end
       end
     end
diff --git a/spec/initializers/direct_upload_support_spec.rb b/spec/initializers/direct_upload_support_spec.rb
index 29d19c8397c..6831e2c83d5 100644
--- a/spec/initializers/direct_upload_support_spec.rb
+++ b/spec/initializers/direct_upload_support_spec.rb
@@ -72,7 +72,7 @@ RSpec.describe 'Direct upload support' do
           let(:provider) { 'Aliyun' }
 
           it 'raises an error' do
-            expect { subject }.to raise_error /Object storage provider '#{provider}' is not supported when 'direct_upload' is used for '#{config_name}'/
+            expect { subject }.to raise_error(/Object storage provider '#{provider}' is not supported when 'direct_upload' is used for '#{config_name}'/)
           end
         end
 
@@ -85,7 +85,7 @@ RSpec.describe 'Direct upload support' do
           end
 
           it 'raises an error' do
-            expect { subject }.to raise_error /the 'connection' section is missing/
+            expect { subject }.to raise_error(/the 'connection' section is missing/)
           end
         end
       end
diff --git a/spec/initializers/validate_database_config_spec.rb b/spec/initializers/validate_database_config_spec.rb
index ffafe937ba9..3951ccdc8cf 100644
--- a/spec/initializers/validate_database_config_spec.rb
+++ b/spec/initializers/validate_database_config_spec.rb
@@ -77,7 +77,7 @@ RSpec.describe 'validate database config' do
       end
 
       it 'raises exception' do
-        expect { subject }.to raise_error /This installation of GitLab uses unsupported database names/
+        expect { subject }.to raise_error(/This installation of GitLab uses unsupported database names/)
       end
 
       it_behaves_like 'with SKIP_DATABASE_CONFIG_VALIDATION=true'
@@ -99,7 +99,7 @@ RSpec.describe 'validate database config' do
       end
 
       it 'raises exception' do
-        expect { subject }.to raise_error /with 'replica: true' parameter in/
+        expect { subject }.to raise_error(/with 'replica: true' parameter in/)
       end
 
       it_behaves_like 'with SKIP_DATABASE_CONFIG_VALIDATION=true'
@@ -130,7 +130,7 @@ RSpec.describe 'validate database config' do
       end
 
       it 'raises exception' do
-        expect { subject }.to raise_error /The `main:` database needs to be defined as a first configuration item/
+        expect { subject }.to raise_error(/The `main:` database needs to be defined as a first configuration item/)
       end
 
       it_behaves_like 'with SKIP_DATABASE_CONFIG_VALIDATION=true'
diff --git a/spec/lib/banzai/filter/references/label_reference_filter_spec.rb b/spec/lib/banzai/filter/references/label_reference_filter_spec.rb
index bcc256813c9..db8b4063475 100644
--- a/spec/lib/banzai/filter/references/label_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/references/label_reference_filter_spec.rb
@@ -439,7 +439,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
     end
 
     it 'has valid color' do
-      expect(result.css('a span').first.attr('style')).to match /background-color: #00ff00/
+      expect(result.css('a span').first.attr('style')).to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
@@ -471,7 +471,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
     end
 
     it 'has valid color' do
-      expect(result.css('a span').first.attr('style')).to match /background-color: #00ff00/
+      expect(result.css('a span').first.attr('style')).to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
@@ -504,7 +504,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
 
     it 'has valid color' do
       expect(result.css('a span').first.attr('style'))
-        .to match /background-color: #00ff00/
+        .to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
@@ -538,7 +538,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
 
     it 'has valid color' do
       expect(result.css('a span').first.attr('style'))
-        .to match /background-color: #00ff00/
+        .to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
@@ -587,7 +587,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
 
     it 'has valid color' do
       expect(result.css('a span').first.attr('style'))
-        .to match /background-color: #00ff00/
+        .to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
@@ -621,7 +621,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
 
     it 'has valid color' do
       expect(result.css('a span').first.attr('style'))
-        .to match /background-color: #00ff00/
+        .to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
@@ -653,7 +653,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter, feature_categor
 
     it 'has valid color' do
       expect(result.css('a span').first.attr('style'))
-        .to match /background-color: #00ff00/
+        .to match(/background-color: #00ff00/)
     end
 
     it 'has valid link text' do
diff --git a/spec/lib/bulk_imports/user_contributions_export_mapper_spec.rb b/spec/lib/bulk_imports/user_contributions_export_mapper_spec.rb
new file mode 100644
index 00000000000..d401a29fe74
--- /dev/null
+++ b/spec/lib/bulk_imports/user_contributions_export_mapper_spec.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BulkImports::UserContributionsExportMapper, :clean_gitlab_redis_shared_state, feature_category: :importers do
+  let_it_be(:group_1) { create(:group) }
+  let_it_be(:cached_user_1) { create(:user) }
+  let_it_be(:cached_user_2) { create(:user) }
+  let_it_be(:non_cached_user_1) { create(:user) }
+  let_it_be(:non_cached_user_2) { create(:user) }
+
+  let(:cached_users) { [cached_user_1, cached_user_2] }
+  let(:non_cached_users) { [non_cached_user_1, non_cached_user_2] }
+  let(:group_1_cache_key) { "bulk_imports/#{group_1.class.name}/#{group_1.id}/user_contribution_ids" }
+
+  subject(:user_contributions_export_mapper) { described_class.new(group_1) }
+
+  describe '#cache_user_contributions_on_record' do
+    shared_examples 'there are no references to cache' do
+      it 'does not cache any user ids' do
+        user_contributions_export_mapper.cache_user_contributions_on_record(record)
+
+        expect(Gitlab::Cache::Import::Caching.values_from_set(group_1_cache_key)).to be_empty
+      end
+    end
+
+    context 'when record is nil' do
+      let(:record) { nil }
+
+      it_behaves_like 'there are no references to cache'
+    end
+
+    context 'when record is a User' do
+      let(:record) { create(:user) }
+
+      it_behaves_like 'there are no references to cache'
+    end
+
+    context 'when record does not have references to a user' do
+      let(:record) { create(:board) }
+
+      it_behaves_like 'there are no references to cache'
+    end
+
+    context 'when record has references to a user' do
+      let(:record) do
+        create(
+          :issue,
+          author_id: non_cached_user_1.id,
+          updated_by_id: non_cached_user_2.id,
+          closed_by_id: cached_user_1.id,
+          last_edited_by_id: cached_user_2.id
+        )
+      end
+
+      before do
+        Gitlab::Cache::Import::Caching.set_add(group_1_cache_key, cached_users.map(&:id))
+      end
+
+      it 'caches all user reference ids' do
+        user_contributions_export_mapper.cache_user_contributions_on_record(record)
+
+        all_cached_ids = (cached_users + non_cached_users).map { |user| user.id.to_s }
+
+        expect(Gitlab::Cache::Import::Caching.values_from_set(group_1_cache_key)).to match_array(all_cached_ids)
+      end
+
+      it 'caches user_ids with a longer timeout to allow for longer exports' do
+        all_cached_ids = (cached_users + non_cached_users).map(&:id)
+
+        expect(Gitlab::Cache::Import::Caching).to receive(:set_add).with(
+          group_1_cache_key, match_array(all_cached_ids), timeout: 72.hours.to_i
+        )
+
+        user_contributions_export_mapper.cache_user_contributions_on_record(record)
+      end
+    end
+  end
+
+  describe '#get_contributing_users' do
+    it 'returns an ActiveRecord::Relation of users from the cached ids' do
+      Gitlab::Cache::Import::Caching.set_add(group_1_cache_key, cached_users.map(&:id))
+
+      expect(user_contributions_export_mapper.get_contributing_users.to_a).to match_array(cached_users)
+    end
+
+    it 'returns an empty relation if no users were cached' do
+      empty_relation = user_contributions_export_mapper.get_contributing_users
+
+      expect(empty_relation).to be_empty
+    end
+  end
+
+  describe '#clear_cache' do
+    let_it_be(:project) { create(:project) }
+    let_it_be(:group_2) { create(:group) }
+
+    it 'clears the user contributions cache for the given portable' do
+      Gitlab::Cache::Import::Caching.set_add(group_1_cache_key, cached_users.map(&:id))
+
+      expect { user_contributions_export_mapper.clear_cache }.to change {
+        user_contributions_export_mapper.get_contributing_users.count
+      }.from(2).to(0)
+    end
+
+    it 'only clears the cache for matching portable class and id' do
+      allow(project).to receive(:id).and_return(group_1.id)
+
+      project_user_contributions_mapper = described_class.new(project)
+      group_2_user_contributions_mapper = described_class.new(group_2)
+
+      project_cache_key = "bulk_imports/#{project.class.name}/#{project.id}/user_contribution_ids"
+      group_2_cache_key = "bulk_imports/#{group_2.class.name}/#{group_2.id}/user_contribution_ids"
+
+      Gitlab::Cache::Import::Caching.set_add(project_cache_key, cached_users.map(&:id))
+      Gitlab::Cache::Import::Caching.set_add(group_2_cache_key, cached_users.map(&:id))
+
+      expect { user_contributions_export_mapper.clear_cache }
+        .to not_change { project_user_contributions_mapper.get_contributing_users.count }
+        .and not_change { group_2_user_contributions_mapper.get_contributing_users.count }
+    end
+  end
+end
diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 7303f42d289..fad586527fe 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -465,7 +465,7 @@ RSpec.describe Feature, :clean_gitlab_redis_feature_flag, stub_feature_flags: fa
         context 'when is dev_or_test_env' do
           it 'does raise exception' do
             expect { described_class.enabled?(:enabled_feature_flag, actor) }
-              .to raise_error /needs to include `FeatureGate` or implement `flipper_id`/
+              .to raise_error(/needs to include `FeatureGate` or implement `flipper_id`/)
           end
         end
       end
diff --git a/spec/lib/generators/gitlab/analytics/group_fetcher_spec.rb b/spec/lib/generators/gitlab/analytics/group_fetcher_spec.rb
deleted file mode 100644
index 77cc3904560..00000000000
--- a/spec/lib/generators/gitlab/analytics/group_fetcher_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::Analytics::GroupFetcher, :silence_stdout, feature_category: :service_ping do
-  let(:stage_data) do
-    <<~YAML
-      stages:
-        analyze:
-          section: analytics
-          groups:
-            analytics_instrumentation:
-        secure:
-          section: security
-          groups:
-            static_analysis:
-            dynamic_analysis:
-    YAML
-  end
-
-  let(:response) { instance_double(HTTParty::Response, success?: true, body: stage_data) }
-
-  around do |example|
-    described_class.instance_variable_set(:@groups, nil)
-    example.run
-    described_class.instance_variable_set(:@groups, nil)
-  end
-
-  before do
-    allow(Gitlab::HTTP).to receive(:get).and_return(response)
-  end
-
-  context 'when online' do
-    describe '.group_unknown?' do
-      it 'returns false for known groups' do
-        expect(described_class.group_unknown?('analytics_instrumentation')).to be_falsy
-      end
-
-      it 'returns true for unknown groups' do
-        expect(described_class.group_unknown?('unknown')).to be_truthy
-      end
-    end
-
-    describe '.stage_text' do
-      it 'returns the stage name for known groups' do
-        expect(described_class.stage_text('analytics_instrumentation')).to eq('analyze')
-      end
-
-      it 'returns empty string for unknown group' do
-        expect(described_class.stage_text('unknown')).to eq('')
-      end
-    end
-
-    describe '.section_text' do
-      it 'returns the section name for known groups' do
-        expect(described_class.section_text('analytics_instrumentation')).to eq('analytics')
-      end
-
-      it 'returns empty string for unknown group' do
-        expect(described_class.section_text('unknown')).to eq('')
-      end
-    end
-  end
-
-  context 'when offline' do
-    before do
-      allow(Gitlab::HTTP).to receive(:get).and_raise(Gitlab::HTTP_V2::BlockedUrlError)
-    end
-
-    describe '.group_unknown?' do
-      it 'returns false for known groups' do
-        expect(described_class.group_unknown?('analytics_instrumentation')).to be_falsy
-      end
-
-      it 'returns false for unknown group' do
-        expect(described_class.group_unknown?('unknown')).to be_falsy
-      end
-    end
-
-    describe '.stage_text' do
-      it 'returns empty string for known groups' do
-        expect(described_class.stage_text('analytics_instrumentation')).to eq('')
-      end
-
-      it 'returns empty string for unknown groups' do
-        expect(described_class.stage_text('unknown')).to eq('')
-      end
-    end
-
-    describe '.section_text' do
-      it 'returns empty string for known groups' do
-        expect(described_class.section_text('analytics_instrumentation')).to eq('')
-      end
-
-      it 'returns empty string for unknown groups' do
-        expect(described_class.section_text('unknown')).to eq('')
-      end
-    end
-  end
-end
diff --git a/spec/lib/generators/gitlab/analytics/internal_events_generator_spec.rb b/spec/lib/generators/gitlab/analytics/internal_events_generator_spec.rb
deleted file mode 100644
index 4156d768875..00000000000
--- a/spec/lib/generators/gitlab/analytics/internal_events_generator_spec.rb
+++ /dev/null
@@ -1,318 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::Analytics::InternalEventsGenerator, :silence_stdout, feature_category: :service_ping do
-  include UsageDataHelpers
-
-  let(:temp_dir) { Dir.mktmpdir }
-  let(:ee_temp_dir) { Dir.mktmpdir }
-  let(:tmpfile) { Tempfile.new('test-metadata') }
-  let(:existing_key_paths) { {} }
-  let(:description) { "This metric counts unique users viewing analytics metrics dashboard section" }
-  let(:group) { "analytics_instrumentation" }
-  let(:stage) { "analyze" }
-  let(:section) { "analytics" }
-  let(:mr) { "https://gitlab.com/some-group/some-project/-/merge_requests/123" }
-  let(:event) { "view_analytics_dashboard" }
-  let(:unique) { "user.id" }
-  let(:time_frames) { %w[7d] }
-  let(:group_unknown) { false }
-  let(:include_default_identifiers) { 'yes' }
-  let(:base_options) do
-    {
-      time_frames: time_frames,
-      free: true,
-      mr: mr,
-      group: group,
-      event: event,
-      unique: unique
-    }.stringify_keys
-  end
-
-  let(:options) { base_options }
-
-  before do
-    stub_const("#{described_class}::TOP_LEVEL_DIR_EE", ee_temp_dir)
-    stub_const("#{described_class}::TOP_LEVEL_DIR", temp_dir)
-    # Stub version so that `milestone` key remains constant between releases to prevent flakiness.
-    stub_const('Gitlab::VERSION', '13.9.0')
-
-    allow_next_instance_of(described_class) do |instance|
-      allow(instance).to receive(:ask)
-                           .with(/Please describe in at least 50 characters/)
-                           .and_return(description)
-    end
-
-    allow(Gitlab::Analytics::GroupFetcher).to receive(:group_unknown?).and_return(group_unknown)
-    allow(Gitlab::Analytics::GroupFetcher).to receive(:stage_text).with(group).and_return(stage)
-    allow(Gitlab::Analytics::GroupFetcher).to receive(:section_text).with(group).and_return(section)
-
-    allow(Gitlab::TaskHelpers).to receive(:prompt).and_return(include_default_identifiers)
-    allow(Gitlab::Usage::MetricDefinition).to receive(:definitions).and_return(existing_key_paths)
-  end
-
-  after do
-    FileUtils.rm_rf(temp_dir)
-    FileUtils.rm_rf(ee_temp_dir)
-    FileUtils.rm_rf(tmpfile.path)
-  end
-
-  describe 'Creating event definition file' do
-    let(:event_definition_path) { Dir.glob(File.join(temp_dir, "events/#{event}.yml")).first }
-    let(:identifiers) { %w[project user namespace] }
-    let(:event_definition) do
-      {
-        "internal_events" => true,
-        "action" => event,
-        "description" => description,
-        "product_section" => section,
-        "product_stage" => stage,
-        "product_group" => group,
-        "label_description" => nil,
-        "property_description" => nil,
-        "value_description" => nil,
-        "extra_properties" => nil,
-        "identifiers" => identifiers,
-        "milestone" => "13.9",
-        "introduced_by_url" => mr,
-        "distributions" => %w[ce ee],
-        "tiers" => %w[free premium ultimate]
-      }
-    end
-
-    it 'creates an event definition file using the template' do
-      described_class.new([], options).invoke_all
-
-      expect(YAML.safe_load(File.read(event_definition_path))).to eq(event_definition)
-    end
-
-    context 'for ultimate only feature' do
-      let(:event_definition_path) do
-        Dir.glob(File.join(ee_temp_dir, temp_dir, "events/#{event}.yml")).first
-      end
-
-      it 'creates an event definition file using the template' do
-        described_class.new([], options.merge(tiers: %w[ultimate])).invoke_all
-
-        expect(YAML.safe_load(File.read(event_definition_path)))
-          .to eq(event_definition.merge("tiers" => ["ultimate"], "distributions" => ["ee"]))
-      end
-    end
-
-    context 'without default identifiers' do
-      let(:include_default_identifiers) { 'no' }
-
-      it 'creates an event definition file using the template' do
-        described_class.new([], options).invoke_all
-
-        expect(YAML.safe_load(File.read(event_definition_path)))
-          .to eq(event_definition.merge("identifiers" => nil))
-      end
-    end
-
-    context 'with duplicated event' do
-      context 'in known_events' do
-        before do
-          allow(::Gitlab::UsageDataCounters::HLLRedisCounter)
-            .to receive(:known_event?).with(event).and_return(true)
-        end
-
-        it 'does not create event definition' do
-          described_class.new([], options).invoke_all
-
-          expect(event_definition_path).to eq(nil)
-        end
-      end
-
-      context 'in event definition files' do
-        before do
-          Dir.mkdir(File.join(temp_dir, "events"))
-          File.write(File.join(temp_dir, "events", "#{event}.yml"), { action: event }.to_yaml)
-        end
-
-        it 'raises error' do
-          expect { described_class.new([], options).invoke_all }.to raise_error(RuntimeError)
-        end
-      end
-    end
-  end
-
-  describe 'Creating metric definition file' do
-    let(:metric_dir) { temp_dir }
-    let(:base_key_path_unique) { "count_distinct_#{unique.sub('.', '_')}_from_#{event}" }
-    let(:base_key_path_total) { "count_total_#{event}" }
-    let(:base_metric_definition) do
-      {
-        "description" => description,
-        "product_section" => section,
-        "product_stage" => stage,
-        "product_group" => group,
-        "performance_indicator_type" => [],
-        "value_type" => "number",
-        "status" => "active",
-        "milestone" => "13.9",
-        "introduced_by_url" => mr,
-        "data_source" => "internal_events",
-        "data_category" => "optional",
-        "distribution" => %w[ce ee],
-        "tier" => %w[free premium ultimate],
-        "options" => {
-          "events" => [event]
-        }
-      }
-    end
-
-    let(:metric_definition_extra) { {} }
-
-    shared_examples 'creates unique metric definitions' do |time_frames|
-      it 'creates a metric definiton for each of the time frames' do
-        described_class.new([], options).invoke_all
-
-        time_frames.each do |time_frame|
-          key_path = "#{base_key_path_unique}_#{time_frame}"
-          metric_definition_path = Dir.glob(File.join(metric_dir, "metrics/counts_#{time_frame}/#{key_path}.yml")).first
-          metric_definition = base_metric_definition.merge(
-            "key_path" => key_path,
-            "time_frame" => time_frame,
-            "events" => [{ "name" => event, "unique" => unique }]
-          ).merge(metric_definition_extra)
-          expect(YAML.safe_load(File.read(metric_definition_path))).to eq(metric_definition)
-        end
-      end
-    end
-
-    shared_examples 'creates total metric definitions' do |time_frames|
-      it 'creates a metric definiton for each of the time frames' do
-        described_class.new([], options).invoke_all
-
-        time_frames.each do |time_frame|
-          key_path = "#{base_key_path_total}_#{time_frame}"
-          metric_definition_path = Dir.glob(File.join(metric_dir, "metrics/counts_#{time_frame}/#{key_path}.yml")).first
-          metric_definition = base_metric_definition.merge(
-            "key_path" => key_path,
-            "time_frame" => time_frame,
-            "events" => [{ "name" => event }]
-          ).merge(metric_definition_extra)
-          expect(YAML.safe_load(File.read(metric_definition_path))).to eq(metric_definition)
-        end
-      end
-    end
-
-    context 'for single time frame' do
-      let(:time_frames) { %w[7d] }
-
-      it_behaves_like 'creates unique metric definitions', %w[7d]
-
-      context 'with time frame "all" and no "unique"' do
-        let(:time_frames) { %w[all] }
-
-        let(:options) { base_options.except('unique') }
-
-        it_behaves_like 'creates total metric definitions', %w[all]
-      end
-
-      context 'for ultimate only feature' do
-        let(:metric_dir) { File.join(ee_temp_dir, temp_dir) }
-        let(:options) { base_options.merge(tiers: %w[ultimate]) }
-        let(:metric_definition_extra) { { "tier" => ["ultimate"], "distribution" => ["ee"] } }
-
-        it_behaves_like 'creates unique metric definitions', %w[7d]
-      end
-
-      context 'with invalid time frame' do
-        let(:time_frames) { %w[14d] }
-
-        it 'raises error' do
-          expect { described_class.new([], options).invoke_all }.to raise_error(RuntimeError)
-        end
-      end
-
-      context 'with invalid time frame for unique metrics' do
-        let(:time_frames) { %w[all] }
-
-        it 'raises error' do
-          expect { described_class.new([], options).invoke_all }.to raise_error(RuntimeError)
-        end
-      end
-
-      context 'with duplicated key path' do
-        let(:key_path_7d) { "#{base_key_path_unique}_7d" }
-        let(:existing_key_paths) { { key_path_7d => true } }
-
-        it 'raises error' do
-          expect { described_class.new([], options).invoke_all }.to raise_error(RuntimeError)
-        end
-      end
-
-      context 'without at least one tier available' do
-        it 'raises error' do
-          expect { described_class.new([], options.merge(tiers: [])).invoke_all }
-            .to raise_error(RuntimeError)
-        end
-      end
-
-      context 'with unknown tier' do
-        it 'raises error' do
-          expect { described_class.new([], options.merge(tiers: %w[superb])).invoke_all }
-            .to raise_error(RuntimeError)
-        end
-      end
-
-      context 'without obligatory parameter' do
-        it 'raises error', :aggregate_failures do
-          %w[event mr group].each do |option|
-            expect { described_class.new([], options.without(option)).invoke_all }
-              .to raise_error(RuntimeError)
-          end
-        end
-      end
-
-      context 'with too short description' do
-        it 'asks again for description' do
-          allow_next_instance_of(described_class) do |instance|
-            allow(instance).to receive(:ask)
-                                 .with(/By convention all events automatically include the following properties/)
-                                 .and_return(include_default_identifiers)
-
-            allow(instance).to receive(:ask).twice
-                                 .with(/Please describe in at least 50 characters/)
-                                 .and_return("I am to short")
-
-            expect(instance).to receive(:ask).twice
-                                 .with(/Please provide description that is 50 characters long/)
-                                 .and_return(description)
-          end
-
-          described_class.new([], options).invoke_all
-        end
-      end
-    end
-
-    context 'for multiple time frames' do
-      let(:time_frames) { %w[7d 28d] }
-
-      it_behaves_like 'creates unique metric definitions', %w[7d 28d]
-    end
-
-    context 'with default time frames' do
-      let(:options) { base_options.without('time_frames', 'unique') }
-
-      it_behaves_like 'creates total metric definitions', %w[7d 28d all]
-
-      context 'with unique' do
-        let(:options) { base_options.without('time_frames') }
-
-        it_behaves_like 'creates unique metric definitions', %w[7d 28d]
-
-        it "doesn't create a total 'all' metric" do
-          described_class.new([], options).invoke_all
-
-          key_path = "#{base_key_path_total}_all"
-
-          expect(Dir.glob(File.join(metric_dir, "metrics/counts_all/#{key_path}.yml")).first).to be_nil
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/background_migration/backfill_epic_basic_fields_to_work_item_record_spec.rb b/spec/lib/gitlab/background_migration/backfill_epic_basic_fields_to_work_item_record_spec.rb
index 341312785a9..5c95c4dccc0 100644
--- a/spec/lib/gitlab/background_migration/backfill_epic_basic_fields_to_work_item_record_spec.rb
+++ b/spec/lib/gitlab/background_migration/backfill_epic_basic_fields_to_work_item_record_spec.rb
@@ -15,14 +15,6 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillEpicBasicFieldsToWorkItemRec
 
   before do
     (1..5).each do |idx|
-      table(:epics).create!(**epic_data(idx, namespace1))
-    end
-
-    (6..10).each do |idx|
-      table(:epics).create!(**epic_data(idx, namespace2))
-    end
-
-    (11..15).each do |idx|
       epic_data = epic_data(idx, namespace1)
       issue_id = issues.create!(
         title: "epic #{idx}", iid: idx, namespace_id: namespace1.id, work_item_type_id: epic_work_item_type_id
@@ -34,7 +26,7 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillEpicBasicFieldsToWorkItemRec
       table(:work_item_colors).create!(color_data) if idx % 3 == 0
     end
 
-    (16..20).each do |idx|
+    (6..10).each do |idx|
       issue_id = issues.create!(
         title: "epic #{idx}", iid: idx, namespace_id: namespace2.id, work_item_type_id: epic_work_item_type_id
       ).id
@@ -64,7 +56,7 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillEpicBasicFieldsToWorkItemRec
       migration.perform
 
       backfilled_epics = epics.where.not(issue_id: nil)
-      expect(backfilled_epics.count).to eq(20)
+      expect(backfilled_epics.count).to eq(10)
       expect(backfilled_epics.map(&:group_id).uniq).to match_array([namespace1.id, namespace2.id])
 
       epic_wis = table(:issues).where(work_item_type_id: epic_work_item_type_id)
diff --git a/spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb b/spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb
index 539dff86168..5de2c932319 100644
--- a/spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb
+++ b/spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # rubocop:disable RSpec/FactoriesInMigrationSpecs
-RSpec.describe Gitlab::BackgroundMigration::BackfillProjectRepositories do
+RSpec.describe Gitlab::BackgroundMigration::BackfillProjectRepositories, feature_category: :groups_and_projects do
   let(:group) { create(:group, name: 'foo', path: 'foo') }
 
   describe described_class::ShardFinder do
@@ -86,19 +86,6 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillProjectRepositories do
 
           expect(project.disk_path).to eq('zoo/new-test')
         end
-
-        it 'raises OrphanedNamespaceError when any parent namespace does not exist' do
-          subgroup = create(:group, parent: group)
-          project_orphaned_namespace = create(:project, name: 'baz', path: 'baz', namespace: subgroup, storage_version: nil)
-          subgroup.update_column(:parent_id, non_existing_record_id)
-
-          project = described_class.find(project_orphaned_namespace.id)
-          project.route.destroy!
-          subgroup.route.destroy!
-
-          expect { project.reload.disk_path }
-            .to raise_error(Gitlab::BackgroundMigration::BackfillProjectRepositories::OrphanedNamespaceError)
-        end
       end
     end
   end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 5b77fbcd234..aa24f806e2c 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -78,7 +78,9 @@ work_item_type:
 - widget_definitions
 - enabled_widget_definitions
 - child_restrictions
+- parent_restrictions
 - allowed_child_types_by_name
+- allowed_parent_types_by_name
 events:
 - author
 - project
diff --git a/spec/lib/gitlab/import_export/base/relation_factory_spec.rb b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
index 86238e8d6e3..cd1ad355fdd 100644
--- a/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
@@ -204,5 +204,13 @@ RSpec.describe Gitlab::ImportExport::Base::RelationFactory, feature_category: :i
         expect(described_class.relation_class(relation_name)).to eq(Badge)
       end
     end
+
+    context 'when relation name is user_contributions' do
+      let(:relation_name) { 'user_contributions' }
+
+      it 'returns constantized class' do
+        expect(described_class.relation_class(relation_name)).to eq(User)
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/import_export/import_test_coverage_spec.rb b/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
index 09a2417ce1e..ddc72ad8473 100644
--- a/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
+++ b/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
@@ -55,6 +55,7 @@ RSpec.describe 'Test coverage of the Project Import', feature_category: :importe
       project.approval_rules
       project.approval_rules.approval_project_rules_protected_branches
       project.approval_rules.approval_project_rules_users
+      project.user_contributions
     ].freeze
   end
 
diff --git a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
index f88dac7cd2b..2762215aff5 100644
--- a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
+++ b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category: :importers do
+RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, :clean_gitlab_redis_shared_state, feature_category: :importers do
   let_it_be(:user) { create(:user) }
   let_it_be(:release) { create(:release) }
   let_it_be(:group) { create(:group) }
@@ -33,6 +33,7 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category
   let(:include) { [] }
   let(:custom_orderer) { nil }
   let(:include_if_exportable) { {} }
+  let(:user_contributions_cache_key) { "bulk_imports/#{exportable.class}/#{exportable.id}/user_contribution_ids" }
 
   let(:relations_schema) do
     {
@@ -62,11 +63,13 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category
         [{ issues: { include: [] } }]
       end
 
+      let(:closing_user) { create(:user) }
+
       before do
         create_list(:issue, 3, project: exportable, relative_position: 10000) # ascending ids, same position positive
         create_list(:issue, 3, project: exportable, relative_position: -5000) # ascending ids, same position negative
         create_list(:issue, 3, project: exportable, relative_position: 0) # ascending ids, duplicate positions
-        create_list(:issue, 3, project: exportable, relative_position: nil) # no position
+        create_list(:issue, 3, project: exportable, relative_position: nil, closed_by: closing_user) # no position, closed by a user
         create_list(:issue, 3, :with_desc_relative_position, project: exportable ) # ascending ids, descending position
       end
 
@@ -141,6 +144,41 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category
           subject.execute
         end
       end
+
+      context 'contributing user id caching' do
+        let(:json_writer) do
+          Class.new do
+            def write_relation_array(_, _, enumerator)
+              enumerator.each { _1 }
+            end
+          end.new
+        end
+
+        context 'when :bulk_import_user_mapping feature flag is enabled' do
+          it 'caches existing referenced user_ids' do
+            expected_user_ref_ids = Issue.all.pluck(
+              :author_id, :updated_by_id, :last_edited_by_id, :closed_by_id
+            ).flatten.uniq.filter_map { |user_id| user_id.to_s if user_id }
+
+            subject.execute
+
+            expect(
+              Gitlab::Cache::Import::Caching.values_from_set(user_contributions_cache_key)
+            ).to match_array(expected_user_ref_ids)
+          end
+        end
+
+        context 'when :bulk_import_user_mapping feature flag is disabled' do
+          it 'does not cache any contributing user ids' do
+            stub_feature_flags(bulk_import_user_mapping: false)
+
+            expect(BulkImports::UserContributionsExportMapper).not_to receive(:new)
+            subject.execute
+
+            expect(Gitlab::Cache::Import::Caching.values_from_set(user_contributions_cache_key)).to be_empty
+          end
+        end
+      end
     end
 
     context 'with single relation' do
@@ -172,6 +210,31 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category
           project_path: exportable.full_path
         )
       end
+
+      context 'contributing user id caching' do
+        before do
+          allow(json_writer).to receive(:write_relation)
+        end
+
+        context 'when :bulk_import_user_mapping feature flag is enabled' do
+          it 'caches existing referenced user_ids' do
+            expect_next_instance_of(BulkImports::UserContributionsExportMapper) do |contribution_mapper|
+              expect(contribution_mapper).to receive(:cache_user_contributions_on_record).with(group).once
+            end
+
+            subject.execute
+          end
+        end
+
+        context 'when :bulk_import_user_mapping feature flag is disabled' do
+          it 'does not cache any contributing user ids' do
+            stub_feature_flags(bulk_import_user_mapping: false)
+
+            expect(BulkImports::UserContributionsExportMapper).not_to receive(:new)
+            subject.execute
+          end
+        end
+      end
     end
 
     context 'with array relation' do
@@ -204,6 +267,43 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category
           project_path: exportable.full_path
         )
       end
+
+      context 'contributing user id caching' do
+        let(:json_writer) do
+          Class.new do
+            def write_relation_array(_, _, enumerator)
+              enumerator.each { _1 }
+            end
+          end.new
+        end
+
+        before do
+          project_member.update!(created_by: create(:user))
+        end
+
+        context 'when :bulk_import_user_mapping feature flag is enabled' do
+          it 'caches existing referenced user_ids' do
+            expected_user_ref_ids = [project_member.user_id, project_member.created_by_id].map(&:to_s)
+
+            subject.execute
+
+            expect(
+              Gitlab::Cache::Import::Caching.values_from_set(user_contributions_cache_key)
+            ).to match_array(expected_user_ref_ids)
+          end
+        end
+
+        context 'when :bulk_import_user_mapping feature flag is disabled' do
+          it 'does not cache any contributing user ids' do
+            stub_feature_flags(bulk_import_user_mapping: false)
+
+            expect(BulkImports::UserContributionsExportMapper).not_to receive(:new)
+            subject.execute
+
+            expect(Gitlab::Cache::Import::Caching.values_from_set(user_contributions_cache_key)).to be_empty
+          end
+        end
+      end
     end
 
     describe 'load balancing' do
@@ -378,6 +478,30 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer, feature_category
       end
     end
 
+    context 'when the record is a user' do
+      let(:json_writer) do
+        Class.new do
+          def write_relation_array(_, _, enumerator)
+            enumerator.each { _1 }
+          end
+        end.new
+      end
+
+      before do
+        exportable.user_contributions = User.all
+      end
+
+      after do
+        exportable.user_contributions = nil
+      end
+
+      it 'does not attempt to cache user references from a User record' do
+        expect(Gitlab::Cache::Import::Caching.values_from_set(user_contributions_cache_key)).to be_empty
+
+        subject.serialize_relation({ user_contributions: { only: [:id, :public_email, :username, :name], include: [] } })
+      end
+    end
+
     context 'when export_reduce_relation_batch_size` feature flag is enabled' do
       before do
         stub_feature_flags(export_reduce_relation_batch_size: true)
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index fa42b4f3a82..445682f68b5 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -186,7 +186,8 @@ ProjectMember:
 User:
 - id
 - username
-- email
+- name
+- public_email
 MergeRequest:
 - id
 - target_branch
diff --git a/spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb b/spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb
deleted file mode 100644
index 32c601ae47d..00000000000
--- a/spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Snowplow Schema Validation' do
-  context 'snowplow events definition' do
-    shared_examples 'matches schema' do
-      it 'conforms schema json' do
-        paths = Dir[Rails.root.join(yaml_path)]
-
-        events = paths.each_with_object([]) do |path, metrics|
-          metrics.push(
-            YAML.safe_load(File.read(path), aliases: true)
-          )
-        end
-
-        expect(events).to all match_schema(Rails.root.join('config/events/schema.json'))
-      end
-    end
-
-    describe 'matches the schema for CE' do
-      let(:yaml_path) { 'config/events/*.yml' }
-
-      it_behaves_like 'matches schema'
-    end
-
-    describe 'matches the schema for EE' do
-      let(:yaml_path) { 'ee/config/events/*.yml' }
-
-      it_behaves_like 'matches schema'
-    end
-  end
-end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index b285aaa0ee3..7e9b7e67218 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -58,21 +58,6 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
     end
   end
 
-  shared_examples 'it requires a group' do
-    context 'when given an deleted group' do
-      before do
-        # destroy group and group member
-        group_member.destroy!
-        group.destroy!
-      end
-
-      it 'returns NullMail type message' do
-        expect(Gitlab::AppLogger).to receive(:info)
-        expect(subject.message).to be_a(ActionMailer::Base::NullMail)
-      end
-    end
-  end
-
   context 'for a project' do
     shared_examples 'an assignee email' do
       let(:recipient) { assignee }
@@ -1756,7 +1741,6 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
       it_behaves_like "a user cannot unsubscribe through footer link"
       it_behaves_like 'appearance header and footer enabled'
       it_behaves_like 'appearance header and footer not enabled'
-      it_behaves_like 'it requires a group'
 
       it 'contains all the useful information' do
         is_expected.to have_subject "Access to the #{group.name} group was granted"
@@ -1792,7 +1776,6 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
       it_behaves_like "a user cannot unsubscribe through footer link"
       it_behaves_like 'appearance header and footer enabled'
       it_behaves_like 'appearance header and footer not enabled'
-      it_behaves_like 'it requires a group'
       it_behaves_like 'does not render a manage notifications link'
 
       context 'when there is an inviter' do
@@ -1914,7 +1897,6 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
       it_behaves_like "a user cannot unsubscribe through footer link"
       it_behaves_like 'appearance header and footer enabled'
       it_behaves_like 'appearance header and footer not enabled'
-      it_behaves_like 'it requires a group'
 
       it 'contains all the useful information' do
         is_expected.to have_subject 'Invitation accepted'
diff --git a/spec/models/bulk_imports/export_spec.rb b/spec/models/bulk_imports/export_spec.rb
index e5c0632b113..d7ed691dc00 100644
--- a/spec/models/bulk_imports/export_spec.rb
+++ b/spec/models/bulk_imports/export_spec.rb
@@ -48,6 +48,56 @@ RSpec.describe BulkImports::Export, type: :model, feature_category: :importers d
     end
   end
 
+  describe 'scopes' do
+    describe '.for_status' do
+      let(:export_1) { create(:bulk_import_export, :finished, relation: 'labels') }
+      let(:export_2) { create(:bulk_import_export, :started, relation: 'user_contributions') }
+
+      it 'returns bulk_import_exports for the given status' do
+        expect(described_class.for_status(0)).to contain_exactly(export_2)
+      end
+    end
+  end
+
+  describe 'state machine transitions', :clean_gitlab_redis_shared_state do
+    describe '#finish!' do
+      let_it_be(:project) { create(:project) }
+
+      let(:export) { create(:bulk_import_export, :started, project: project) }
+      let(:cache_key) { "bulk_imports/#{project.class.name}/#{project.id}/user_contribution_ids" }
+
+      subject(:finish_export) { export.finish! }
+
+      before do
+        Gitlab::Cache::Import::Caching.set_add(cache_key, [1, 2, 3])
+      end
+
+      it 'sets the status to finished' do
+        expect { finish_export }.to change { export.status }.from(0).to(1)
+      end
+
+      context 'when export is for user_contributions' do
+        let(:export) { create(:bulk_import_export, :started, project: project, relation: 'user_contributions') }
+
+        it 'clears cached contributing user_ids' do
+          expect { finish_export }.to change {
+            Gitlab::Cache::Import::Caching.values_from_set(cache_key).length
+          }.from(3).to(0)
+        end
+      end
+
+      context 'when export is not for user_contributions' do
+        let(:export) { create(:bulk_import_export, :started, project: project, relation: 'issues') }
+
+        it 'does clear cached contributing user_ids' do
+          expect { finish_export }.not_to change {
+            Gitlab::Cache::Import::Caching.values_from_set(cache_key).length
+          }.from(3)
+        end
+      end
+    end
+  end
+
   describe '#portable' do
     context 'when associated with project' do
       it 'returns project' do
diff --git a/spec/models/bulk_imports/file_transfer/project_config_spec.rb b/spec/models/bulk_imports/file_transfer/project_config_spec.rb
index 014f624165c..71ce3148dc2 100644
--- a/spec/models/bulk_imports/file_transfer/project_config_spec.rb
+++ b/spec/models/bulk_imports/file_transfer/project_config_spec.rb
@@ -90,6 +90,16 @@ RSpec.describe BulkImports::FileTransfer::ProjectConfig, feature_category: :impo
     end
   end
 
+  describe '#user_contributions_relation?' do
+    it 'returns true for the user_contributions relation' do
+      expect(subject.user_contributions_relation?('user_contributions')).to eq(true)
+    end
+
+    it 'returns false for non user_contributions relations' do
+      expect(subject.user_contributions_relation?('milestones')).to eq(false)
+    end
+  end
+
   describe '#tree_relation_definition_for' do
     it 'returns relation definition' do
       expected = { service_desk_setting: { except: [:outgoing_name, :file_template_project_id], include: [], only: %i[project_id issue_template_key project_key] } }
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 046a4f83592..3e168f4ac2e 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -1909,13 +1909,8 @@ RSpec.describe Namespace, feature_category: :groups_and_projects do
         end
 
         context 'then the parent is deleted' do
-          before do
-            parent.delete
-            group.reload
-          end
-
-          it 'returns its own config with status based on the instance settings' do
-            expect(group.first_auto_devops_config).to eq({ scope: :instance, status: instance_autodevops_status })
+          it 'throws an InvalidForeignKey exception' do
+            expect { parent.destroy! }.to raise_error(ActiveRecord::InvalidForeignKey)
           end
         end
       end
diff --git a/spec/models/namespaces/traversal/cached_spec.rb b/spec/models/namespaces/traversal/cached_spec.rb
index dd52f9c3d70..be1e8e9d02f 100644
--- a/spec/models/namespaces/traversal/cached_spec.rb
+++ b/spec/models/namespaces/traversal/cached_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe Namespaces::Traversal::Cached, feature_category: :database do
 
       context 'when the group is deleted' do
         it 'invalidates the cache' do
+          subgroup.destroy!
           expect { group.destroy! }.not_to change { cache.reload.outdated_at }
         end
       end
@@ -85,6 +86,7 @@ RSpec.describe Namespaces::Traversal::Cached, feature_category: :database do
 
     context 'when group is destroyed' do
       it 'invalidates the cache' do
+        subgroup.destroy!
         cache = create(:namespace_descendants, namespace: group)
 
         expect { group.destroy! }.to change { cache.reload.outdated_at }.from(nil)
@@ -95,6 +97,7 @@ RSpec.describe Namespaces::Traversal::Cached, feature_category: :database do
           old_parent_cache = create(:namespace_descendants, namespace: old_parent)
           new_parent_cache = create(:namespace_descendants, namespace: new_parent)
 
+          subgroup.destroy!
           group.destroy!
 
           expect(old_parent_cache.reload.outdated_at).not_to be_nil
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 11f3b261410..20ac7052241 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1560,6 +1560,18 @@ RSpec.describe User, feature_category: :user_profile do
         expect(described_class.trusted).to match_array([trusted_user1, trusted_user2])
       end
     end
+
+    describe '.by_ids' do
+      let_it_be(:first_user) { create(:user) }
+      let_it_be(:second_user) { create(:user) }
+      let_it_be(:third_user) { create(:user) }
+
+      it 'returns users for the given ids' do
+        user_ids = [first_user, second_user].map(&:id)
+
+        expect(described_class.by_ids(user_ids)).to contain_exactly(first_user, second_user)
+      end
+    end
   end
 
   context 'strip attributes' do
diff --git a/spec/models/work_items/type_spec.rb b/spec/models/work_items/type_spec.rb
index 419ebaa906a..f61584fbbea 100644
--- a/spec/models/work_items/type_spec.rb
+++ b/spec/models/work_items/type_spec.rb
@@ -31,6 +31,12 @@ RSpec.describe WorkItems::Type, feature_category: :team_planning do
         .with_foreign_key('parent_type_id')
     end
 
+    it 'has many `parent_restrictions`' do
+      is_expected.to have_many(:parent_restrictions)
+        .class_name('WorkItems::HierarchyRestriction')
+        .with_foreign_key('child_type_id')
+    end
+
     describe 'allowed_child_types_by_name' do
       it 'defines association' do
         is_expected.to have_many(:allowed_child_types_by_name)
@@ -50,6 +56,26 @@ RSpec.describe WorkItems::Type, feature_category: :team_planning do
         expect(parent_type.allowed_child_types_by_name.pluck(:name)).to match_array(expected_type_names)
       end
     end
+
+    describe 'allowed_parent_types_by_name' do
+      it 'defines association' do
+        is_expected.to have_many(:allowed_parent_types_by_name)
+          .through(:parent_restrictions)
+          .class_name('::WorkItems::Type')
+          .with_foreign_key(:parent_type_id)
+      end
+
+      it 'sorts by name ascending' do
+        expected_type_names = %w[Atype Ztype gtype]
+        child_type = create(:work_item_type)
+
+        expected_type_names.shuffle.each do |name|
+          create(:hierarchy_restriction, parent_type: create(:work_item_type, name: name), child_type: child_type)
+        end
+
+        expect(child_type.allowed_parent_types_by_name.pluck(:name)).to match_array(expected_type_names)
+      end
+    end
   end
 
   describe 'callbacks' do
@@ -293,6 +319,37 @@ RSpec.describe WorkItems::Type, feature_category: :team_planning do
     end
   end
 
+  describe '#allowed_parent_types' do
+    let_it_be(:work_item_type) { create(:work_item_type) }
+    let_it_be(:parent_type) { create(:work_item_type) }
+    let_it_be(:restriction) { create(:hierarchy_restriction, parent_type: parent_type, child_type: work_item_type) }
+
+    subject { work_item_type.allowed_parent_types(cache: cached) }
+
+    context 'when cache is true' do
+      let(:cached) { true }
+
+      before do
+        allow(work_item_type).to receive(:with_reactive_cache).and_call_original
+      end
+
+      it 'returns the cached data' do
+        expect(work_item_type).to receive(:with_reactive_cache)
+        expect(Rails.cache).to receive(:exist?).with("work_items_type:#{work_item_type.id}:alive")
+        is_expected.to eq([parent_type])
+      end
+    end
+
+    context 'when cache is false' do
+      let(:cached) { false }
+
+      it 'returns queried data' do
+        expect(work_item_type).not_to receive(:with_reactive_cache)
+        is_expected.to eq([parent_type])
+      end
+    end
+  end
+
   describe '#calculate_reactive_cache' do
     let(:work_item_type) { build(:work_item_type) }
 
@@ -300,9 +357,13 @@ RSpec.describe WorkItems::Type, feature_category: :team_planning do
 
     it 'returns cache data for allowed child types' do
       child_types = create_list(:work_item_type, 2)
-      expect(work_item_type).to receive(:allowed_child_types_by_name).and_return(child_types)
+      parent_types = create_list(:work_item_type, 2)
+      cache_data = { allowed_child_types_by_name: child_types, allowed_parent_types_by_name: parent_types }
 
-      is_expected.to eq(child_types)
+      expect(work_item_type).to receive(:allowed_child_types_by_name).and_return(child_types)
+      expect(work_item_type).to receive(:allowed_parent_types_by_name).and_return(parent_types)
+
+      is_expected.to eq(cache_data)
     end
   end
 end
diff --git a/spec/requests/api/generic_packages_spec.rb b/spec/requests/api/generic_packages_spec.rb
index eadd0817fb6..3e92bb9e07e 100644
--- a/spec/requests/api/generic_packages_spec.rb
+++ b/spec/requests/api/generic_packages_spec.rb
@@ -83,7 +83,7 @@ RSpec.describe API::GenericPackages, feature_category: :package_registry do
     end
   end
 
-  describe 'PUT /api/v4/projects/:id/packages/generic/:package_name/:package_version/:file_name/authorize' do
+  describe 'PUT /api/v4/projects/:id/packages/generic/:package_name/:package_version/(*path)/:file_name/authorize' do
     context 'with valid project' do
       where(:project_visibility, :user_role, :member?, :authenticate_with, :expected_status) do
         'PUBLIC'  | :developer | true  | :personal_access_token         | :success
@@ -197,7 +197,7 @@ RSpec.describe API::GenericPackages, feature_category: :package_registry do
     end
   end
 
-  describe 'PUT /api/v4/projects/:id/packages/generic/:package_name/:package_version/:file_name' do
+  describe 'PUT /api/v4/projects/:id/packages/generic/:package_name/:package_version/(*path)/:file_name' do
     include WorkhorseHelpers
 
     let(:file_upload) { fixture_file_upload('spec/fixtures/packages/generic/myfile.tar.gz') }
@@ -397,6 +397,22 @@ RSpec.describe API::GenericPackages, feature_category: :package_registry do
             end
           end
         end
+
+        context 'when file has path' do
+          let(:params) { super().merge(path: 'path/to') }
+
+          it 'creates a package and package file with path' do
+            headers = workhorse_headers.merge(auth_header)
+
+            upload_file(params, headers)
+
+            aggregate_failures do
+              package = project.packages.generic.last
+              expect(response).to have_gitlab_http_status(:created)
+              expect(package.package_files.last.file_name).to eq('path%2Fto%2Fmyfile.tar.gz')
+            end
+          end
+        end
       end
 
       context 'when valid personal access token is used' do
@@ -529,7 +545,7 @@ RSpec.describe API::GenericPackages, feature_category: :package_registry do
     end
   end
 
-  describe 'GET /api/v4/projects/:id/packages/generic/:package_name/:package_version/:file_name' do
+  describe 'GET /api/v4/projects/:id/packages/generic/:package_name/:package_version/(*path)/:file_name' do
     let_it_be(:package) { create(:generic_package, project: project) }
     let_it_be(:package_file) { create(:package_file, :generic, package: package) }
 
@@ -739,6 +755,21 @@ RSpec.describe API::GenericPackages, feature_category: :package_registry do
       expect(response).to have_gitlab_http_status(:not_found)
     end
 
+    context 'when file has path' do
+      let_it_be(:file_path) { "path/to/#{package_file.file_name}" }
+
+      before do
+        project.add_developer(user)
+        package_file.update_column(:file_name, URI.encode_uri_component(file_path))
+      end
+
+      it 'responds with 200 OK' do
+        download_file(personal_access_token_header, file_name: file_path)
+
+        expect(response).to have_gitlab_http_status(:success)
+      end
+    end
+
     def download_file(request_headers, package_name: nil, file_name: nil)
       package_name ||= package.name
       file_name ||= package_file.file_name
diff --git a/spec/scripts/internal_events/cli_spec.rb b/spec/scripts/internal_events/cli_spec.rb
index d6c1eb0b986..1bfac63b4d1 100644
--- a/spec/scripts/internal_events/cli_spec.rb
+++ b/spec/scripts/internal_events/cli_spec.rb
@@ -139,16 +139,14 @@ RSpec.describe Cli, feature_category: :service_ping do
     end
 
     context 'when creating a metric from multiple events' do
+      # all of these product_groups belong to 'dev' product_section
       let(:events) do
         [{
-          action: '00_event1', internal_events: true,
-          product_section: 'dev', product_stage: 'plan', product_group: 'optimize'
+          action: '00_event1', internal_events: true, product_group: 'optimize'
         }, {
-          action: '00_event2', internal_events: true,
-          product_section: 'dev', product_stage: 'create', product_group: 'ide'
+          action: '00_event2', internal_events: true, product_group: 'ide'
         }, {
-          action: '00_event3', internal_events: true,
-          product_section: 'dev', product_stage: 'create', product_group: 'source_code'
+          action: '00_event3', internal_events: true, product_group: 'source_code'
         }]
       end
 
@@ -169,8 +167,7 @@ RSpec.describe Cli, feature_category: :service_ping do
           "\n", # Submit selections
           "\n", # Select: Weekly/Monthly count of unique users
           "aggregate metric description\n", # Submit description
-          "\n", # Accept description for weekly
-          "\n" # Copy & continue
+          "\n" # Accept description for weekly
         ])
 
         # Filter down to "dev" options
@@ -203,8 +200,7 @@ RSpec.describe Cli, feature_category: :service_ping do
           "\n", # Submit selections
           "\n", # Select: Weekly/Monthly count of unique users
           "aggregate metric description\n", # Submit description
-          "\n", # Accept description for weekly
-          "\n" # Copy & continue
+          "\n" # Accept description for weekly
         ])
 
         # Filter down to "dev:create" options
@@ -777,8 +773,6 @@ RSpec.describe Cli, feature_category: :service_ping do
           "internal_events_cli_opened\n", # Submit action name
           "6\n", # Select: None
           "\n", # Skip MR URL
-          "analytics\n", # Input section
-          "monitor\n", # Input stage
           "analytics_instrumentation\n", # Input group
           "2\n", # Select [premium, ultimate]
           "y\n", # Create file
@@ -805,8 +799,6 @@ RSpec.describe Cli, feature_category: :service_ping do
           "where a defition file was created with the CLI\n", # Input description
           "\n", # Submit weekly description for monthly
           "2\n", # Select: Modify attributes
-          "\n", # Accept section
-          "\n", # Accept stage
           "\n", # Accept group
           "\n", # Skip URL
           "1\n", # Select: [free, premium, ultimate]
diff --git a/spec/services/bulk_imports/user_contributions_export_service_spec.rb b/spec/services/bulk_imports/user_contributions_export_service_spec.rb
new file mode 100644
index 00000000000..949e2fef17c
--- /dev/null
+++ b/spec/services/bulk_imports/user_contributions_export_service_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BulkImports::UserContributionsExportService, :clean_gitlab_redis_shared_state, feature_category: :importers do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:group) }
+  let_it_be(:cached_users) { create_list(:user, 2) }
+
+  let(:jid) { 'jid' }
+
+  subject(:service) { described_class.new(user.id, portable, jid) }
+
+  describe '#execute' do
+    shared_examples 'exports cached user contributions as a relation' do
+      let(:cache_key) { "bulk_imports/#{portable.class.name}/#{portable.id}/user_contribution_ids" }
+
+      before do
+        Gitlab::Cache::Import::Caching.set_add(cache_key, cached_users.map(&:id))
+      end
+
+      it 'assigns cached contributing user ids to user_contributions attribute' do
+        service.execute
+
+        expect(portable.user_contributions.to_a).to match_array(cached_users)
+      end
+
+      it 'exports user_contributions as an unbatched relation' do
+        service.execute
+
+        user_contributions_export = portable.bulk_import_exports.find_by(relation: 'user_contributions')
+        expect(user_contributions_export.batched).to eq(false)
+      end
+
+      it 'has a clear user id cache after export finishes' do
+        service.execute
+
+        expect(Gitlab::Cache::Import::Caching.values_from_set(cache_key)).to be_empty
+      end
+    end
+
+    context 'when exporting a group' do
+      it_behaves_like 'exports cached user contributions as a relation' do
+        let!(:portable) { group }
+      end
+    end
+
+    context 'when exporting a project' do
+      it_behaves_like 'exports cached user contributions as a relation' do
+        let!(:portable) { project }
+      end
+    end
+  end
+end
diff --git a/spec/support/import_export/configuration_helper.rb b/spec/support/import_export/configuration_helper.rb
index f6917cdd89e..d9608b8d6ea 100644
--- a/spec/support/import_export/configuration_helper.rb
+++ b/spec/support/import_export/configuration_helper.rb
@@ -31,8 +31,8 @@ module ConfigurationHelper
     # Remove duplicated or add missing models
     # - project is not part of the tree, so it has to be added manually.
     # - milestone, labels, merge_request have both singular and plural versions in the tree, so remove the duplicates.
-    # - User, Author... Models we do not care about for checking models
-    names.flatten.uniq - %w[milestones labels user author merge_request design] + [key.to_s]
+    # - User, Author... Models we do not care about for checking models (user_contributions are just users)
+    names.flatten.uniq - %w[milestones labels user user_contributions author merge_request design] + [key.to_s]
   end
 
   def relation_class_for_name(relation_name)
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 04f1ac10cf2..cb32d89e603 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -1389,7 +1389,6 @@
 - './ee/spec/lib/gitlab/subscription_portal/clients/rest_spec.rb'
 - './ee/spec/lib/gitlab_subscriptions/upcoming_reconciliation_entity_spec.rb'
 - './ee/spec/lib/gitlab/template/custom_templates_spec.rb'
-- './ee/spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb'
 - './ee/spec/lib/gitlab/tracking/standard_context_spec.rb'
 - './ee/spec/lib/gitlab/tree_summary_spec.rb'
 - './ee/spec/lib/gitlab/usage_data_counters/epic_activity_unique_counter_spec.rb'
@@ -6584,7 +6583,6 @@
 - './spec/lib/gitlab/tracking/destinations/snowplow_micro_spec.rb'
 - './spec/lib/gitlab/tracking/destinations/snowplow_spec.rb'
 - './spec/lib/gitlab/tracking/event_definition_spec.rb'
-- './spec/lib/gitlab/tracking/snowplow_schema_validation_spec.rb'
 - './spec/lib/gitlab/tracking_spec.rb'
 - './spec/lib/gitlab/tracking/standard_context_spec.rb'
 - './spec/lib/gitlab/tree_summary_spec.rb'
diff --git a/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb b/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb
index 709e82de3aa..0c11e47cc37 100644
--- a/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb
+++ b/spec/support/shared_contexts/requests/api/graphql/work_items/work_item_types_shared_context.rb
@@ -15,6 +15,9 @@ RSpec.shared_context 'with work item types request context' do
           allowedChildTypes {
             nodes { id name }
           }
+          allowedParentTypes {
+            nodes { id name }
+          }
         }
       }
     GRAPHQL
@@ -55,10 +58,14 @@ RSpec.shared_context 'with work item types request context' do
   end
 
   def hierarchy_widget_attributes(work_item_type, base_attributes)
-    fields = work_item_type.allowed_child_types_by_name.map do |child_type|
+    child_types = work_item_type.allowed_child_types_by_name.map do |child_type|
       { "id" => child_type.to_global_id.to_s, "name" => child_type.name }
     end
+    parent_types = work_item_type.allowed_parent_types_by_name.map do |parent_type|
+      { "id" => parent_type.to_global_id.to_s, "name" => parent_type.name }
+    end
 
-    base_attributes.merge({ 'allowedChildTypes' => { 'nodes' => fields } })
+    base_attributes.merge({ 'allowedChildTypes' => { 'nodes' => child_types },
+'allowedParentTypes' => { 'nodes' => parent_types } })
   end
 end
diff --git a/spec/workers/bulk_imports/relation_export_worker_spec.rb b/spec/workers/bulk_imports/relation_export_worker_spec.rb
index 55e2a238027..12f949ce042 100644
--- a/spec/workers/bulk_imports/relation_export_worker_spec.rb
+++ b/spec/workers/bulk_imports/relation_export_worker_spec.rb
@@ -61,6 +61,38 @@ RSpec.describe BulkImports::RelationExportWorker, feature_category: :importers d
       context 'when export is not batched' do
         include_examples 'export service', BulkImports::RelationExportService
       end
+
+      context 'when export is user_contributions' do
+        let(:relation) { 'user_contributions' }
+
+        context 'and :bulk_import_user_mapping feature flag is enabled' do
+          it 'enqueues the UserContributionsExportWorker' do
+            expect(BulkImports::UserContributionsExportWorker).to receive(:perform_async).with(
+              group.id, group.class.name, user.id
+            ).twice
+
+            perform_multiple(job_args)
+          end
+        end
+
+        context 'and :bulk_import_user_mapping feature flag is disabled' do
+          before do
+            stub_feature_flags(bulk_import_user_mapping: false)
+          end
+
+          it 'does not enqueue the UserContributionsExportWorker' do
+            expect(BulkImports::UserContributionsExportWorker).not_to receive(:perform_async)
+
+            perform_multiple(job_args)
+          end
+
+          it 'does not create a user contributions export with a different service' do
+            expect { perform_multiple(job_args) }.not_to change {
+              group.bulk_import_exports.where(relation: 'user_contributions').count
+            }.from(0)
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/workers/bulk_imports/user_contributions_export_worker_spec.rb b/spec/workers/bulk_imports/user_contributions_export_worker_spec.rb
new file mode 100644
index 00000000000..58abac002db
--- /dev/null
+++ b/spec/workers/bulk_imports/user_contributions_export_worker_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BulkImports::UserContributionsExportWorker, :freeze_time, feature_category: :importers do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+
+  let(:job_args) { [project.id, project.class.name, user.id] }
+  let(:current_time) { Time.current }
+
+  describe '#perform' do
+    it_behaves_like 'an idempotent worker' do
+      before do
+        allow(described_class).to receive(:perform_in).twice
+      end
+
+      shared_examples 'user contributions are still being cached during export' do
+        it 'does not begin exporting user contributions' do
+          perform_multiple(job_args)
+
+          user_contributions_export = project.bulk_import_exports.find_by(relation: 'user_contributions')
+          expect(user_contributions_export).to be_nil
+        end
+
+        it 're-enqueues itself' do
+          expect(described_class).to receive(:perform_in).with(20.seconds, *job_args, current_time).twice
+
+          perform_multiple(job_args)
+        end
+      end
+
+      shared_examples 'user contributions are incomplete due to export failure' do
+        it 'does not begin exporting user contributions' do
+          perform_multiple(job_args)
+
+          user_contributions_export = project.bulk_import_exports.find_by(relation: 'user_contributions')
+          expect(user_contributions_export).to be_nil
+        end
+
+        it 'does not re-enqueue itself' do
+          expect(described_class).not_to receive(:perform_in)
+
+          perform_multiple(job_args)
+        end
+
+        it 'logs an error' do
+          logger = Gitlab::Export::Logger.build
+          allow(Gitlab::Export::Logger).to receive(:build).and_return(logger)
+
+          expect(logger).to receive(:error).with(
+            hash_including(
+              importer: 'gitlab_migration',
+              project_id: project.id,
+              project_name: project.name,
+              project_path: project.full_path
+            )
+          ).twice
+
+          perform_multiple(job_args)
+        end
+      end
+
+      context 'when all exports have finished or failed' do
+        let!(:issues_export) { create(:bulk_import_export, :finished, project: project, relation: 'issues') }
+        let!(:merge_requests_export) do
+          create(:bulk_import_export, :failed, project: project, relation: 'merge_requests')
+        end
+
+        it 'begins exporting user contributions' do
+          perform_multiple(job_args)
+
+          user_contributions_export = project.bulk_import_exports.find_by(relation: 'user_contributions')
+          expect(user_contributions_export).to be_present
+        end
+
+        it 'does not re-enqueue itself' do
+          expect(described_class).not_to receive(:perform_in)
+
+          perform_multiple(job_args)
+        end
+      end
+
+      context 'when an export is still incomplete' do
+        let!(:issues_export) { create(:bulk_import_export, :finished, project: project, relation: 'issues') }
+        let!(:merge_requests_export) do
+          create(:bulk_import_export, :started, project: project, relation: 'merge_requests')
+        end
+
+        it_behaves_like 'user contributions are still being cached during export'
+      end
+
+      context 'when no exports have been created yet' do
+        it_behaves_like 'user contributions are still being cached during export'
+
+        context 'and no exports have been created for more than 6 hours' do
+          let(:job_args) { [project.id, project.class.name, user.id, current_time - 7.hours] }
+
+          it_behaves_like 'user contributions are incomplete due to export failure'
+        end
+      end
+    end
+  end
+end
diff --git a/tests.yml b/tests.yml
index 9b5197d8766..c2da8d13a44 100644
--- a/tests.yml
+++ b/tests.yml
@@ -41,10 +41,20 @@ mapping:
   - source: '.gitlab/ci/(?<rest>.+)\.gitlab-ci\.yml'
     test: 'spec/dot_gitlab_ci/%{rest}_spec.rb'
 
+  # Map config to respective specs
+  - source: 'config/(?<rest>.+)\..*'
+    test: 'spec/config/%{rest}_spec.rb'
+
   # Initializers should map to respective spec
   - source: 'config/initializers/(?<rest>.+)\.rb'
     test: 'spec/initializers/%{rest}_spec.rb'
 
+  # Snowplow definitions map to schema validation spec
+  - source:
+      - '(?<prefix>ee/)?config/events/.+\.yml'
+      - 'config/events/schema\.json'
+    test: 'spec/lib/gitlab/tracking/event_definition_validate_all_spec.rb'
+
   # DB structure should map to schema spec
   - source: 'db/structure\.sql'
     test: 'spec/db/schema_spec.rb'