diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index b3df7c597c8..a50fc94ff83 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-c85e53a032101e7e53915ec10748f9559449431c
+713cc8c7fb996ba95490debfffef04abff06f138
diff --git a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql
index 6d20c454f2c..0e826ea3d7c 100644
--- a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql
+++ b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql
@@ -57,6 +57,7 @@ query getGroupMergeRequests(
       deployedAfter: $deployedAfter
       environmentName: $environmentName
       not: $not
+      includeSubgroups: true
       before: $beforeCursor
       after: $afterCursor
       first: $firstPageSize
diff --git a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql
index 25846bc2805..22cb0dc0e09 100644
--- a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql
+++ b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql
@@ -45,6 +45,7 @@ query getGroupMergeRequestsCount(
       deployedAfter: $deployedAfter
       environmentName: $environmentName
       not: $not
+      includeSubgroups: true
     ) {
       count
     }
@@ -70,6 +71,7 @@ query getGroupMergeRequestsCount(
       deployedAfter: $deployedAfter
       environmentName: $environmentName
       not: $not
+      includeSubgroups: true
     ) {
       count
     }
@@ -95,6 +97,7 @@ query getGroupMergeRequestsCount(
       deployedAfter: $deployedAfter
       environmentName: $environmentName
       not: $not
+      includeSubgroups: true
     ) {
       count
     }
@@ -120,6 +123,7 @@ query getGroupMergeRequestsCount(
       deployedAfter: $deployedAfter
       environmentName: $environmentName
       not: $not
+      includeSubgroups: true
     ) {
       count
     }
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index 8c2c2e4148e..598c85b652d 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -310,7 +310,9 @@ export default {
         this.isSubmittingWithKeydown = true;
         this.handleUpdate();
       }
-      this.updatedNoteBody = '';
+      if (!this.isMeasuringCommentTemperature) {
+        this.updatedNoteBody = '';
+      }
     },
     runCommentTemperatureMeasurement(onSaveHandler) {
       this.isMeasuringCommentTemperature = true;
diff --git a/app/assets/javascripts/todos/components/mutations/un_snooze_todo.mutation.graphql b/app/assets/javascripts/todos/components/mutations/un_snooze_todo.mutation.graphql
new file mode 100644
index 00000000000..c5cbc99fb5b
--- /dev/null
+++ b/app/assets/javascripts/todos/components/mutations/un_snooze_todo.mutation.graphql
@@ -0,0 +1,9 @@
+mutation unSnoozeTodo($todoId: TodoID!) {
+  todoUnSnooze(input: { id: $todoId }) {
+    todo {
+      id
+      snoozedUntil
+    }
+    errors
+  }
+}
diff --git a/app/assets/javascripts/todos/components/todo_item_actions.vue b/app/assets/javascripts/todos/components/todo_item_actions.vue
index 7d2df1eb27b..40cbb20af0b 100644
--- a/app/assets/javascripts/todos/components/todo_item_actions.vue
+++ b/app/assets/javascripts/todos/components/todo_item_actions.vue
@@ -7,6 +7,7 @@ import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { INSTRUMENT_TODO_ITEM_CLICK, TODO_STATE_DONE, TODO_STATE_PENDING } from '../constants';
 import markAsDoneMutation from './mutations/mark_as_done.mutation.graphql';
 import markAsPendingMutation from './mutations/mark_as_pending.mutation.graphql';
+import unSnoozeTodoMutation from './mutations/un_snooze_todo.mutation.graphql';
 import SnoozeTodoDropdown from './snooze_todo_dropdown.vue';
 
 export default {
@@ -99,17 +100,62 @@ export default {
         showError();
       }
     },
+    async unSnooze() {
+      try {
+        const { data } = await this.$apollo.mutate({
+          mutation: unSnoozeTodoMutation,
+          variables: {
+            todoId: this.todo.id,
+          },
+          optimisticResponse: {
+            todoUnSnooze: {
+              todo: {
+                id: this.todo.id,
+                snoozedUntil: null,
+                __typename: 'Todo',
+              },
+              errors: [],
+            },
+          },
+        });
+
+        if (data.errors?.length > 0) {
+          reportToSentry(this.$options.name, new Error(data.errors.join(', ')));
+          this.showUnSnoozedError();
+        } else {
+          this.$emit('change', this.todo.id, this.isDone);
+        }
+      } catch (failure) {
+        reportToSentry(this.$options.name, failure);
+        this.showUnSnoozedError();
+      }
+    },
+    showUnSnoozedError() {
+      this.$toast.show(s__('Todos|Failed to un-snooze todo. Try again later.'), {
+        variant: 'danger',
+      });
+    },
   },
   i18n: {
     markAsPending: s__('Todos|Undo'),
     markAsDone: s__('Todos|Mark as done'),
+    unSnooze: s__('Todos|Remove snooze'),
   },
 };
 </script>
 
 <template>
   <div @click.prevent>
-    <snooze-todo-dropdown v-if="showSnoozingDropdown" :todo="todo" />
+    <gl-button
+      v-if="glFeatures.todosSnoozing && isSnoozed"
+      v-gl-tooltip
+      icon="time-out"
+      :title="$options.i18n.unSnooze"
+      :aria-label="$options.i18n.unSnooze"
+      data-testid="un-snooze-button"
+      @click="unSnooze"
+    />
+    <snooze-todo-dropdown v-else-if="showSnoozingDropdown" :todo="todo" />
     <gl-button
       v-gl-tooltip.hover
       :icon="isDone ? 'redo' : 'check'"
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index 32448ba1e55..555c6cdd2bf 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -48,8 +48,3 @@ $type-scale: (
 .gl-z-dropdown-menu\! {
   z-index: $zindex-dropdown-menu !important;
 }
-
-// stylelint-disable-next-line gitlab/no-gl-class
-.gl-last-of-type-border-b-0:last-of-type {
-  border-bottom-width: 0;
-}
diff --git a/app/components/layouts/crud_component.haml b/app/components/layouts/crud_component.haml
index 0b464c30d5c..ce09e46d1a8 100644
--- a/app/components/layouts/crud_component.haml
+++ b/app/components/layouts/crud_component.haml
@@ -7,7 +7,7 @@
           - if @count
             %span.gl-inline-flex.gl-items-center.gl-gap-2.gl-text-sm.gl-text-subtle{ data: { testid: 'crud-count' } }
               - if @icon
-                = sprite_icon(@icon, css_class: @icon_class)
+                = sprite_icon(@icon, css_class: icon_classes)
               %span{ @count_options }
                 = @count
         - if description? || @description
diff --git a/app/components/layouts/crud_component.rb b/app/components/layouts/crud_component.rb
index 7635e295dd6..87d42664a57 100644
--- a/app/components/layouts/crud_component.rb
+++ b/app/components/layouts/crud_component.rb
@@ -48,6 +48,12 @@ module Layouts
       @body_options.merge(default_attrs(@body_options, default_testid, default_classes))
     end
 
+    def icon_classes
+      default_classes = ['gl-fill-icon-subtle']
+      default_classes << @icon_class if @icon_class
+      default_classes.join(' ')
+    end
+
     def toggle_button_options_attrs
       default_testid = 'crud-action-toggle'
       default_classes = ['js-toggle-button js-toggle-content']
diff --git a/app/models/integrations/teamcity.rb b/app/models/integrations/teamcity.rb
index 19e57e47569..4fd0c19e4b3 100644
--- a/app/models/integrations/teamcity.rb
+++ b/app/models/integrations/teamcity.rb
@@ -12,21 +12,25 @@ module Integrations
 
     field :teamcity_url,
       title: -> { s_('ProjectService|TeamCity server URL') },
+      help: -> { s_('TeamCityIntegration|TeamCity root URL (for example, `https://teamcity.example.com`).') },
       placeholder: 'https://teamcity.example.com',
       exposes_secrets: true,
       required: true
 
     field :build_type,
-      help: -> { s_('ProjectService|The build configuration ID of the TeamCity project.') },
+      help: -> { s_('TeamCityIntegration|The build configuration ID of the TeamCity project.') },
       required: true
 
     field :username,
-      help: -> { s_('ProjectService|Must have permission to trigger a manual build in TeamCity.') }
+      help: -> { s_('TeamCityIntegration|A user with permissions to trigger a manual build.') },
+      required: true
 
     field :password,
       type: :password,
+      help: -> { s_('TeamCityIntegration|The password of the user.') },
       non_empty_password_title: -> { s_('ProjectService|Enter new password') },
-      non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current password') }
+      non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current password') },
+      required: true
 
     validates :teamcity_url, presence: true, public_url: true, if: :activated?
     validates :build_type, presence: true, if: :activated?
diff --git a/app/models/pages_deployment.rb b/app/models/pages_deployment.rb
index 62ba05ec223..50baa6fb97e 100644
--- a/app/models/pages_deployment.rb
+++ b/app/models/pages_deployment.rb
@@ -74,10 +74,8 @@ class PagesDeployment < ApplicationRecord
     update(deleted_at: Time.now.utc)
   end
 
-  def self.count_versioned_deployments_for(project_or_namespace, limit)
-    namespace = project_or_namespace.try(:root_ancestor) || project_or_namespace
-
-    project_id_in(namespace.all_projects)
+  def self.count_versioned_deployments_for(projects, limit)
+    project_id_in(projects)
       .active
       .versioned
       .limit(limit)
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb
index 16e1dbd9b30..6a4e9c80700 100644
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -32,8 +32,6 @@ class PersonalAccessToken < ApplicationRecord
 
   attribute :organization_id, default: -> { Organizations::Organization::DEFAULT_ORGANIZATION_ID }
 
-  # PATs are 20 characters + optional configurable settings prefix (0..20)
-  TOKEN_LENGTH_RANGE = (20..40)
   MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS_BUFFERED = 400
   MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS = 365
 
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml
index 6d6daa758a5..af1a37920d3 100644
--- a/app/views/shared/_label.html.haml
+++ b/app/views/shared/_label.html.haml
@@ -6,7 +6,7 @@
 - toggle_subscription_path = toggle_subscription_label_path(label, @project) if current_user
 - tooltip_title = label_status_tooltip(label, status) if status
 
-%li.js-label-list-item.gl-list-none.gl-border-b.gl-last-of-type-border-b-0{ id: label_css_id, data: { id: label.id } }
+%li.js-label-list-item.gl-list-none.gl-border-b.last-of-type:gl-border-b-0{ id: label_css_id, data: { id: label.id } }
   .label-content.gl-pl-5.gl-pr-3.gl-py-4.gl-rounded-base{ class: "#{ 'gl-py-3' if force_priority }" }
     = render "shared/label_row", label: label, force_priority: force_priority
     %ul.label-actions-list
diff --git a/app/views/shared/file_hooks/_index.html.haml b/app/views/shared/file_hooks/_index.html.haml
index 1feebccca53..30885d060ad 100644
--- a/app/views/shared/file_hooks/_index.html.haml
+++ b/app/views/shared/file_hooks/_index.html.haml
@@ -8,9 +8,9 @@
     = render ::Layouts::CrudComponent.new(s_('Webhooks|File hooks'), icon: 'document', count: file_hooks.count, options: { class: 'gl-mt-3' }) do |c|
       - c.with_body do
         - if file_hooks.any?
-          %ul.content-list{ class: '!-gl-my-3' }
+          %ul.content-list
             - file_hooks.each do |file|
-              %li.gl-border-b.gl-last-of-type-border-b-0
+              %li.gl-border-b
                 .monospace
                   = File.basename(file)
         - else
diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml
index 54e8d59cc44..d5b64de9932 100644
--- a/app/views/shared/milestones/_labels_tab.html.haml
+++ b/app/views/shared/milestones/_labels_tab.html.haml
@@ -11,7 +11,7 @@
           - open_issues = milestone_issues_by_label_count(@milestone, label, state: :opened)
           - closed_issues = milestone_issues_by_label_count(@milestone, label, state: :closed)
 
-          %li.gl-list-none.gl-border-b.gl-last-of-type-border-b-0.md:gl-flex.gl-px-5.gl-py-4.gl-gap-5.gl-items-baseline
+          %li.gl-list-none.gl-border-b.md:gl-flex.gl-px-5.gl-py-4.gl-gap-5.gl-items-baseline.last-of-type:gl-border-b-0
             .md:gl-w-20.gl-shrink-0.gl-grow.gl-mb-4.md:gl-mb-0
               = render_label(label, tooltip: false, link: milestones_issues_path(options))
             - if markdown_field(label, :description).present?
diff --git a/app/views/shared/web_hooks/_hook.html.haml b/app/views/shared/web_hooks/_hook.html.haml
index 1c322ede14c..384e312dce3 100644
--- a/app/views/shared/web_hooks/_hook.html.haml
+++ b/app/views/shared/web_hooks/_hook.html.haml
@@ -1,7 +1,7 @@
 - sslStatus = hook.enable_ssl_verification ? _('enabled') : _('disabled')
 - sslBadgeText = _('SSL Verification:') + ' ' + sslStatus
 
-%li.gl-border-b.gl-last-of-type-border-b-0
+%li.gl-border-b
   .gl-flex.gl-flex-wrap.sm:gl-flex-nowrap.gl-justify-between.gl-gap-x-5.gl-gap-y-3
     .gl-basis-full.gl-flex.gl-flex-col
       - if hook.name?
diff --git a/config/feature_flags/beta/bitbucket_server_user_mapping.yml b/config/feature_flags/beta/bitbucket_server_user_mapping.yml
index 7c8e0805ebb..2e9ae4c2588 100644
--- a/config/feature_flags/beta/bitbucket_server_user_mapping.yml
+++ b/config/feature_flags/beta/bitbucket_server_user_mapping.yml
@@ -6,4 +6,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/509897
 milestone: '17.7'
 group: group::import and integrate
 type: beta
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/beta/gitea_user_mapping.yml b/config/feature_flags/beta/gitea_user_mapping.yml
index 9a71dff97c2..08ec0c65f4c 100644
--- a/config/feature_flags/beta/gitea_user_mapping.yml
+++ b/config/feature_flags/beta/gitea_user_mapping.yml
@@ -6,4 +6,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/498390
 milestone: '17.6'
 group: group::import and integrate
 type: beta
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/gitlab_com_derisk/auth_finder_no_token_length_detection.yml b/config/feature_flags/wip/conan_package_revisions_support.yml
similarity index 58%
rename from config/feature_flags/gitlab_com_derisk/auth_finder_no_token_length_detection.yml
rename to config/feature_flags/wip/conan_package_revisions_support.yml
index a482d33e4f0..b772e831d78 100644
--- a/config/feature_flags/gitlab_com_derisk/auth_finder_no_token_length_detection.yml
+++ b/config/feature_flags/wip/conan_package_revisions_support.yml
@@ -1,9 +1,9 @@
 ---
-name: auth_finder_no_token_length_detection
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/487009
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169322
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/504421
-milestone: '17.7'
-group: group::cells infrastructure
-type: gitlab_com_derisk
+name: conan_package_revisions_support
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333033
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165034
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/483634
+milestone: '17.8'
+group: group::package registry
+type: wip
 default_enabled: false
diff --git a/doc/api/integrations.md b/doc/api/integrations.md
index 9def7d3acae..3cd97f2f63f 100644
--- a/doc/api/integrations.md
+++ b/doc/api/integrations.md
@@ -1299,7 +1299,7 @@ Parameters:
 | --------- | ---- | -------- | ----------- |
 | `teamcity_url` | string | yes | TeamCity root URL (for example, `https://teamcity.example.com`). |
 | `enable_ssl_verification` | boolean | no | Enable SSL verification. Defaults to `true` (enabled). |
-| `build_type` | string | yes | Build configuration ID. |
+| `build_type` | string | yes | The build configuration ID of the TeamCity project. |
 | `username` | string | yes | A user with permissions to trigger a manual build. |
 | `password` | string | yes | The password of the user. |
 | `push_events` | boolean | no | Enable notifications for push events. |
diff --git a/doc/user/duo_amazon_q/index.md b/doc/user/duo_amazon_q/index.md
index cb8afdcee9e..453ede7020f 100644
--- a/doc/user/duo_amazon_q/index.md
+++ b/doc/user/duo_amazon_q/index.md
@@ -21,15 +21,14 @@ This feature is Preview/Beta and is available for testing, but not ready for pro
 At Re:Invent 2024, Amazon announced the GitLab Duo with Amazon Q integration.
 With this integration, you can automate tasks and increase productivity.
 
-On December 3, 2024, the private fork of the GitLab codebase where Amazon
-and GitLab have been collaborating on the integration was unveiled.
 Select GitLab customers have been invited to a test GitLab instance
 so they can start to experiment right away.
 
 ## Set up GitLab Duo with Amazon Q
 
-To access GitLab Duo with Amazon Q, you must request [access to a lab environment](https://about.gitlab.com/partners/technology-partners/aws/#interest).
-Alternately, you can [set up the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab/-/blob/gitlab-duo-with-amazon-q-preview/README.md?ref_type=heads).
+To access GitLab Duo with Amazon Q, request [access to a lab environment](https://about.gitlab.com/partners/technology-partners/aws/#interest).
+Alternately, if you have GitLab 17.8 or later, you can
+[set it up on your self-managed installation](setup.md).
 
 ## Use GitLab Duo with Amazon Q in an issue
 
@@ -42,6 +41,8 @@ Turn an idea in an issue into a merge request that contains the proposed impleme
 Amazon Q uses the issue title and description, along with project context, to create a merge request
 with code to address the issue.
 
+[View a walkthrough](https://gitlab.navattic.com/duo-q).
+
 #### From the issue description
 
 1. Create a new issue, or open an existing issue and in the upper-right corner, select **Edit**.
@@ -57,6 +58,8 @@ with code to address the issue.
 
 Amazon Q can analyze Java 8 or 11 code and determine the necessary Java changes to update the code to Java 17.
 
+[View a walkthrough](https://gitlab.navattic.com/duo-q-transform).
+
 Prerequisites:
 
 - You must [have a runner and a CI/CD pipeline configured for your project](../../ci/index.md).
diff --git a/doc/user/duo_amazon_q/setup.md b/doc/user/duo_amazon_q/setup.md
index 0a9b55781f8..d876f7aec49 100644
--- a/doc/user/duo_amazon_q/setup.md
+++ b/doc/user/duo_amazon_q/setup.md
@@ -18,12 +18,10 @@ The availability of this feature is controlled by a feature flag.
 For more information, see the history.
 This feature is a Preview/Beta and is available for testing, but not ready for production use.
 
-DISCLAIMER:
-**These instructions are for [users of the GDK only](https://gitlab.com/gitlab-org/gitlab/-/blob/gitlab-duo-with-amazon-q-preview/README.md?ref_type=heads).**
-Others should request [access to a lab environment](https://about.gitlab.com/aws).
+To use GitLab Duo with Amazon Q, you can [request access to a lab environment](https://about.gitlab.com/partners/technology-partners/aws/#interest).
 
-You can use GitLab Duo with Amazon Q to perform a variety of tasks,
-from creating merge requests and adding test coverage to reviewing changes for security and quality.
+If you'd prefer to set up GitLab Duo with Amazon Q on your self-managed GitLab installation,
+complete the following steps.
 
 ## Set up GitLab Duo with Amazon Q
 
@@ -38,6 +36,7 @@ To set up GitLab Duo with Amazon Q, you must:
 ### Prerequisites
 
 - You must have a self-managed GitLab instance:
+  - On GitLab 17.8 or later.
   - With an HTTPS URL that can be accessed by Amazon Q (the SSL certificate must not be self-signed).
     For more details about SSL, see [Configure SSL for a Linux package installation](https://docs.gitlab.com/omnibus/settings/ssl/).
   - With an Ultimate subscription that is synchronized with GitLab. (No trial access.)
diff --git a/doc/user/project/codeowners/index.md b/doc/user/project/codeowners/index.md
index e29655abefd..188bf9e824b 100644
--- a/doc/user/project/codeowners/index.md
+++ b/doc/user/project/codeowners/index.md
@@ -128,7 +128,7 @@ skips the merge request process, the protected branch features
 and Code Owner approvals built into merge requests are also skipped.
 
 This permission is often granted to accounts associated with
-automation ([internal users](../../../administration/internal_users.md)
+automation ([internal users](../../../administration/internal_users.md))
 and release tooling.
 
 All changes from users _without_ the **Allowed to push** permission must be routed through a merge request.
diff --git a/doc/user/project/codeowners/reference.md b/doc/user/project/codeowners/reference.md
index 0fcb31698ea..f4a44e29c66 100644
--- a/doc/user/project/codeowners/reference.md
+++ b/doc/user/project/codeowners/reference.md
@@ -20,7 +20,7 @@ The key elements are:
 - **Sections**: Optional groupings of rules, defined using `[Section name]`.
 
 NOTE:
-If an entry is duplicated in a section, [the last entry is used.](advanced.md#define-code-owners-for-specific-files-or-directories). Rules defined later in the file take precedence over earlier rules.
+If an entry is duplicated in a section, [the last entry is used](advanced.md#define-code-owners-for-specific-files-or-directories). Rules defined later in the file take precedence over earlier rules.
 
 Here are some examples:
 
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 85d7a524e9a..80ec5a071ec 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -90,7 +90,7 @@ DETAILS:
 > - Introduced in GitLab 17.7 [for Bitbucket Server](https://gitlab.com/gitlab-org/gitlab/-/issues/466356) [with flags](../../../administration/feature_flags.md) named `importer_user_mapping` and `bitbucket_server_user_mapping`. Disabled by default.
 > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/472735) for direct transfer in GitLab 17.7.
 > - Enabled on GitLab.com for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993), [Bitbucket Server](https://gitlab.com/gitlab-org/gitlab/-/issues/509897), and [Gitea](https://gitlab.com/gitlab-org/gitlab/-/issues/498390) in GitLab 17.7.
-> - Enabled on self-managed for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993) in GitLab 17.8.
+> - Enabled on self-managed for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993), [Bitbucket Server](https://gitlab.com/gitlab-org/gitlab/-/issues/509897) and [Gitea](https://gitlab.com/gitlab-org/gitlab/-/issues/498390) in GitLab 17.8.
 
 FLAG:
 The availability of this feature is controlled by feature flags.
diff --git a/doc/user/project/releases/release_cli.md b/doc/user/project/releases/release_cli.md
index feb334162df..66b83b3aad9 100644
--- a/doc/user/project/releases/release_cli.md
+++ b/doc/user/project/releases/release_cli.md
@@ -38,10 +38,10 @@ DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
-The `release-cli` binaries are also [available in the package registry](https://gitlab.com/gitlab-org/release-cli/-/packages).
+The `release-cli` binaries are [available in the package registry](https://gitlab.com/gitlab-org/release-cli/-/packages).
 
 When you use a runner with the Shell executor, you can download and install
-the `release-cli` manually for your [supported OS and architecture](https://release-cli-downloads.s3.amazonaws.com/latest/index.html).
+the `release-cli` manually for your [supported OS and architecture](https://gitlab.com/gitlab-org/release-cli/-/packages).
 Once installed, [the `release` keyword](../../../ci/yaml/index.md#release) is available to use in your CI/CD jobs.
 
 ### Install on Unix/Linux
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 190f1009479..aed3a2befd7 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -242,6 +242,7 @@ module API
         mount ::API::ComposerPackages
         mount ::API::Conan::V1::InstancePackages
         mount ::API::Conan::V1::ProjectPackages
+        mount ::API::Conan::V2::ProjectPackages
         mount ::API::ContainerRegistryEvent
         mount ::API::ContainerRepositories
         mount ::API::DebianGroupPackages
diff --git a/lib/api/conan/v2/project_packages.rb b/lib/api/conan/v2/project_packages.rb
new file mode 100644
index 00000000000..d69e7f75257
--- /dev/null
+++ b/lib/api/conan/v2/project_packages.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module API
+  module Conan
+    module V2
+      class ProjectPackages < ::API::Base
+        before do
+          if Feature.disabled?(:conan_package_revisions_support, Feature.current_request)
+            render_api_error!("'conan_package_revisions_support' feature flag is disabled", :not_found)
+          end
+        end
+
+        params do
+          requires :id, types: [String, Integer], desc: 'The ID or URL-encoded path of the project'
+        end
+
+        resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+          namespace ':id/packages/conan/v2' do
+            include ::API::Concerns::Packages::Conan::SharedEndpoints
+            params do
+              with(type: String) do
+                requires :package_name, regexp: PACKAGE_COMPONENT_REGEX,
+                  desc: 'Package name', documentation: { example: 'my-package' }
+                requires :package_version, regexp: PACKAGE_COMPONENT_REGEX,
+                  desc: 'Package version', documentation: { example: '1.0' }
+                requires :package_username, regexp: CONAN_REVISION_USER_CHANNEL_REGEX,
+                  desc: 'Package username', documentation: { example: 'my-group+my-project' }
+                requires :package_channel, regexp: CONAN_REVISION_USER_CHANNEL_REGEX,
+                  desc: 'Package channel', documentation: { example: 'stable' }
+              end
+            end
+            namespace 'conans/:package_name/:package_version/:package_username/:package_channel',
+              requirements: PACKAGE_REQUIREMENTS do
+              after_validation do
+                check_username_channel
+              end
+
+              desc 'Download recipe files' do
+                detail 'This feature was introduced in GitLab 17.8'
+                success code: 200
+                failure [
+                  { code: 400, message: 'Bad Request' },
+                  { code: 401, message: 'Unauthorized' },
+                  { code: 403, message: 'Forbidden' },
+                  { code: 404, message: 'Not Found' }
+                ]
+                tags %w[conan_packages]
+                hidden true
+              end
+
+              params do
+                with(type: String) do
+                  requires :recipe_revision, regexp: Gitlab::Regex.conan_revision_regex_v2,
+                    desc: 'Recipe revision', documentation: { example: 'df28fd816be3a119de5ce4d374436b25' }
+                  requires :file_name, type: String, desc: 'Package file name', values: CONAN_FILES,
+                    documentation: { example: 'conanfile.py' }
+                end
+              end
+
+              route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true
+
+              get 'revisions/:recipe_revision/files/:file_name', requirements: FILE_NAME_REQUIREMENTS do
+                render_api_error!('Not supported', :not_found)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/concerns/packages/conan/v1_endpoints.rb b/lib/api/concerns/packages/conan/v1_endpoints.rb
index 542fb07bc19..06d43abd871 100644
--- a/lib/api/concerns/packages/conan/v1_endpoints.rb
+++ b/lib/api/concerns/packages/conan/v1_endpoints.rb
@@ -17,6 +17,13 @@ module API
           include SharedEndpoints
 
           included do
+            helpers do
+              def x_conan_server_capabilities_header
+                return [] unless Feature.enabled?(:conan_package_revisions_support, Feature.current_request)
+
+                ['revisions']
+              end
+            end
             before do
               authenticate_non_get!
             end
@@ -33,7 +40,7 @@ module API
             route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true
 
             get 'ping', urgency: :default do
-              header 'X-Conan-Server-Capabilities', [].join(',')
+              header 'X-Conan-Server-Capabilities', x_conan_server_capabilities_header.join(',')
             end
 
             desc 'Search for packages' do
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index 3de8bff40f7..e617db0b4ba 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -235,38 +235,7 @@ module API
             ::Integrations::Mattermost.api_arguments,
             chat_notification_channels
           ].flatten,
-          'teamcity' => [
-            {
-              required: true,
-              name: :teamcity_url,
-              type: String,
-              desc: 'TeamCity root URL like https://teamcity.example.com'
-            },
-            {
-              required: false,
-              name: :enable_ssl_verification,
-              type: ::Grape::API::Boolean,
-              desc: 'Enable SSL verification'
-            },
-            {
-              required: true,
-              name: :build_type,
-              type: String,
-              desc: 'Build configuration ID'
-            },
-            {
-              required: true,
-              name: :username,
-              type: String,
-              desc: 'A user with permissions to trigger a manual build'
-            },
-            {
-              required: true,
-              name: :password,
-              type: String,
-              desc: 'The password of the user'
-            }
-          ],
+          'teamcity' => ::Integrations::Teamcity.api_arguments,
           'telegram' => ::Integrations::Telegram.api_arguments,
           'unify-circuit' => ::Integrations::UnifyCircuit.api_arguments,
           'webex-teams' => ::Integrations::WebexTeams.api_arguments,
diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb
index 5c64576915d..be3dbb507e5 100644
--- a/lib/gitlab/auth/auth_finders.rb
+++ b/lib/gitlab/auth/auth_finders.rb
@@ -270,7 +270,7 @@ module Gitlab
 
           if try(:namespace_inheritable, :authentication)
             access_token_from_namespace_inheritable
-          elsif Feature.enabled?(:auth_finder_no_token_length_detection, :current_request)
+          else
             # The token can be a PAT or an OAuth (doorkeeper) token
             begin
               find_oauth_access_token
@@ -279,12 +279,6 @@ module Gitlab
               # (e.g. NPM client registry auth). In that case, we rescue UnauthorizedError
               # and try to find a personal access token.
             end || find_personal_access_token
-          else
-            # The token can be a PAT or an OAuth (doorkeeper) token
-            # It is also possible that a PAT is encapsulated in a `Bearer` OAuth token
-            # (e.g. NPM client registry auth), this case will be properly handled
-            # by find_personal_access_token
-            find_oauth_access_token || find_personal_access_token
           end
         end
       end
@@ -304,10 +298,6 @@ module Gitlab
         token = parsed_oauth_token
         return unless token
 
-        # PATs with OAuth headers are not handled by OauthAccessToken
-        return if Feature.disabled?(:auth_finder_no_token_length_detection, :current_request) &&
-          matches_personal_access_token_length?(token)
-
         # Expiration, revocation and scopes are verified in `validate_access_token!`
         oauth_token = OauthAccessToken.by_token(token)
         raise UnauthorizedError unless oauth_token
@@ -393,10 +383,6 @@ module Gitlab
         Doorkeeper::OAuth::Token.from_request(current_request, *Doorkeeper.configuration.access_token_methods)
       end
 
-      def matches_personal_access_token_length?(token)
-        PersonalAccessToken::TOKEN_LENGTH_RANGE.include?(token.length)
-      end
-
       # Check if the request is GET/HEAD, or if CSRF token is valid.
       def verified_request?
         Gitlab::RequestForgeryProtection.verified?(current_request.env)
diff --git a/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event.rb b/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event.rb
index 6dc65775d00..705a4ad4423 100644
--- a/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event.rb
+++ b/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event.rb
@@ -38,8 +38,8 @@ module Gitlab
             submitted_at = approved_event[:created_at] || merge_request[:updated_at]
 
             approval, approval_note = create_approval!(project.id, merge_request.id, user_id, submitted_at)
-            push_reference(project, approval, :user_id, approved_event[:approver_username])
-            push_reference(project, approval_note, :author_id, approved_event[:approver_username])
+            push_reference(project, approval, :user_id, approved_event[:approver_username]) if approval
+            push_reference(project, approval_note, :author_id, approved_event[:approver_username]) if approval_note
 
             reviewer = create_reviewer!(merge_request.id, user_id, submitted_at)
             push_reference(project, reviewer, :user_id, approved_event[:approver_username]) if reviewer
diff --git a/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer.rb b/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer.rb
index 7f470e17f8d..6ec26b620bf 100644
--- a/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer.rb
@@ -101,8 +101,8 @@ module Gitlab
           submitted_at = approved_event.created_at || merge_request.updated_at
 
           approval, approval_note = create_approval!(project.id, merge_request.id, user_id, submitted_at)
-          push_reference(project, approval, :user_id, approved_event.approver_username)
-          push_reference(project, approval_note, :author_id, approved_event.approver_username)
+          push_reference(project, approval, :user_id, approved_event.approver_username) if approval
+          push_reference(project, approval_note, :author_id, approved_event.approver_username) if approval_note
 
           reviewer = create_reviewer!(merge_request.id, user_id, submitted_at)
           push_reference(project, reviewer, :user_id, approved_event.approver_username) if reviewer
diff --git a/lib/gitlab/regex/packages.rb b/lib/gitlab/regex/packages.rb
index e5dbef81c75..c3273625654 100644
--- a/lib/gitlab/regex/packages.rb
+++ b/lib/gitlab/regex/packages.rb
@@ -23,6 +23,14 @@ module Gitlab
         @conan_revision_regex ||= %r{\A0\z}
       end
 
+      def conan_revision_regex_v2
+        # The revision can be one of two types:
+        # - "hash" (default): the checksum hash of the recipe manifest: MD5 Hash 32 Characters
+        # - "scm" or "scm_folder": the commit ID for the repository system (Git or SVN): SHA-1 Hash 40 Characters
+        # according to https://docs.conan.io/2.10/reference/conanfile/attributes.html#revision-mode
+        @conan_revision_regex_v2 ||= %r/\A(?:\h{32}|\h{40})\z/
+      end
+
       def conan_recipe_user_channel_regex
         %r{\A(_|#{conan_name_regex})\z}
       end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8e935f49b6f..65362764ee2 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -44063,9 +44063,6 @@ msgstr ""
 msgid "ProjectService|Mock CI URL"
 msgstr ""
 
-msgid "ProjectService|Must have permission to trigger a manual build in TeamCity."
-msgstr ""
-
 msgid "ProjectService|Perform common operations on GitLab project: %{project_name}"
 msgstr ""
 
@@ -44081,9 +44078,6 @@ msgstr ""
 msgid "ProjectService|TeamCity server URL"
 msgstr ""
 
-msgid "ProjectService|The build configuration ID of the TeamCity project."
-msgstr ""
-
 msgid "ProjectService|To configure this integration, you should:"
 msgstr ""
 
@@ -55716,6 +55710,18 @@ msgstr ""
 msgid "Team domain"
 msgstr ""
 
+msgid "TeamCityIntegration|A user with permissions to trigger a manual build."
+msgstr ""
+
+msgid "TeamCityIntegration|TeamCity root URL (for example, `https://teamcity.example.com`)."
+msgstr ""
+
+msgid "TeamCityIntegration|The build configuration ID of the TeamCity project."
+msgstr ""
+
+msgid "TeamCityIntegration|The password of the user."
+msgstr ""
+
 msgid "TeamcityIntegration|Trigger TeamCity CI after a merge request has been created or updated"
 msgstr ""
 
@@ -58639,6 +58645,9 @@ msgstr ""
 msgid "Todos|Failed to snooze todo. Try again later."
 msgstr ""
 
+msgid "Todos|Failed to un-snooze todo. Try again later."
+msgstr ""
+
 msgid "Todos|Filter by author"
 msgstr ""
 
@@ -58746,6 +58755,9 @@ msgstr ""
 msgid "Todos|Reason"
 msgstr ""
 
+msgid "Todos|Remove snooze"
+msgstr ""
+
 msgid "Todos|Removed from Merge Train"
 msgstr ""
 
diff --git a/spec/frontend/todos/components/todo_item_actions_spec.js b/spec/frontend/todos/components/todo_item_actions_spec.js
index e77d74e5df5..265e4544c86 100644
--- a/spec/frontend/todos/components/todo_item_actions_spec.js
+++ b/spec/frontend/todos/components/todo_item_actions_spec.js
@@ -1,19 +1,46 @@
-import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
+import VueApollo from 'vue-apollo';
 import { GlButton } from '@gitlab/ui';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
+import createMockApollo from 'helpers/mock_apollo_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import TodoItemActions from '~/todos/components/todo_item_actions.vue';
 import SnoozeTodoDropdown from '~/todos/components/snooze_todo_dropdown.vue';
-
 import { TODO_STATE_DONE, TODO_STATE_PENDING } from '~/todos/constants';
+import unSnoozeTodoMutation from '~/todos/components/mutations/un_snooze_todo.mutation.graphql';
+
+Vue.use(VueApollo);
 
 describe('TodoItemActions', () => {
   let wrapper;
+  const mockCurrentTime = new Date('2024-12-18T13:24:00');
   const mockTodo = {
     id: 'gid://gitlab/Todo/1',
     state: TODO_STATE_PENDING,
   };
+  const mockToastShow = jest.fn();
 
-  const createComponent = ({ props = {}, todosSnoozingEnabled = false } = {}) => {
-    wrapper = shallowMount(TodoItemActions, {
+  const unSnoozeTodoMutationSuccessHandler = jest.fn().mockResolvedValue({
+    data: {
+      todoUnSnooze: {
+        todo: { ...mockTodo, snoozedUntil: mockCurrentTime },
+        errors: [],
+      },
+    },
+  });
+
+  const createComponent = ({
+    props = {},
+    unSnoozeTodoMutationHandler = unSnoozeTodoMutationSuccessHandler,
+    todosSnoozingEnabled = false,
+  } = {}) => {
+    const mockApollo = createMockApollo();
+
+    mockApollo.defaultClient.setRequestHandler(unSnoozeTodoMutation, unSnoozeTodoMutationHandler);
+
+    wrapper = shallowMountExtended(TodoItemActions, {
+      apolloProvider: mockApollo,
       propsData: {
         todo: mockTodo,
         isSnoozed: false,
@@ -24,10 +51,19 @@ describe('TodoItemActions', () => {
           todosSnoozing: todosSnoozingEnabled,
         },
       },
+      directives: {
+        GlTooltip: createMockDirective('gl-tooltip'),
+      },
+      mocks: {
+        $toast: {
+          show: mockToastShow,
+        },
+      },
     });
   };
 
   const findSnoozeTodoDropdown = () => wrapper.findComponent(SnoozeTodoDropdown);
+  const findUnSnoozeButton = () => wrapper.findByTestId('un-snooze-button');
 
   it('sets correct icon for pending todo action button', () => {
     createComponent();
@@ -62,14 +98,6 @@ describe('TodoItemActions', () => {
   });
 
   describe('snoozing dropdown', () => {
-    describe('when the `todosSnoozing` feature flag is disabled', () => {
-      it('never renders the dropdown', () => {
-        createComponent({ todosSnoozingEnabled: false, props: { isSnoozed: false } });
-
-        expect(findSnoozeTodoDropdown().exists()).toBe(false);
-      });
-    });
-
     it('renders the dropdown if `isSnoozed` is `false` and the todo is pending', () => {
       createComponent({ todosSnoozingEnabled: true, props: { isSnoozed: false } });
 
@@ -91,4 +119,91 @@ describe('TodoItemActions', () => {
       expect(findSnoozeTodoDropdown().exists()).toBe(false);
     });
   });
+
+  describe('un-snooze button', () => {
+    it('renders if the to-do item is snoozed', () => {
+      createComponent({ todosSnoozingEnabled: true, props: { isSnoozed: true } });
+
+      expect(findUnSnoozeButton().exists()).toBe(true);
+    });
+
+    it('has the correct attributes', () => {
+      createComponent({ todosSnoozingEnabled: true, props: { isSnoozed: true } });
+
+      expect(findUnSnoozeButton().attributes()).toMatchObject({
+        icon: 'time-out',
+        title: 'Remove snooze',
+        'aria-label': 'Remove snooze',
+      });
+    });
+
+    it('triggers the un-snooze mutation', () => {
+      createComponent({ todosSnoozingEnabled: true, props: { isSnoozed: true } });
+
+      findUnSnoozeButton().vm.$emit('click');
+
+      expect(unSnoozeTodoMutationSuccessHandler).toHaveBeenCalledWith({
+        todoId: mockTodo.id,
+      });
+    });
+
+    it('shows an error when the to un-snooze mutation returns some errors', async () => {
+      createComponent({
+        todosSnoozingEnabled: true,
+        props: { isSnoozed: true },
+        unSnoozeTodoMutationHandler: jest.fn().mockResolvedValue({
+          data: {
+            todoUnSnooze: {
+              todo: { ...mockTodo },
+              errors: ['Could not un-snooze todo-item.'],
+            },
+          },
+        }),
+      });
+
+      findUnSnoozeButton().vm.$emit('click');
+      await waitForPromises();
+
+      expect(mockToastShow).toHaveBeenCalledWith('Failed to un-snooze todo. Try again later.', {
+        variant: 'danger',
+      });
+    });
+
+    it('shows an error when it fails to un-snooze the to-do item', async () => {
+      createComponent({
+        todosSnoozingEnabled: true,
+        props: { isSnoozed: true },
+        unSnoozeTodoMutationHandler: jest.fn().mockRejectedValue(),
+      });
+
+      findUnSnoozeButton().vm.$emit('click');
+      await waitForPromises();
+
+      expect(mockToastShow).toHaveBeenCalledWith('Failed to un-snooze todo. Try again later.', {
+        variant: 'danger',
+      });
+    });
+
+    it('has a tooltip attached', () => {
+      createComponent({ todosSnoozingEnabled: true, props: { isSnoozed: true } });
+
+      const tooltip = getBinding(findUnSnoozeButton().element, 'gl-tooltip');
+
+      expect(tooltip).toBeDefined();
+    });
+  });
+
+  describe('when the `todosSnoozing` feature flag is disabled', () => {
+    it('never renders the dropdown', () => {
+      createComponent({ todosSnoozingEnabled: false, props: { isSnoozed: false } });
+
+      expect(findSnoozeTodoDropdown().exists()).toBe(false);
+    });
+
+    it('never renders the un-snooze button', () => {
+      createComponent({ todosSnoozingEnabled: false, props: { isSnoozed: true } });
+
+      expect(findUnSnoozeButton().exists()).toBe(false);
+    });
+  });
 });
diff --git a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb
index e4e068d54a4..25933b56d14 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes/approved_event_spec.rb
@@ -23,6 +23,8 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Appro
 
   let_it_be(:source_user) { generate_source_user(project, approved_event[:approver_username]) }
 
+  let(:cached_references) { placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id) }
+
   def expect_log(stage:, message:, iid:, event_id:)
     allow(Gitlab::BitbucketServerImport::Logger).to receive(:info).and_call_original
     expect(Gitlab::BitbucketServerImport::Logger)
@@ -35,7 +37,6 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Appro
     it 'pushes placeholder references' do
       importer.execute(approved_event)
 
-      cached_references = placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id)
       expect(cached_references).to contain_exactly(
         ['Approval', instance_of(Integer), 'user_id', source_user.id],
         ['MergeRequestReviewer', instance_of(Integer), 'user_id', source_user.id],
@@ -43,6 +44,20 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Appro
       )
     end
 
+    context 'if approval is not persisted' do
+      before do
+        allow(Approval).to receive(:create).and_return(Approval.new)
+      end
+
+      it 'does not push placeholder references for the approval or approval note' do
+        importer.execute(approved_event)
+
+        expect(cached_references).to contain_exactly(
+          ['MergeRequestReviewer', instance_of(Integer), 'user_id', source_user.id]
+        )
+      end
+    end
+
     it 'creates the approval, reviewer and approval note' do
       expect { importer.execute(approved_event) }
         .to change { merge_request.approvals.count }.from(0).to(1)
@@ -109,7 +124,6 @@ RSpec.describe Gitlab::BitbucketServerImport::Importers::PullRequestNotes::Appro
       it 'does not push placeholder references' do
         importer.execute(approved_event)
 
-        cached_references = placeholder_user_references(::Import::SOURCE_BITBUCKET_SERVER, project.import_state.id)
         expect(cached_references).to be_empty
       end
 
diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index bb1879eed74..4334d92ee12 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -257,10 +257,21 @@ RSpec.describe Gitlab::Regex, feature_category: :tooling do
     subject { described_class.conan_revision_regex }
 
     it { is_expected.to match('0') }
+    it { is_expected.not_to match(nil) }
     it { is_expected.not_to match('foo') }
     it { is_expected.not_to match('!!()()') }
   end
 
+  describe '.conan_revision_regex_v2' do
+    subject { described_class.conan_revision_regex_v2 }
+
+    it { is_expected.to match(OpenSSL::Digest.hexdigest('MD5', 'valid_MD5')) }
+    it { is_expected.to match(OpenSSL::Digest.hexdigest('SHA1', 'valid_SHA-1')) }
+    it { is_expected.not_to match('0') }
+    it { is_expected.not_to match('g' * 32) }
+    it { is_expected.not_to match('a' * 41) }
+  end
+
   describe '.composer_dev_version_regex' do
     subject { described_class.composer_dev_version_regex }
 
diff --git a/spec/models/pages_deployment_spec.rb b/spec/models/pages_deployment_spec.rb
index e482ebce362..f808eb447f5 100644
--- a/spec/models/pages_deployment_spec.rb
+++ b/spec/models/pages_deployment_spec.rb
@@ -141,9 +141,9 @@ RSpec.describe PagesDeployment, feature_category: :pages do
   end
 
   describe '.count_versioned_deployments_for' do
-    it 'counts the number of active pages deployments for the root level namespace of a given project' do
+    it 'counts the number of active pages deployments for a list of projects' do
       group = create(:group)
-      create(:project, group: group).tap do |project|
+      project1 = create(:project, group: group).tap do |project|
         # not versioned
         create(:pages_deployment, project: project)
         # versioned, active
@@ -151,7 +151,7 @@ RSpec.describe PagesDeployment, feature_category: :pages do
         # versioned, not active
         create(:pages_deployment, project: project, path_prefix: 'v2', deleted_at: 1.day.from_now)
       end
-      project = create(:project, group: group).tap do |project|
+      project2 = create(:project, group: group).tap do |project|
         # not versioned
         create(:pages_deployment, project: project)
         # versioned, active
@@ -160,8 +160,19 @@ RSpec.describe PagesDeployment, feature_category: :pages do
         create(:pages_deployment, project: project, path_prefix: 'v2', deleted_at: 1.day.from_now)
       end
 
-      expect(described_class.count_versioned_deployments_for(project, 10)).to eq(2)
-      expect(described_class.count_versioned_deployments_for(project, 1)).to eq(1)
+      expect(described_class.count_versioned_deployments_for([project1, project2], 10)).to eq(2)
+      expect(described_class.count_versioned_deployments_for([project1, project2], 1)).to eq(1)
+    end
+
+    it 'counts the number of active pages deployments for a single project' do
+      group = create(:group)
+      project = create(:project, group: group).tap do |project|
+        create(:pages_deployment, project: project, path_prefix: 'v1')
+        create(:pages_deployment, project: project, path_prefix: 'v2')
+        create(:pages_deployment, project: project, path_prefix: 'v3')
+      end
+
+      expect(described_class.count_versioned_deployments_for(project, 10)).to eq(3)
     end
   end
 
diff --git a/spec/requests/api/conan/v1/instance_packages_spec.rb b/spec/requests/api/conan/v1/instance_packages_spec.rb
index c3214339cd3..db55fa523ee 100644
--- a/spec/requests/api/conan/v1/instance_packages_spec.rb
+++ b/spec/requests/api/conan/v1/instance_packages_spec.rb
@@ -12,7 +12,9 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
   describe 'GET /api/v4/packages/conan/v1/ping' do
     let_it_be(:url) { '/packages/conan/v1/ping' }
 
-    it_behaves_like 'conan ping endpoint'
+    it_behaves_like 'conan ping endpoint' do
+      let(:x_conan_server_capabilities_header) { 'revisions' }
+    end
   end
 
   describe 'GET /api/v4/packages/conan/v1/conans/search' do
@@ -52,23 +54,23 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'recipe snapshot endpoint'
     end
 
-    describe "GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/packages/:conan_package_reference" do
+    describe 'GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/packages/:conan_package_reference' do
       let(:recipe_path) { package.conan_recipe_path }
       let(:url) { "/packages/conan/v1/conans/#{recipe_path}/packages/#{conan_package_reference}" }
 
       it_behaves_like 'package snapshot endpoint'
     end
 
-    describe "GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/digest" do
+    describe 'GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/digest' do
       subject { get api("/packages/conan/v1/conans/#{recipe_path}/digest"), headers: headers }
 
       it_behaves_like 'recipe download_urls endpoint'
     end
 
-    describe "GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/packages/:conan_package_reference/download_urls" do
+    describe 'GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/packages/:conan_package_reference/download_urls' do
       subject do
         get api("/packages/conan/v1/conans/#{recipe_path}/packages/#{conan_package_reference}/download_urls"),
           headers: headers
@@ -77,15 +79,15 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'package download_urls endpoint'
     end
 
-    describe "GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/download_urls" do
+    describe 'GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/download_urls' do
       subject { get api("/packages/conan/v1/conans/#{recipe_path}/download_urls"), headers: headers }
 
       it_behaves_like 'recipe download_urls endpoint'
     end
 
-    describe "GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/packages/:conan_package_reference/digest" do
+    describe 'GET /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/packages/:conan_package_reference/digest' do
       subject do
         get api("/packages/conan/v1/conans/#{recipe_path}/packages/#{conan_package_reference}/digest"), headers: headers
       end
@@ -93,8 +95,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'package download_urls endpoint'
     end
 
-    describe "POST /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/upload_urls" do
+    describe 'POST /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/upload_urls' do
       subject do
         post api("/packages/conan/v1/conans/#{recipe_path}/upload_urls"), params: params.to_json, headers: headers
       end
@@ -102,8 +104,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'recipe upload_urls endpoint'
     end
 
-    describe "POST /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel" \
-      "/packages/:conan_package_reference/upload_urls" do
+    describe 'POST /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username/:package_channel' \
+      '/packages/:conan_package_reference/upload_urls' do
       subject do
         post api("/packages/conan/v1/conans/#{recipe_path}/packages/123456789/upload_urls"), params: params.to_json,
           headers: headers
@@ -112,8 +114,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'package upload_urls endpoint'
     end
 
-    describe "DELETE /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username" \
-      "/:package_channel" do
+    describe 'DELETE /api/v4/packages/conan/v1/conans/:package_name/:package_version/:package_username' \
+      '/:package_channel' do
       let_it_be_with_reload(:package) { create(:conan_package, project: project) }
 
       subject { delete api("/packages/conan/v1/conans/#{recipe_path}"), headers: headers }
@@ -125,8 +127,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
   context 'with file download endpoints' do
     include_context 'conan file download endpoints'
 
-    describe "GET /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel" \
-      "/:recipe_revision/export/:file_name" do
+    describe 'GET /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel' \
+      '/:recipe_revision/export/:file_name' do
       subject do
         get api("/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision_value}/export/" \
           "#{recipe_file.file_name}"),
@@ -137,8 +139,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'project not found by recipe'
     end
 
-    describe "GET /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel" \
-      "/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name" do
+    describe 'GET /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel' \
+      '/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name' do
       subject do
         get api("/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision_value}/package" \
           "/#{metadata.conan_package_reference}/#{metadata.package_revision_value}/#{package_file.file_name}"),
@@ -153,8 +155,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
   context 'with file upload endpoints' do
     include_context 'conan file upload endpoints'
 
-    describe "PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel" \
-      "/:recipe_revision/export/:file_name/authorize" do
+    describe 'PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel' \
+      '/:recipe_revision/export/:file_name/authorize' do
       let(:file_name) { 'conanfile.py' }
 
       subject do
@@ -164,8 +166,8 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'workhorse authorize endpoint'
     end
 
-    describe "PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel" \
-      "/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name/authorize" do
+    describe 'PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel' \
+      '/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name/authorize' do
       let(:file_name) { 'conaninfo.txt' }
 
       subject do
@@ -176,15 +178,15 @@ RSpec.describe API::Conan::V1::InstancePackages, feature_category: :package_regi
       it_behaves_like 'workhorse authorize endpoint'
     end
 
-    describe "PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel" \
-      "/:recipe_revision/export/:file_name" do
+    describe 'PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel' \
+      '/:recipe_revision/export/:file_name' do
       let(:url) { "/api/v4/packages/conan/v1/files/#{recipe_path}/0/export/#{file_name}" }
 
       it_behaves_like 'workhorse recipe file upload endpoint'
     end
 
-    describe "PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel" \
-      "/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name" do
+    describe 'PUT /api/v4/packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel' \
+      '/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name' do
       let(:url) { "/api/v4/packages/conan/v1/files/#{recipe_path}/0/package/123456789/0/#{file_name}" }
 
       it_behaves_like 'workhorse package file upload endpoint'
diff --git a/spec/requests/api/conan/v1/project_packages_spec.rb b/spec/requests/api/conan/v1/project_packages_spec.rb
index 518bedc8d91..3beb053037b 100644
--- a/spec/requests/api/conan/v1/project_packages_spec.rb
+++ b/spec/requests/api/conan/v1/project_packages_spec.rb
@@ -21,7 +21,21 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
   describe 'GET /api/v4/projects/:id/packages/conan/v1/ping' do
     let(:url) { "/projects/#{project.id}/packages/conan/v1/ping" }
 
-    it_behaves_like 'conan ping endpoint'
+    it_behaves_like 'conan ping endpoint' do
+      let(:x_conan_server_capabilities_header) { 'revisions' }
+    end
+
+    context 'when the conan_package_revisions_support FF is disabled' do
+      before do
+        stub_feature_flags(conan_package_revisions_support: false)
+      end
+
+      it 'contains "" in the X-Conan-Server-Capabilities header' do
+        get api(url), headers: headers
+
+        expect(response.headers['X-Conan-Server-Capabilities']).to be_empty
+      end
+    end
   end
 
   describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/search' do
@@ -79,16 +93,16 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
 
     subject { get api(url), headers: headers }
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel' do
       let(:url) { "/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}" }
 
       it_behaves_like 'recipe snapshot endpoint'
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/packages/:conan_package_reference" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/packages/:conan_package_reference' do
       let(:url) do
         "/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/packages/#{conan_package_reference}"
       end
@@ -97,16 +111,16 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/digest" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/digest' do
       let(:url) { "/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/digest" }
 
       it_behaves_like 'recipe download_urls endpoint'
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/packages/:conan_package_reference/download_urls" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/packages/:conan_package_reference/download_urls' do
       let(:url) do
         "/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/packages/#{conan_package_reference}" \
           "/download_urls"
@@ -116,16 +130,16 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/download_urls" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/download_urls' do
       let(:url) { "/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/download_urls" }
 
       it_behaves_like 'recipe download_urls endpoint'
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/packages/:conan_package_reference/digest" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/packages/:conan_package_reference/digest' do
       let(:url) do
         "/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/packages/#{conan_package_reference}/digest"
       end
@@ -134,8 +148,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "POST /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/upload_urls" do
+    describe 'POST /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/upload_urls' do
       subject do
         post api("/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/upload_urls"), params: params.to_json,
           headers: headers
@@ -144,8 +158,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'recipe upload_urls endpoint'
     end
 
-    describe "POST /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel/packages/:conan_package_reference/upload_urls" do
+    describe 'POST /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel/packages/:conan_package_reference/upload_urls' do
       subject do
         post api("/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}/packages/123456789/upload_urls"),
           params: params.to_json, headers: headers
@@ -154,8 +168,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'package upload_urls endpoint'
     end
 
-    describe "DELETE /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username" \
-      "/:package_channel" do
+    describe 'DELETE /api/v4/projects/:id/packages/conan/v1/conans/:package_name/package_version/:package_username' \
+      '/:package_channel' do
       let_it_be_with_reload(:package) { create(:conan_package, project: project) }
 
       subject { delete api("/projects/#{project_id}/packages/conan/v1/conans/#{recipe_path}"), headers: headers }
@@ -169,8 +183,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
 
     subject { get api(url), headers: headers }
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username" \
-      "/:package_channel/:recipe_revision/export/:file_name" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username' \
+      '/:package_channel/:recipe_revision/export/:file_name' do
       let(:url) do
         "/projects/#{project_id}/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision_value}" \
           "/export/#{recipe_file.file_name}"
@@ -181,8 +195,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
-    describe "GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username" \
-      "/:package_channel/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name" do
+    describe 'GET /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username' \
+      '/:package_channel/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name' do
       let(:url) do
         "/projects/#{project_id}/packages/conan/v1/files/#{recipe_path}/#{metadata.recipe_revision_value}/package" \
           "/#{metadata.conan_package_reference}/#{metadata.package_revision_value}/#{package_file.file_name}"
@@ -197,8 +211,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
   context 'with file upload endpoints' do
     include_context 'conan file upload endpoints'
 
-    describe "PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username" \
-      "/:package_channel/:recipe_revision/export/:file_name/authorize" do
+    describe 'PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username' \
+      '/:package_channel/:recipe_revision/export/:file_name/authorize' do
       let(:file_name) { 'conanfile.py' }
 
       subject do
@@ -209,8 +223,8 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'workhorse authorize endpoint'
     end
 
-    describe "PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username" \
-      "/:package_channel/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name/authorize" do
+    describe 'PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username' \
+      '/:package_channel/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name/authorize' do
       let(:file_name) { 'conaninfo.txt' }
 
       subject do
@@ -222,15 +236,15 @@ RSpec.describe API::Conan::V1::ProjectPackages, feature_category: :package_regis
       it_behaves_like 'workhorse authorize endpoint'
     end
 
-    describe "PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username" \
-      "/:package_channel/:recipe_revision/export/:file_name" do
+    describe 'PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username' \
+      '/:package_channel/:recipe_revision/export/:file_name' do
       let(:url) { "/api/v4/projects/#{project_id}/packages/conan/v1/files/#{recipe_path}/0/export/#{file_name}" }
 
       it_behaves_like 'workhorse recipe file upload endpoint'
     end
 
-    describe "PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username" \
-      "/:package_channel/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name" do
+    describe 'PUT /api/v4/projects/:id/packages/conan/v1/files/:package_name/:package_version/:package_username' \
+      '/:package_channel/:recipe_revision/export/:conan_package_reference/:package_revision/:file_name' do
       let(:url) do
         "/api/v4/projects/#{project_id}/packages/conan/v1/files/#{recipe_path}/0/package/123456789/0/#{file_name}"
       end
diff --git a/spec/requests/api/conan/v2/project_packages_spec.rb b/spec/requests/api/conan/v2/project_packages_spec.rb
new file mode 100644
index 00000000000..8a8de40a9ba
--- /dev/null
+++ b/spec/requests/api/conan/v2/project_packages_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::Conan::V2::ProjectPackages, feature_category: :package_registry do
+  include_context 'conan api setup'
+
+  describe 'GET /api/v4/projects/:id/packages/conan/v2/conans/:package_name/:package_version/:package_username/' \
+    ':package_channel/revisions/:recipe_revision/files/:file_name' do
+    include_context 'conan file download endpoints'
+
+    let(:project_id) { project.id }
+    let(:recipe_revision) { OpenSSL::Digest.hexdigest('MD5', 'valid_recipe_revision') }
+    let(:file_name) { recipe_file.file_name }
+    let(:url_suffix) { "#{recipe_path}/revisions/#{recipe_revision}/files/#{file_name}" }
+    let(:url) { "/projects/#{project_id}/packages/conan/v2/conans/#{url_suffix}" }
+
+    subject(:get_request) { get api(url), headers: headers }
+
+    # TODO: Endpoint is not implemented yet. See https://gitlab.com/gitlab-org/gitlab/-/issues/333033#note_2060136937.
+    it_behaves_like 'returning response status with message', status: :not_found, message: 'Not supported'
+
+    it_behaves_like 'project not found by project id'
+
+    context 'when feature flag is disabled' do
+      before do
+        stub_feature_flags(conan_package_revisions_support: false)
+      end
+
+      it_behaves_like 'returning response status with message', status: :not_found,
+        message: "'conan_package_revisions_support' feature flag is disabled"
+    end
+
+    context 'when packages feature disabled' do
+      before do
+        stub_packages_setting(enabled: false)
+      end
+
+      it_behaves_like 'returning response status', :not_found
+    end
+
+    context 'in FIPS mode', :fips_mode do
+      it_behaves_like 'returning response status', :not_found
+    end
+
+    describe 'parameter validation' do
+      using RSpec::Parameterized::TableSyntax
+
+      let(:url_suffix) { "#{url_recipe_path}/revisions/#{url_recipe_revision}/files/#{url_file_name}" }
+
+      where(:error, :url_recipe_path, :url_recipe_revision, :url_file_name) do
+        /package_name/     | 'pac$kage-1/1.0.0/namespace1+project-1/stable' | ref(:recipe_revision) | ref(:file_name)
+        /package_version/  | 'package-1/1.0.$/namespace1+project-1/stable'  | ref(:recipe_revision) | ref(:file_name)
+        /package_username/ | 'package-1/1.0.0/name$pace1+project-1/stable'  | ref(:recipe_revision) | ref(:file_name)
+        /package_channel/  | 'package-1/1.0.0/namespace1+project-1/$table'  | ref(:recipe_revision) | ref(:file_name)
+        /recipe_revision/  | ref(:recipe_path)                              | 'invalid_revi$ion'    | ref(:file_name)
+        /file_name/        | ref(:recipe_path)                              | ref(:recipe_revision) | 'invalid_file.txt'
+      end
+
+      with_them do
+        it_behaves_like 'returning response status with error', status: :bad_request, error: params[:error]
+      end
+    end
+  end
+end
diff --git a/spec/services/feature_flags/create_service_spec.rb b/spec/services/feature_flags/create_service_spec.rb
index 2fd7e1c4853..a4a881879d9 100644
--- a/spec/services/feature_flags/create_service_spec.rb
+++ b/spec/services/feature_flags/create_service_spec.rb
@@ -83,7 +83,7 @@ RSpec.describe FeatureFlags::CreateService, feature_category: :feature_flags do
         end
       end
 
-      it 'creates audit event', :with_license do
+      it 'creates audit event', :with_license, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/509493' do
         expect { subject }.to change { AuditEvent.count }.by(1)
         expect(audit_event_message).to start_with('Created feature flag feature_flag with description "description".')
         expect(audit_event_message).to include('Created strategy "default" with scopes "*".')
diff --git a/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb
index b9bbceabbe2..5731ca906bf 100644
--- a/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb
@@ -9,7 +9,7 @@ RSpec.shared_examples 'conan ping endpoint' do
     get api(url)
 
     expect(response).to have_gitlab_http_status(:ok)
-    expect(response.headers['X-Conan-Server-Capabilities']).to eq("")
+    expect(response.headers['X-Conan-Server-Capabilities']).to eq(x_conan_server_capabilities_header)
   end
 
   context 'packages feature disabled' do
diff --git a/spec/support/shared_examples/requests/response_status_with_message_shared_examples.rb b/spec/support/shared_examples/requests/response_status_with_message_shared_examples.rb
new file mode 100644
index 00000000000..888aa6b7bfa
--- /dev/null
+++ b/spec/support/shared_examples/requests/response_status_with_message_shared_examples.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'returning response status with message' do |status:, message: nil|
+  it "returns #{status} and message: #{message}" do
+    subject
+
+    expect(response).to have_gitlab_http_status(status)
+    expect(json_response['message']).to eq(message)
+  end
+end