Add latest changes from gitlab-org/gitlab@master

289 files changed, 662 insertions, 457 deletions

diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js
index bbc7559cd86..54a03b82be0 100644
--- a/app/assets/javascripts/boards/stores/actions.js
+++ b/app/assets/javascripts/boards/stores/actions.js
@@ -316,14 +316,14 @@ export default {
       .mutate({
         mutation: updateAssignees,
         variables: {
-          iid: getters.getActiveIssue.iid,
-          projectPath: getters.getActiveIssue.referencePath.split('#')[0],
+          iid: getters.activeIssue.iid,
+          projectPath: getters.activeIssue.referencePath.split('#')[0],
           assigneeUsernames,
         },
       })
       .then(({ data }) => {
         commit('UPDATE_ISSUE_BY_ID', {
-          issueId: getters.getActiveIssue.id,
+          issueId: getters.activeIssue.id,
           prop: 'assignees',
           value: data.issueSetAssignees.issue.assignees.nodes,
         });
diff --git a/app/controllers/concerns/send_file_upload.rb b/app/controllers/concerns/send_file_upload.rb
index 2f06cd84ee5..8b053ef7c59 100644
--- a/app/controllers/concerns/send_file_upload.rb
+++ b/app/controllers/concerns/send_file_upload.rb
@@ -70,16 +70,7 @@ module SendFileUpload
     Avatarable::ALLOWED_IMAGE_SCALER_WIDTHS.include?(params[:width]&.to_i)
   end
 
-  # We use two separate feature gates to allow image resizing.
-  # The first, `:dynamic_image_resizing_requester`, based on the content requester.
-  # Enabling it for the user would allow that user to send resizing requests for any avatar.
-  # The second, `:dynamic_image_resizing_owner`, based on the content owner.
-  # Enabling it for the user would allow anyone to send resizing requests against the mentioned user avatar only.
-  # This flag allows us to operate on trusted data only, more in https://gitlab.com/gitlab-org/gitlab/-/issues/241533.
-  # Because of this, you need to enable BOTH to serve resized image,
-  # as you would need at least one allowed requester and at least one allowed avatar.
   def scaling_allowed_by_feature_flags?(file_upload)
-    Feature.enabled?(:dynamic_image_resizing_requester, current_user) &&
-      Feature.enabled?(:dynamic_image_resizing_owner, file_upload.model)
+    Feature.enabled?(:dynamic_image_resizing, default_enabled: true, type: :ops)
   end
 end
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 7630524b545..e39dfa44d86 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -164,7 +164,6 @@ module PageLayoutHelper
     strong_memoize(:generic_canonical_url) do
       next unless request.get? || request.head?
       next unless generate_generic_canonical_url?
-      next unless Feature.enabled?(:generic_canonical, current_user)
 
       # Request#url builds the url without the trailing slash
       request.url
diff --git a/app/views/shared/issue_type/_details_header.html.haml b/app/views/shared/issue_type/_details_header.html.haml
index 764a7896b6f..9102abf8bc6 100644
--- a/app/views/shared/issue_type/_details_header.html.haml
+++ b/app/views/shared/issue_type/_details_header.html.haml
@@ -36,9 +36,9 @@
             - unless current_user == issuable.author
               %li= link_to _('Report abuse'), new_abuse_report_path(user_id: issuable.author.id, ref_url: issue_url(issuable))
             - if can_update_issue
-              %li= link_to _('Close %{display_issuable_type}') % { display_issuable_type: display_issuable_type }, issue_path(issuable, issue: { state_event: :close }, format: 'json'), class: "btn-close js-btn-issue-action #{issue_button_visibility(issuable, true)}", title: _('Close %{display_issuable_type}') % { display_issuable_type: display_issuable_type }
+              %li= link_to _('Close %{display_issuable_type}') % { display_issuable_type: display_issuable_type }, issue_path(issuable, issue: { state_event: :close }, format: 'json'), class: "btn-close js-btn-issue-action #{issue_button_visibility(issuable, true)}", title: _('Close %{display_issuable_type}') % { display_issuable_type: display_issuable_type }, data: { endpoint: close_reopen_issuable_path(issuable) }
             - if can_reopen_issue
-              %li= link_to _('Reopen %{display_issuable_type}') % { display_issuable_type: display_issuable_type }, issue_path(issuable, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen js-btn-issue-action #{issue_button_visibility(issuable, false)}", title: _('Reopen %{display_issuable_type}') % { display_issuable_type: display_issuable_type }
+              %li= link_to _('Reopen %{display_issuable_type}') % { display_issuable_type: display_issuable_type }, issue_path(issuable, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen js-btn-issue-action #{issue_button_visibility(issuable, false)}", title: _('Reopen %{display_issuable_type}') % { display_issuable_type: display_issuable_type }, data: { endpoint: close_reopen_issuable_path(issuable) }
             - if can_report_spam
               %li= link_to _('Submit as spam'), mark_as_spam_project_issue_path(@project, issuable), method: :post, class: 'btn-spam', title: 'Submit as spam'
             - if can_create_issue
diff --git a/changelogs/unreleased/266986-update-img-resizing-ffs.yml b/changelogs/unreleased/266986-update-img-resizing-ffs.yml
new file mode 100644
index 00000000000..0d1e5f81a93
--- /dev/null
+++ b/changelogs/unreleased/266986-update-img-resizing-ffs.yml
@@ -0,0 +1,5 @@
+---
+title: Replace existing Image Resizing FFs with a single of `ops` type enabled by default
+merge_request: 45050
+author:
+type: other
diff --git a/changelogs/unreleased/277369-typeerror-can-t-quote-activesupport-hashwithindifferentaccess.yml b/changelogs/unreleased/277369-typeerror-can-t-quote-activesupport-hashwithindifferentaccess.yml
new file mode 100644
index 00000000000..73136ed5769
--- /dev/null
+++ b/changelogs/unreleased/277369-typeerror-can-t-quote-activesupport-hashwithindifferentaccess.yml
@@ -0,0 +1,5 @@
+---
+title: Fix milestones param validation for releases API PUT method
+merge_request: 47169
+author:
+type: fixed
diff --git a/config/feature_flags/development/additional_snowplow_tracking.yml b/config/feature_flags/development/additional_snowplow_tracking.yml
index 3e2b542b1a8..c5726975b37 100644
--- a/config/feature_flags/development/additional_snowplow_tracking.yml
+++ b/config/feature_flags/development/additional_snowplow_tracking.yml
@@ -1,6 +1,8 @@
+---
 name: additional_snowplow_tracking
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/12088
-rollout_issue_url:
-group: group::product analytics
+rollout_issue_url: 
+milestone: '11.11'
 type: development
+group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/ajax_new_deploy_token.yml b/config/feature_flags/development/ajax_new_deploy_token.yml
index 336e3004d52..9a6826e6993 100644
--- a/config/feature_flags/development/ajax_new_deploy_token.yml
+++ b/config/feature_flags/development/ajax_new_deploy_token.yml
@@ -2,6 +2,7 @@
 name: ajax_new_deploy_token
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27141
 rollout_issue_url: 
-group: group::progressive delivery
+milestone: '12.10'
 type: development
+group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/allow_group_deploy_token.yml b/config/feature_flags/development/allow_group_deploy_token.yml
index 06a8659292d..91437352ad8 100644
--- a/config/feature_flags/development/allow_group_deploy_token.yml
+++ b/config/feature_flags/development/allow_group_deploy_token.yml
@@ -2,6 +2,7 @@
 name: allow_group_deploy_token
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23460
 rollout_issue_url: 
-group: group::progressive delivery
+milestone: '12.8'
 type: development
+group: group::progressive delivery
 default_enabled: true
diff --git a/config/feature_flags/development/allow_possible_spam.yml b/config/feature_flags/development/allow_possible_spam.yml
index 2e121519628..696ab3ba214 100644
--- a/config/feature_flags/development/allow_possible_spam.yml
+++ b/config/feature_flags/development/allow_possible_spam.yml
@@ -2,6 +2,7 @@
 name: allow_possible_spam
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17604
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/29830
-group: group::portfolio management
+milestone: '12.4'
 type: development
+group: group::portfolio management
 default_enabled: false
diff --git a/config/feature_flags/development/allow_unsafe_ruby_regexp.yml b/config/feature_flags/development/allow_unsafe_ruby_regexp.yml
index 272e9f5ffa2..aac5d6adf40 100644
--- a/config/feature_flags/development/allow_unsafe_ruby_regexp.yml
+++ b/config/feature_flags/development/allow_unsafe_ruby_regexp.yml
@@ -2,6 +2,7 @@
 name: allow_unsafe_ruby_regexp
 introduced_by_url: 
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257849
+milestone: 
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/api_json_content_type.yml b/config/feature_flags/development/api_json_content_type.yml
index bd153550635..5653a834e62 100644
--- a/config/feature_flags/development/api_json_content_type.yml
+++ b/config/feature_flags/development/api_json_content_type.yml
@@ -2,6 +2,7 @@
 name: api_json_content_type
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42229
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270067
-group: group::ecosystem
+milestone: '13.6'
 type: development
+group: group::ecosystem
 default_enabled: false
diff --git a/config/feature_flags/development/application_settings_tokens_optional_encryption.yml b/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
index b9a5b6420d1..08814f31159 100644
--- a/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
@@ -2,6 +2,7 @@
 name: application_settings_tokens_optional_encryption
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/approval_suggestions.yml b/config/feature_flags/development/approval_suggestions.yml
index ff66e9fa80c..478bd1847db 100644
--- a/config/feature_flags/development/approval_suggestions.yml
+++ b/config/feature_flags/development/approval_suggestions.yml
@@ -2,6 +2,7 @@
 name: approval_suggestions
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/approvals_commented_by.yml b/config/feature_flags/development/approvals_commented_by.yml
index cc34b1d165e..c2851c4520f 100644
--- a/config/feature_flags/development/approvals_commented_by.yml
+++ b/config/feature_flags/development/approvals_commented_by.yml
@@ -2,6 +2,7 @@
 name: approvals_commented_by
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/archive_rate_limit.yml b/config/feature_flags/development/archive_rate_limit.yml
index 56e9fcd3f8d..ee4af4d2835 100644
--- a/config/feature_flags/development/archive_rate_limit.yml
+++ b/config/feature_flags/development/archive_rate_limit.yml
@@ -2,6 +2,7 @@
 name: archive_rate_limit
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/artifacts_management_page.yml b/config/feature_flags/development/artifacts_management_page.yml
index 78659422a39..f2c7f54d8d8 100644
--- a/config/feature_flags/development/artifacts_management_page.yml
+++ b/config/feature_flags/development/artifacts_management_page.yml
@@ -2,6 +2,7 @@
 name: artifacts_management_page
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16654
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254938
-group: group::continuous integration
+milestone: '12.4'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/async_commit_diff_files.yml b/config/feature_flags/development/async_commit_diff_files.yml
index 90aed05e12a..2279ac18869 100644
--- a/config/feature_flags/development/async_commit_diff_files.yml
+++ b/config/feature_flags/development/async_commit_diff_files.yml
@@ -2,6 +2,7 @@
 name: async_commit_diff_files
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/auto_create_cluster_management_project.yml b/config/feature_flags/development/auto_create_cluster_management_project.yml
index d3b88f056ec..ea7bf349e1e 100644
--- a/config/feature_flags/development/auto_create_cluster_management_project.yml
+++ b/config/feature_flags/development/auto_create_cluster_management_project.yml
@@ -2,6 +2,7 @@
 name: auto_create_cluster_management_project
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23946
 rollout_issue_url: 
-group: group::configure
+milestone: '12.10'
 type: development
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/auto_devops_banner_disabled.yml b/config/feature_flags/development/auto_devops_banner_disabled.yml
index b74d3c723ee..691aa895841 100644
--- a/config/feature_flags/development/auto_devops_banner_disabled.yml
+++ b/config/feature_flags/development/auto_devops_banner_disabled.yml
@@ -2,6 +2,7 @@
 name: auto_devops_banner_disabled
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/batch_suggestions.yml b/config/feature_flags/development/batch_suggestions.yml
index 0ef3c7df01e..f2bb0a8f9cb 100644
--- a/config/feature_flags/development/batch_suggestions.yml
+++ b/config/feature_flags/development/batch_suggestions.yml
@@ -2,6 +2,7 @@
 name: batch_suggestions
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/bitbucket_server_user_mapping_by_username.yml b/config/feature_flags/development/bitbucket_server_user_mapping_by_username.yml
index 3875cce4d28..c672eb1e64e 100644
--- a/config/feature_flags/development/bitbucket_server_user_mapping_by_username.yml
+++ b/config/feature_flags/development/bitbucket_server_user_mapping_by_username.yml
@@ -1,7 +1,8 @@
 ---
 name: bitbucket_server_user_mapping_by_username
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36885
-rollout_issue_url:
-group: group::import
+rollout_issue_url: 
+milestone: '13.4'
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/block_anonymous_global_searches.yml b/config/feature_flags/development/block_anonymous_global_searches.yml
index 527e99ad8a8..ee72f1ac60a 100644
--- a/config/feature_flags/development/block_anonymous_global_searches.yml
+++ b/config/feature_flags/development/block_anonymous_global_searches.yml
@@ -2,6 +2,7 @@
 name: block_anonymous_global_searches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41041
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/244276
-group: group::global search
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/development/boards_with_swimlanes.yml b/config/feature_flags/development/boards_with_swimlanes.yml
index 19e5ab24206..98820b452c1 100644
--- a/config/feature_flags/development/boards_with_swimlanes.yml
+++ b/config/feature_flags/development/boards_with_swimlanes.yml
@@ -1,7 +1,8 @@
 ---
 name: boards_with_swimlanes
-introduced_by_url:
-rollout_issue_url:
-group: group::project management
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/branch_list_keyset_pagination.yml b/config/feature_flags/development/branch_list_keyset_pagination.yml
index 11975c67561..9ba7728aa80 100644
--- a/config/feature_flags/development/branch_list_keyset_pagination.yml
+++ b/config/feature_flags/development/branch_list_keyset_pagination.yml
@@ -2,6 +2,7 @@
 name: branch_list_keyset_pagination
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/broadcast_issue_updates.yml b/config/feature_flags/development/broadcast_issue_updates.yml
index 435678f869d..b7c6ccf2353 100644
--- a/config/feature_flags/development/broadcast_issue_updates.yml
+++ b/config/feature_flags/development/broadcast_issue_updates.yml
@@ -2,6 +2,7 @@
 name: broadcast_issue_updates
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30732
 rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1210
-group: group::project management
+milestone: '13.0'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/build_service_proxy.yml b/config/feature_flags/development/build_service_proxy.yml
index 0c0aaa8aca9..8032a39e959 100644
--- a/config/feature_flags/development/build_service_proxy.yml
+++ b/config/feature_flags/development/build_service_proxy.yml
@@ -1,7 +1,8 @@
 ---
 name: build_service_proxy
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/9723
-rollout_issue_url:
-group: group::editor
+rollout_issue_url: 
+milestone: '11.11'
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/builds.yml b/config/feature_flags/development/builds.yml
index 6c17f2eb962..9787c2b1e20 100644
--- a/config/feature_flags/development/builds.yml
+++ b/config/feature_flags/development/builds.yml
@@ -2,6 +2,7 @@
 name: builds
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/bulk_import.yml b/config/feature_flags/development/bulk_import.yml
index 0a5a1e5654e..10885093adf 100644
--- a/config/feature_flags/development/bulk_import.yml
+++ b/config/feature_flags/development/bulk_import.yml
@@ -2,6 +2,7 @@
 name: bulk_import
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42704
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255310
-group: group::import
+milestone: '13.5'
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/bulk_update_health_status.yml b/config/feature_flags/development/bulk_update_health_status.yml
index fa06adfd60a..302ae0fe462 100644
--- a/config/feature_flags/development/bulk_update_health_status.yml
+++ b/config/feature_flags/development/bulk_update_health_status.yml
@@ -1,7 +1,8 @@
 ---
 name: bulk_update_health_status
-introduced_by_url:
-rollout_issue_url:
-group: group::portfolio management
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::portfolio management
 default_enabled: true
diff --git a/config/feature_flags/development/burnup_charts.yml b/config/feature_flags/development/burnup_charts.yml
index 3dd2e8d2e70..3fcc0b33b3f 100644
--- a/config/feature_flags/development/burnup_charts.yml
+++ b/config/feature_flags/development/burnup_charts.yml
@@ -1,7 +1,8 @@
 ---
 name: burnup_charts
-introduced_by_url:
+introduced_by_url: 
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268350
-group: group::project management
+milestone: '13.6'
 type: development
+group: group::project management
 default_enabled: true
diff --git a/config/feature_flags/development/cached_markdown_blob.yml b/config/feature_flags/development/cached_markdown_blob.yml
index de7a7c52b66..fcca7f89537 100644
--- a/config/feature_flags/development/cached_markdown_blob.yml
+++ b/config/feature_flags/development/cached_markdown_blob.yml
@@ -2,6 +2,7 @@
 name: cached_markdown_blob
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44300
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263406
+milestone: '13.5'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/canary_ingress_weight_control.yml b/config/feature_flags/development/canary_ingress_weight_control.yml
index 681ffc98cb5..50b4195b683 100644
--- a/config/feature_flags/development/canary_ingress_weight_control.yml
+++ b/config/feature_flags/development/canary_ingress_weight_control.yml
@@ -2,6 +2,7 @@
 name: canary_ingress_weight_control
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43816
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/260295
+milestone: '13.5'
 type: development
 group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/cd_auto_rollback.yml b/config/feature_flags/development/cd_auto_rollback.yml
index 345d380993d..0878fac7d26 100644
--- a/config/feature_flags/development/cd_auto_rollback.yml
+++ b/config/feature_flags/development/cd_auto_rollback.yml
@@ -2,6 +2,7 @@
 name: cd_auto_rollback
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45816
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/35404
+milestone: '13.6'
 type: development
 group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/chatops.yml b/config/feature_flags/development/chatops.yml
index c548af50aa5..2ce01c26cb8 100644
--- a/config/feature_flags/development/chatops.yml
+++ b/config/feature_flags/development/chatops.yml
@@ -2,6 +2,7 @@
 name: chatops
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/ci_always_refresh_merge_requests_from_beginning.yml b/config/feature_flags/development/ci_always_refresh_merge_requests_from_beginning.yml
index 9e5cae4e4a0..387c921cb5b 100644
--- a/config/feature_flags/development/ci_always_refresh_merge_requests_from_beginning.yml
+++ b/config/feature_flags/development/ci_always_refresh_merge_requests_from_beginning.yml
@@ -2,6 +2,7 @@
 name: ci_always_refresh_merge_requests_from_beginning
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45232
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268215
+milestone: '13.5'
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_artifacts_exclude.yml b/config/feature_flags/development/ci_artifacts_exclude.yml
index 86398f085d8..f1a7031b4e9 100644
--- a/config/feature_flags/development/ci_artifacts_exclude.yml
+++ b/config/feature_flags/development/ci_artifacts_exclude.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_artifacts_exclude
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30708
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_build_metadata_config.yml b/config/feature_flags/development/ci_build_metadata_config.yml
index 176abbfd387..07803e3f1da 100644
--- a/config/feature_flags/development/ci_build_metadata_config.yml
+++ b/config/feature_flags/development/ci_build_metadata_config.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_build_metadata_config
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/7238
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '11.7'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_delete_objects_high_concurrency.yml b/config/feature_flags/development/ci_delete_objects_high_concurrency.yml
index c2b391f8b8f..bcc58b2c985 100644
--- a/config/feature_flags/development/ci_delete_objects_high_concurrency.yml
+++ b/config/feature_flags/development/ci_delete_objects_high_concurrency.yml
@@ -2,6 +2,7 @@
 name: ci_delete_objects_high_concurrency
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39464
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247103
-group: group::continuous integration
+milestone: '13.5'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/ci_delete_objects_medium_concurrency.yml b/config/feature_flags/development/ci_delete_objects_medium_concurrency.yml
index 4b72980945c..911462e88ae 100644
--- a/config/feature_flags/development/ci_delete_objects_medium_concurrency.yml
+++ b/config/feature_flags/development/ci_delete_objects_medium_concurrency.yml
@@ -2,6 +2,7 @@
 name: ci_delete_objects_medium_concurrency
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39464
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247103
-group: group::continuous integration
+milestone: '13.5'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/ci_disable_validates_dependencies.yml b/config/feature_flags/development/ci_disable_validates_dependencies.yml
index ccd529d0a09..a61c7f97207 100644
--- a/config/feature_flags/development/ci_disable_validates_dependencies.yml
+++ b/config/feature_flags/development/ci_disable_validates_dependencies.yml
@@ -2,6 +2,7 @@
 name: ci_disable_validates_dependencies
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14009
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257847
-group: group::continuous integration
+milestone: 
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml b/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml
index 81a0d014b12..4b134457a20 100644
--- a/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml
+++ b/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml
@@ -2,6 +2,7 @@
 name: ci_disallow_to_create_merge_request_pipelines_in_target_project
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40724
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235119
-group: group::progressive delivery
+milestone: '13.4'
 type: development
+group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/ci_dynamic_child_pipeline.yml b/config/feature_flags/development/ci_dynamic_child_pipeline.yml
index c568e9392b2..c9d5212267e 100644
--- a/config/feature_flags/development/ci_dynamic_child_pipeline.yml
+++ b/config/feature_flags/development/ci_dynamic_child_pipeline.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_dynamic_child_pipeline
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23790
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '12.9'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_enable_live_trace.yml b/config/feature_flags/development/ci_enable_live_trace.yml
index 7ae59946330..d56107e43eb 100644
--- a/config/feature_flags/development/ci_enable_live_trace.yml
+++ b/config/feature_flags/development/ci_enable_live_trace.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_enable_live_trace
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5255
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '10.8'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_include_multiple_files_from_project.yml b/config/feature_flags/development/ci_include_multiple_files_from_project.yml
index 45cfe47cf51..afa0e1dc7ba 100644
--- a/config/feature_flags/development/ci_include_multiple_files_from_project.yml
+++ b/config/feature_flags/development/ci_include_multiple_files_from_project.yml
@@ -2,6 +2,7 @@
 name: ci_include_multiple_files_from_project
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45991
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271560
+milestone: '13.6'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_instance_variables_ui.yml b/config/feature_flags/development/ci_instance_variables_ui.yml
index 481e0150600..f5cd2d21bd1 100644
--- a/config/feature_flags/development/ci_instance_variables_ui.yml
+++ b/config/feature_flags/development/ci_instance_variables_ui.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_instance_variables_ui
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33510
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '13.1'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_job_jwt.yml b/config/feature_flags/development/ci_job_jwt.yml
index b0ad0790ebc..cba278c9103 100644
--- a/config/feature_flags/development/ci_job_jwt.yml
+++ b/config/feature_flags/development/ci_job_jwt.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_job_jwt
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207125
-rollout_issue_url: 
-group: group::release management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28063
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207125
+milestone: '12.10'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/ci_jwt_signing_key.yml b/config/feature_flags/development/ci_jwt_signing_key.yml
index 897cc06b47d..87098d3e3d7 100644
--- a/config/feature_flags/development/ci_jwt_signing_key.yml
+++ b/config/feature_flags/development/ci_jwt_signing_key.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_jwt_signing_key
-introduced_by_url:
+introduced_by_url: 
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258546
+milestone: '13.6'
 type: development
 group: group::release management
 default_enabled: false
diff --git a/config/feature_flags/development/ci_lint_creates_pipeline_with_dry_run.yml b/config/feature_flags/development/ci_lint_creates_pipeline_with_dry_run.yml
index 5f23d038998..935382989ed 100644
--- a/config/feature_flags/development/ci_lint_creates_pipeline_with_dry_run.yml
+++ b/config/feature_flags/development/ci_lint_creates_pipeline_with_dry_run.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_lint_creates_pipeline_with_dry_run
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37828
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '13.3'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_manual_bridges.yml b/config/feature_flags/development/ci_manual_bridges.yml
index fa3f323722d..6bda63e71ae 100644
--- a/config/feature_flags/development/ci_manual_bridges.yml
+++ b/config/feature_flags/development/ci_manual_bridges.yml
@@ -2,6 +2,7 @@
 name: ci_manual_bridges
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44011
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263412
+milestone: '13.5'
 type: development
 group: group::pipeline authoring
 default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_editor_page.yml b/config/feature_flags/development/ci_pipeline_editor_page.yml
index b035cb4b814..27df4735ff1 100644
--- a/config/feature_flags/development/ci_pipeline_editor_page.yml
+++ b/config/feature_flags/development/ci_pipeline_editor_page.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_pipeline_editor_page
-introduced_by_url:
+introduced_by_url: 
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270059
+milestone: 
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_pipeline_latest.yml b/config/feature_flags/development/ci_pipeline_latest.yml
index 87b064043a3..6857c80565e 100644
--- a/config/feature_flags/development/ci_pipeline_latest.yml
+++ b/config/feature_flags/development/ci_pipeline_latest.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_pipeline_latest
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34160
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_status_omit_commit_sha_in_cache_key.yml b/config/feature_flags/development/ci_pipeline_status_omit_commit_sha_in_cache_key.yml
index 911eab84b28..82a28884f75 100644
--- a/config/feature_flags/development/ci_pipeline_status_omit_commit_sha_in_cache_key.yml
+++ b/config/feature_flags/development/ci_pipeline_status_omit_commit_sha_in_cache_key.yml
@@ -2,6 +2,7 @@
 name: ci_pipeline_status_omit_commit_sha_in_cache_key
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33712
 rollout_issue_url: 
-group: group::continuous integration
+milestone: '13.2'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_triggers_settings_vue_ui.yml b/config/feature_flags/development/ci_pipeline_triggers_settings_vue_ui.yml
index 0a5c214308a..31840bb494e 100644
--- a/config/feature_flags/development/ci_pipeline_triggers_settings_vue_ui.yml
+++ b/config/feature_flags/development/ci_pipeline_triggers_settings_vue_ui.yml
@@ -2,6 +2,7 @@
 name: ci_pipeline_triggers_settings_vue_ui
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41864
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247486
-group: group::continuous integration
+milestone: '13.5'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_raise_job_rules_without_workflow_rules_warning.yml b/config/feature_flags/development/ci_raise_job_rules_without_workflow_rules_warning.yml
index c2cd1d62734..e0919dff0e0 100644
--- a/config/feature_flags/development/ci_raise_job_rules_without_workflow_rules_warning.yml
+++ b/config/feature_flags/development/ci_raise_job_rules_without_workflow_rules_warning.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_raise_job_rules_without_workflow_rules_warning
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38387
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '13.3'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml b/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml
index 52aed3378ff..451bc5229c6 100644
--- a/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml
@@ -2,6 +2,7 @@
 name: ci_runners_tokens_optional_encryption
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/cbba8fe02b0ea3adabcfe18685c9af6be3859e2d
 rollout_issue_url: 
-group: group::continuous integration
+milestone: 
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml b/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
index 70444126da9..9c05267b320 100644
--- a/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
+++ b/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
@@ -2,6 +2,7 @@
 name: ci_seed_block_run_before_workflow_rules
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45674
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270439
+milestone: '13.6'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_skip_persistent_ref_existence_check.yml b/config/feature_flags/development/ci_skip_persistent_ref_existence_check.yml
index 60c626295ab..9356ac9cfda 100644
--- a/config/feature_flags/development/ci_skip_persistent_ref_existence_check.yml
+++ b/config/feature_flags/development/ci_skip_persistent_ref_existence_check.yml
@@ -2,6 +2,7 @@
 name: ci_skip_persistent_ref_existence_check
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32391
 rollout_issue_url: 
-group: group::continuous integration
+milestone: '13.1'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/ci_store_pipeline_messages.yml b/config/feature_flags/development/ci_store_pipeline_messages.yml
index 35cbfad0efa..2ef85ce663c 100644
--- a/config/feature_flags/development/ci_store_pipeline_messages.yml
+++ b/config/feature_flags/development/ci_store_pipeline_messages.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_store_pipeline_messages
-introduced_by_url:
-rollout_issue_url:
-group: group::continuous integration
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/ci_synchronous_artifact_parsing.yml b/config/feature_flags/development/ci_synchronous_artifact_parsing.yml
index 795ac08c7e9..a5cf148559f 100644
--- a/config/feature_flags/development/ci_synchronous_artifact_parsing.yml
+++ b/config/feature_flags/development/ci_synchronous_artifact_parsing.yml
@@ -2,6 +2,7 @@
 name: ci_synchronous_artifact_parsing
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26247
 rollout_issue_url: 
-group: group::progressive delivery
+milestone: '12.9'
 type: development
+group: group::progressive delivery
 default_enabled: true
diff --git a/config/feature_flags/development/ci_trace_new_fog_store.yml b/config/feature_flags/development/ci_trace_new_fog_store.yml
index 04d2a43100a..b7da65be57b 100644
--- a/config/feature_flags/development/ci_trace_new_fog_store.yml
+++ b/config/feature_flags/development/ci_trace_new_fog_store.yml
@@ -2,6 +2,7 @@
 name: ci_trace_new_fog_store
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46209
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273405
+milestone: '13.6'
 type: development
 group: group::testing
 default_enabled: true
diff --git a/config/feature_flags/development/ci_yaml_limit_size.yml b/config/feature_flags/development/ci_yaml_limit_size.yml
index 0ebd29d0ba5..79107691efb 100644
--- a/config/feature_flags/development/ci_yaml_limit_size.yml
+++ b/config/feature_flags/development/ci_yaml_limit_size.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_yaml_limit_size
-introduced_by_url:
-rollout_issue_url:
-group: group::continuous integration
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/cluster_agent_list.yml b/config/feature_flags/development/cluster_agent_list.yml
index a4468b662ae..2c49950620d 100644
--- a/config/feature_flags/development/cluster_agent_list.yml
+++ b/config/feature_flags/development/cluster_agent_list.yml
@@ -1,7 +1,8 @@
 ---
 name: cluster_agent_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/228845
-rollout_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/3834
-group: group::configure
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42115
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/249596
+milestone: '13.5'
 type: development
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/cluster_management_project.yml b/config/feature_flags/development/cluster_management_project.yml
index 922b7e6cad3..bcce2e027ff 100644
--- a/config/feature_flags/development/cluster_management_project.yml
+++ b/config/feature_flags/development/cluster_management_project.yml
@@ -2,6 +2,7 @@
 name: cluster_management_project
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17866
 rollout_issue_url: 
-group: group::configure
+milestone: '12.4'
 type: development
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/collect_package_events.yml b/config/feature_flags/development/collect_package_events.yml
index 65b88f84d86..488dce6a724 100644
--- a/config/feature_flags/development/collect_package_events.yml
+++ b/config/feature_flags/development/collect_package_events.yml
@@ -2,6 +2,7 @@
 name: collect_package_events
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45802
 rollout_issue_url: 
-group: group::package
+milestone: '13.6'
 type: development
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/consolidated_edit_button.yml b/config/feature_flags/development/consolidated_edit_button.yml
index 92d96aeeaa9..c618f70555b 100644
--- a/config/feature_flags/development/consolidated_edit_button.yml
+++ b/config/feature_flags/development/consolidated_edit_button.yml
@@ -2,6 +2,7 @@
 name: consolidated_edit_button
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44311
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270433
-group: group::editor
+milestone: '13.5'
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/container_expiration_policies_historic_entry.yml b/config/feature_flags/development/container_expiration_policies_historic_entry.yml
index 0525f77eacf..ab2111b3159 100644
--- a/config/feature_flags/development/container_expiration_policies_historic_entry.yml
+++ b/config/feature_flags/development/container_expiration_policies_historic_entry.yml
@@ -2,6 +2,7 @@
 name: container_expiration_policies_historic_entry
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44444
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262639
+milestone: '13.5'
 type: development
 group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/container_registry_expiration_policies_throttling.yml b/config/feature_flags/development/container_registry_expiration_policies_throttling.yml
index 5169bcdfa28..f9aa6bde700 100644
--- a/config/feature_flags/development/container_registry_expiration_policies_throttling.yml
+++ b/config/feature_flags/development/container_registry_expiration_policies_throttling.yml
@@ -2,6 +2,7 @@
 name: container_registry_expiration_policies_throttling
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36319
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238190
-group: group::package
+milestone: '13.4'
 type: development
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/context_commits.yml b/config/feature_flags/development/context_commits.yml
index f615846f6c0..270a058558b 100644
--- a/config/feature_flags/development/context_commits.yml
+++ b/config/feature_flags/development/context_commits.yml
@@ -2,6 +2,7 @@
 name: context_commits
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/core_security_mr_widget.yml b/config/feature_flags/development/core_security_mr_widget.yml
index 343bd238ae8..dfeb30cd83a 100644
--- a/config/feature_flags/development/core_security_mr_widget.yml
+++ b/config/feature_flags/development/core_security_mr_widget.yml
@@ -2,6 +2,7 @@
 name: core_security_mr_widget
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44639
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/249543
+milestone: '13.5'
 type: development
 group: group::static analysis
 default_enabled: true
diff --git a/config/feature_flags/development/coverage_fuzzing_mr_widget.yml b/config/feature_flags/development/coverage_fuzzing_mr_widget.yml
index 9382ea9d9f1..f5cde1d5785 100644
--- a/config/feature_flags/development/coverage_fuzzing_mr_widget.yml
+++ b/config/feature_flags/development/coverage_fuzzing_mr_widget.yml
@@ -2,6 +2,7 @@
 name: coverage_fuzzing_mr_widget
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43545
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257839
+milestone: '13.6'
 type: development
 group: group::fuzz testing
 default_enabled: false
diff --git a/config/feature_flags/development/create_cloud_run_clusters.yml b/config/feature_flags/development/create_cloud_run_clusters.yml
index 6c479a3dd6c..8352d6290e0 100644
--- a/config/feature_flags/development/create_cloud_run_clusters.yml
+++ b/config/feature_flags/development/create_cloud_run_clusters.yml
@@ -1,7 +1,8 @@
 ---
 name: create_cloud_run_clusters
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19063
-rollout_issue_url:
-group: group::configure
+rollout_issue_url: 
+milestone: '12.5'
 type: development
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/dag_pipeline_tab.yml b/config/feature_flags/development/dag_pipeline_tab.yml
index f4261b51e05..f2ae897df8e 100644
--- a/config/feature_flags/development/dag_pipeline_tab.yml
+++ b/config/feature_flags/development/dag_pipeline_tab.yml
@@ -1,7 +1,8 @@
 ---
 name: dag_pipeline_tab
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30310
-rollout_issue_url:
-group: group::pipeline authoring
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::pipeline authoring
 default_enabled: true
diff --git a/config/feature_flags/development/dashboard_pipeline_status.yml b/config/feature_flags/development/dashboard_pipeline_status.yml
index 8034177ee1e..f24ba5983a8 100644
--- a/config/feature_flags/development/dashboard_pipeline_status.yml
+++ b/config/feature_flags/development/dashboard_pipeline_status.yml
@@ -2,6 +2,7 @@
 name: dashboard_pipeline_status
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22029
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/209061
-group: group::continuous integration
+milestone: '12.7'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/debian_packages.yml b/config/feature_flags/development/debian_packages.yml
index 8f706e81b6a..df4c155bba9 100644
--- a/config/feature_flags/development/debian_packages.yml
+++ b/config/feature_flags/development/debian_packages.yml
@@ -2,6 +2,7 @@
 name: debian_packages
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42670
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/5835
-group: group::package
+milestone: '13.5'
 type: development
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/default_merge_ref_for_diffs.yml b/config/feature_flags/development/default_merge_ref_for_diffs.yml
index b982185c1fd..433e42c9bff 100644
--- a/config/feature_flags/development/default_merge_ref_for_diffs.yml
+++ b/config/feature_flags/development/default_merge_ref_for_diffs.yml
@@ -1,7 +1,8 @@
 ---
 name: default_merge_ref_for_diffs
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34472
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.4'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/deploy_keys_on_protected_branches.yml b/config/feature_flags/development/deploy_keys_on_protected_branches.yml
index ec5c13082ec..438726c0315 100644
--- a/config/feature_flags/development/deploy_keys_on_protected_branches.yml
+++ b/config/feature_flags/development/deploy_keys_on_protected_branches.yml
@@ -2,6 +2,7 @@
 name: deploy_keys_on_protected_branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35638
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247866
-group: group::progressive delivery
+milestone: '13.5'
 type: development
+group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/deploy_tokens_api.yml b/config/feature_flags/development/deploy_tokens_api.yml
index 27c583e760b..b9741e05d7e 100644
--- a/config/feature_flags/development/deploy_tokens_api.yml
+++ b/config/feature_flags/development/deploy_tokens_api.yml
@@ -1,7 +1,8 @@
 ---
 name: deploy_tokens_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25219
-rollout_issue_url:
-group: group::package
+rollout_issue_url: 
+milestone: '12.9'
 type: development
+group: group::package
 default_enabled: true
diff --git a/config/feature_flags/development/design_management_allow_dangerous_images.yml b/config/feature_flags/development/design_management_allow_dangerous_images.yml
index 73c348a69ca..1973755f7d3 100644
--- a/config/feature_flags/development/design_management_allow_dangerous_images.yml
+++ b/config/feature_flags/development/design_management_allow_dangerous_images.yml
@@ -2,6 +2,7 @@
 name: design_management_allow_dangerous_images
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16160
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/34279
-group: group::knowledge
+milestone: '12.4'
 type: development
+group: group::knowledge
 default_enabled: false
diff --git a/config/feature_flags/development/devops_adoption_feature.yml b/config/feature_flags/development/devops_adoption_feature.yml
index 060e87d5a16..7032c52c390 100644
--- a/config/feature_flags/development/devops_adoption_feature.yml
+++ b/config/feature_flags/development/devops_adoption_feature.yml
@@ -2,6 +2,7 @@
 name: devops_adoption_feature
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46005
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271568
+milestone: '13.6'
 type: development
 group: group::analytics
 default_enabled: false
diff --git a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
index d0e549a465d..354dfebbf6d 100644
--- a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
+++ b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml
@@ -1,7 +1,8 @@
 ---
 name: disable_metric_dashboard_refresh_rate
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229831
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37195
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229841
-group: group::health
+milestone: '13.2'
 type: development
+group: group::health
 default_enabled: false
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
index 678037fa366..f23e8ac9969 100644
--- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml
+++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
@@ -1,7 +1,8 @@
 ---
 name: display_merge_conflicts_in_diff
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/drop_license_management_artifact.yml b/config/feature_flags/development/drop_license_management_artifact.yml
index 34e10fa7ae6..1be40187b43 100644
--- a/config/feature_flags/development/drop_license_management_artifact.yml
+++ b/config/feature_flags/development/drop_license_management_artifact.yml
@@ -1,7 +1,8 @@
 ---
 name: drop_license_management_artifact
-introduced_by_url:
-rollout_issue_url:
-group: group::composition analysis
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::composition analysis
 default_enabled: true
diff --git a/config/feature_flags/development/dynamic_image_resizing_requester.yml b/config/feature_flags/development/dynamic_image_resizing_requester.yml
deleted file mode 100644
index e491b14d27d..00000000000
--- a/config/feature_flags/development/dynamic_image_resizing_requester.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: dynamic_image_resizing_requester
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37342
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233704
-group: group::memory
-type: development
-default_enabled: false
diff --git a/config/feature_flags/development/efficient_counter_attribute.yml b/config/feature_flags/development/efficient_counter_attribute.yml
index 1b12c166c53..98c2b1ce314 100644
--- a/config/feature_flags/development/efficient_counter_attribute.yml
+++ b/config/feature_flags/development/efficient_counter_attribute.yml
@@ -2,6 +2,7 @@
 name: efficient_counter_attribute
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35878
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238535
-group: group::continuous integration
+milestone: '13.3'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/export_reduce_relation_batch_size.yml b/config/feature_flags/development/export_reduce_relation_batch_size.yml
index d077079b586..70b19dfe594 100644
--- a/config/feature_flags/development/export_reduce_relation_batch_size.yml
+++ b/config/feature_flags/development/export_reduce_relation_batch_size.yml
@@ -1,7 +1,8 @@
 ---
 name: export_reduce_relation_batch_size
-introduced_by_url:
-rollout_issue_url:
-group: group::import
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/feature_flag_api.yml b/config/feature_flags/development/feature_flag_api.yml
index 326cfa83433..3dc1d87d741 100644
--- a/config/feature_flags/development/feature_flag_api.yml
+++ b/config/feature_flags/development/feature_flag_api.yml
@@ -2,6 +2,7 @@
 name: feature_flag_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18198
 rollout_issue_url: 
-group: group::progressive delivery
+milestone: '12.4'
 type: development
+group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/feature_flag_permissions.yml b/config/feature_flags/development/feature_flag_permissions.yml
index 2eb5b513743..b7a4e8cb1bb 100644
--- a/config/feature_flags/development/feature_flag_permissions.yml
+++ b/config/feature_flags/development/feature_flag_permissions.yml
@@ -2,6 +2,7 @@
 name: feature_flag_permissions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/10096
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254981
-group: group::progressive delivery
+milestone: '11.10'
 type: development
+group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/feature_flags_legacy_read_only.yml b/config/feature_flags/development/feature_flags_legacy_read_only.yml
index b790e466093..ab5510f0804 100644
--- a/config/feature_flags/development/feature_flags_legacy_read_only.yml
+++ b/config/feature_flags/development/feature_flags_legacy_read_only.yml
@@ -2,6 +2,7 @@
 name: feature_flags_legacy_read_only
 introduced_by_url: 
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240985
-group: group::progressive delivery
+milestone: '13.7'
 type: development
+group: group::progressive delivery
 default_enabled: true
diff --git a/config/feature_flags/development/feature_flags_legacy_read_only_override.yml b/config/feature_flags/development/feature_flags_legacy_read_only_override.yml
index 14acde1b8fc..28438a130f4 100644
--- a/config/feature_flags/development/feature_flags_legacy_read_only_override.yml
+++ b/config/feature_flags/development/feature_flags_legacy_read_only_override.yml
@@ -2,6 +2,7 @@
 name: feature_flags_legacy_read_only_override
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40431
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240985
-group: group::progressive delivery
+milestone: '13.4'
 type: development
+group: group::progressive delivery
 default_enabled: false
diff --git a/config/feature_flags/development/feature_flags_new_version.yml b/config/feature_flags/development/feature_flags_new_version.yml
index 3a89816c482..f42054ce3ef 100644
--- a/config/feature_flags/development/feature_flags_new_version.yml
+++ b/config/feature_flags/development/feature_flags_new_version.yml
@@ -2,6 +2,7 @@
 name: feature_flags_new_version
 introduced_by_url: 
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258831
-group: group::progressive delivery
+milestone: '13.7'
 type: development
+group: group::progressive delivery
 default_enabled: true
diff --git a/config/feature_flags/development/file_identifier_hash.yml b/config/feature_flags/development/file_identifier_hash.yml
index 681054cf7fa..d5dc2b03eb6 100644
--- a/config/feature_flags/development/file_identifier_hash.yml
+++ b/config/feature_flags/development/file_identifier_hash.yml
@@ -2,6 +2,7 @@
 name: file_identifier_hash
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/force_autodevops_on_by_default.yml b/config/feature_flags/development/force_autodevops_on_by_default.yml
index 352a6d40bd1..3cd06fefd6d 100644
--- a/config/feature_flags/development/force_autodevops_on_by_default.yml
+++ b/config/feature_flags/development/force_autodevops_on_by_default.yml
@@ -2,6 +2,7 @@
 name: force_autodevops_on_by_default
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/forking.yml b/config/feature_flags/development/forking.yml
index d7d0cb79562..77e223d6268 100644
--- a/config/feature_flags/development/forking.yml
+++ b/config/feature_flags/development/forking.yml
@@ -2,6 +2,7 @@
 name: forking
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/forti_authenticator.yml b/config/feature_flags/development/forti_authenticator.yml
index 31f5256753f..f3360d136ec 100644
--- a/config/feature_flags/development/forti_authenticator.yml
+++ b/config/feature_flags/development/forti_authenticator.yml
@@ -1,7 +1,8 @@
 ---
 name: forti_authenticator
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45055
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.5'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/forward_deployment_enabled.yml b/config/feature_flags/development/forward_deployment_enabled.yml
index f9aed1a0568..b4ad2e75561 100644
--- a/config/feature_flags/development/forward_deployment_enabled.yml
+++ b/config/feature_flags/development/forward_deployment_enabled.yml
@@ -2,6 +2,7 @@
 name: forward_deployment_enabled
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24412
 rollout_issue_url: 
-group: group::progressive delivery
+milestone: '12.8'
 type: development
+group: group::progressive delivery
 default_enabled: true
diff --git a/config/feature_flags/development/generic_canonical.yml b/config/feature_flags/development/generic_canonical.yml
deleted file mode 100644
index aa8da78ae19..00000000000
--- a/config/feature_flags/development/generic_canonical.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: generic_canonical
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46435
-rollout_issue_url:
-type: development
-group: group::editor
-default_enabled: false
diff --git a/config/feature_flags/development/generic_packages.yml b/config/feature_flags/development/generic_packages.yml
index 7b80e50d372..aa41fb58a56 100644
--- a/config/feature_flags/development/generic_packages.yml
+++ b/config/feature_flags/development/generic_packages.yml
@@ -2,6 +2,7 @@
 name: generic_packages
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40045
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239133
-group: group::release management
+milestone: '13.4'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/geo_snippet_repository_replication.yml b/config/feature_flags/development/geo_snippet_repository_replication.yml
index 7d121191d6c..69aa7beef55 100644
--- a/config/feature_flags/development/geo_snippet_repository_replication.yml
+++ b/config/feature_flags/development/geo_snippet_repository_replication.yml
@@ -2,6 +2,7 @@
 name: geo_snippet_repository_replication
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38688
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/224168
-group: group::geo
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::geo
+default_enabled: false
diff --git a/config/feature_flags/development/git_push_create_all_pipelines.yml b/config/feature_flags/development/git_push_create_all_pipelines.yml
index a205307d5fa..912375cc098 100644
--- a/config/feature_flags/development/git_push_create_all_pipelines.yml
+++ b/config/feature_flags/development/git_push_create_all_pipelines.yml
@@ -1,7 +1,8 @@
 ---
 name: git_push_create_all_pipelines
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27205
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/gitaly_catfile-cache.yml b/config/feature_flags/development/gitaly_catfile-cache.yml
index 1fdfacfb4d2..14268e328f0 100644
--- a/config/feature_flags/development/gitaly_catfile-cache.yml
+++ b/config/feature_flags/development/gitaly_catfile-cache.yml
@@ -2,6 +2,7 @@
 name: gitaly_catfile-cache
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/gitaly_deny_disk_access.yml b/config/feature_flags/development/gitaly_deny_disk_access.yml
index faf9bc6d71f..b9c401e90d4 100644
--- a/config/feature_flags/development/gitaly_deny_disk_access.yml
+++ b/config/feature_flags/development/gitaly_deny_disk_access.yml
@@ -2,6 +2,7 @@
 name: gitaly_deny_disk_access
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/gitaly_enforce_requests_limits.yml b/config/feature_flags/development/gitaly_enforce_requests_limits.yml
index 2e4aa4ab794..cacfd87f203 100644
--- a/config/feature_flags/development/gitaly_enforce_requests_limits.yml
+++ b/config/feature_flags/development/gitaly_enforce_requests_limits.yml
@@ -2,6 +2,7 @@
 name: gitaly_enforce_requests_limits
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/gitaly_mep_mep.yml b/config/feature_flags/development/gitaly_mep_mep.yml
index b657449a436..75cac13fe83 100644
--- a/config/feature_flags/development/gitaly_mep_mep.yml
+++ b/config/feature_flags/development/gitaly_mep_mep.yml
@@ -2,6 +2,7 @@
 name: gitaly_mep_mep
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/gitlab_ci_yml_preview.yml b/config/feature_flags/development/gitlab_ci_yml_preview.yml
index ea03b25874c..5b5453c0f08 100644
--- a/config/feature_flags/development/gitlab_ci_yml_preview.yml
+++ b/config/feature_flags/development/gitlab_ci_yml_preview.yml
@@ -2,6 +2,7 @@
 name: gitlab_ci_yml_preview
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40880
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/244905
-group: group::ci
+milestone: '13.4'
 type: development
+group: group::ci
 default_enabled: false
diff --git a/config/feature_flags/development/gitpod.yml b/config/feature_flags/development/gitpod.yml
index d1d9f35d4d4..616aae4be45 100644
--- a/config/feature_flags/development/gitpod.yml
+++ b/config/feature_flags/development/gitpod.yml
@@ -2,6 +2,7 @@
 name: gitpod
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37985
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258206
-group: group::editor
+milestone: '13.4'
 type: development
+group: group::editor
 default_enabled: true
diff --git a/config/feature_flags/development/global_default_branch_name.yml b/config/feature_flags/development/global_default_branch_name.yml
index 2954ed74062..488c9fb47c8 100644
--- a/config/feature_flags/development/global_default_branch_name.yml
+++ b/config/feature_flags/development/global_default_branch_name.yml
@@ -1,7 +1,8 @@
 ---
 name: global_default_branch_name
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35269
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/go_proxy.yml b/config/feature_flags/development/go_proxy.yml
index bd0c58faee5..4ec5dc786fd 100644
--- a/config/feature_flags/development/go_proxy.yml
+++ b/config/feature_flags/development/go_proxy.yml
@@ -1,7 +1,8 @@
 ---
 name: go_proxy
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27746
-rollout_issue_url:
-group: group::package
+rollout_issue_url: 
+milestone: '13.1'
 type: development
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/go_proxy_disable_gomod_validation.yml b/config/feature_flags/development/go_proxy_disable_gomod_validation.yml
index 336a88bb7ff..f361d3392ec 100644
--- a/config/feature_flags/development/go_proxy_disable_gomod_validation.yml
+++ b/config/feature_flags/development/go_proxy_disable_gomod_validation.yml
@@ -1,7 +1,8 @@
 ---
 name: go_proxy_disable_gomod_validation
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34338
-rollout_issue_url:
-group: group::package
+rollout_issue_url: 
+milestone: '13.1'
 type: development
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/grape_gitlab_json.yml b/config/feature_flags/development/grape_gitlab_json.yml
index ab98ed981c9..6ab6563e41d 100644
--- a/config/feature_flags/development/grape_gitlab_json.yml
+++ b/config/feature_flags/development/grape_gitlab_json.yml
@@ -2,6 +2,7 @@
 name: grape_gitlab_json
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/graphql_board_lists.yml b/config/feature_flags/development/graphql_board_lists.yml
index 7e2696a06c8..19785015f1b 100644
--- a/config/feature_flags/development/graphql_board_lists.yml
+++ b/config/feature_flags/development/graphql_board_lists.yml
@@ -1,7 +1,8 @@
 ---
 name: graphql_board_lists
-introduced_by_url:
-rollout_issue_url:
-group: group::project management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37905
+rollout_issue_url: 
+milestone: '13.4'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/graphql_individual_release_page.yml b/config/feature_flags/development/graphql_individual_release_page.yml
index 29c9692eaec..07eac51d380 100644
--- a/config/feature_flags/development/graphql_individual_release_page.yml
+++ b/config/feature_flags/development/graphql_individual_release_page.yml
@@ -2,6 +2,7 @@
 name: graphql_individual_release_page
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44779
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263522
+milestone: '13.5'
 type: development
 group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/graphql_logging.yml b/config/feature_flags/development/graphql_logging.yml
index cd2a5b109e8..9d76343511c 100644
--- a/config/feature_flags/development/graphql_logging.yml
+++ b/config/feature_flags/development/graphql_logging.yml
@@ -2,6 +2,7 @@
 name: graphql_logging
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/graphql_milestone_stats.yml b/config/feature_flags/development/graphql_milestone_stats.yml
index a3ff14d3245..f6873e1c9e9 100644
--- a/config/feature_flags/development/graphql_milestone_stats.yml
+++ b/config/feature_flags/development/graphql_milestone_stats.yml
@@ -1,7 +1,8 @@
 ---
 name: graphql_milestone_stats
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35066
-rollout_issue_url:
-group: group::release management
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/graphql_pipeline_header.yml b/config/feature_flags/development/graphql_pipeline_header.yml
index 99019d4c849..1d400c17452 100644
--- a/config/feature_flags/development/graphql_pipeline_header.yml
+++ b/config/feature_flags/development/graphql_pipeline_header.yml
@@ -2,6 +2,7 @@
 name: graphql_pipeline_header
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39494
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254235
-group: group::pipeline authoring
+milestone: '13.5'
 type: development
+group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/graphql_release_data.yml b/config/feature_flags/development/graphql_release_data.yml
index 609c0dc634a..ef1f3dbba4c 100644
--- a/config/feature_flags/development/graphql_release_data.yml
+++ b/config/feature_flags/development/graphql_release_data.yml
@@ -1,7 +1,8 @@
 ---
 name: graphql_release_data
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30753
-rollout_issue_url:
-group: group::release management
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/graphql_releases_page.yml b/config/feature_flags/development/graphql_releases_page.yml
index 607fc7027b5..541cf04bd79 100644
--- a/config/feature_flags/development/graphql_releases_page.yml
+++ b/config/feature_flags/development/graphql_releases_page.yml
@@ -1,7 +1,8 @@
 ---
 name: graphql_releases_page
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33095
-rollout_issue_url:
-group: group::release management
+rollout_issue_url: 
+milestone: '13.4'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/group_export_ndjson.yml b/config/feature_flags/development/group_export_ndjson.yml
index 3f7f61672f4..0f6cc863022 100644
--- a/config/feature_flags/development/group_export_ndjson.yml
+++ b/config/feature_flags/development/group_export_ndjson.yml
@@ -1,7 +1,8 @@
 ---
 name: group_export_ndjson
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29590
-rollout_issue_url:
-group: group::import
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::import
 default_enabled: true
diff --git a/config/feature_flags/development/group_import_export.yml b/config/feature_flags/development/group_import_export.yml
index 0e88c45684f..59204f2d16e 100644
--- a/config/feature_flags/development/group_import_export.yml
+++ b/config/feature_flags/development/group_import_export.yml
@@ -1,7 +1,8 @@
 ---
 name: group_import_export
-introduced_by_url:
-rollout_issue_url:
-group: group::import
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::import
 default_enabled: true
diff --git a/config/feature_flags/development/group_import_ndjson.yml b/config/feature_flags/development/group_import_ndjson.yml
index 98f0d4722e4..a84df7e0074 100644
--- a/config/feature_flags/development/group_import_ndjson.yml
+++ b/config/feature_flags/development/group_import_ndjson.yml
@@ -1,7 +1,8 @@
 ---
 name: group_import_ndjson
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29716
-rollout_issue_url:
-group: group::import
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::import
 default_enabled: true
diff --git a/config/feature_flags/development/group_level_integrations.yml b/config/feature_flags/development/group_level_integrations.yml
index c089333f72a..9f541ec8e99 100644
--- a/config/feature_flags/development/group_level_integrations.yml
+++ b/config/feature_flags/development/group_level_integrations.yml
@@ -2,6 +2,7 @@
 name: group_level_integrations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27557
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575
-group: group::ecosystem
+milestone: '12.10'
 type: development
+group: group::ecosystem
 default_enabled: false
diff --git a/config/feature_flags/development/groups_tokens_optional_encryption.yml b/config/feature_flags/development/groups_tokens_optional_encryption.yml
index 2c081e72e52..2b36b0d7c10 100644
--- a/config/feature_flags/development/groups_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/groups_tokens_optional_encryption.yml
@@ -2,6 +2,7 @@
 name: groups_tokens_optional_encryption
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/help_page_documentation_redirect.yml b/config/feature_flags/development/help_page_documentation_redirect.yml
index bf30101a199..8871160e42d 100644
--- a/config/feature_flags/development/help_page_documentation_redirect.yml
+++ b/config/feature_flags/development/help_page_documentation_redirect.yml
@@ -2,6 +2,7 @@
 name: help_page_documentation_redirect
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42702
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255328
-group: group::static site editor
+milestone: '13.5'
 type: development
+group: group::static site editor
 default_enabled: false
diff --git a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml b/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
index 075f3e135ed..9c1afa43dd2 100644
--- a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
+++ b/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
@@ -2,6 +2,7 @@
 name: hide_jump_to_next_unresolved_in_threads
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/highlight_current_diff_row.yml b/config/feature_flags/development/highlight_current_diff_row.yml
index 1133680c173..323f4c3436c 100644
--- a/config/feature_flags/development/highlight_current_diff_row.yml
+++ b/config/feature_flags/development/highlight_current_diff_row.yml
@@ -2,6 +2,7 @@
 name: highlight_current_diff_row
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/http_integrations_list.yml b/config/feature_flags/development/http_integrations_list.yml
index 696e26d9efb..3567f7b446d 100644
--- a/config/feature_flags/development/http_integrations_list.yml
+++ b/config/feature_flags/development/http_integrations_list.yml
@@ -2,6 +2,7 @@
 name: http_integrations_list
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45993
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255502
+milestone: '13.6'
 type: development
 group: group::health
 default_enabled: false
diff --git a/config/feature_flags/development/include_lfs_blobs_in_archive.yml b/config/feature_flags/development/include_lfs_blobs_in_archive.yml
index da0e3056d58..c2908fb28da 100644
--- a/config/feature_flags/development/include_lfs_blobs_in_archive.yml
+++ b/config/feature_flags/development/include_lfs_blobs_in_archive.yml
@@ -2,6 +2,7 @@
 name: include_lfs_blobs_in_archive
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44116
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268409
+milestone: '13.5'
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/increased_diff_limits.yml b/config/feature_flags/development/increased_diff_limits.yml
index 351e6926161..ee811c221dc 100644
--- a/config/feature_flags/development/increased_diff_limits.yml
+++ b/config/feature_flags/development/increased_diff_limits.yml
@@ -2,6 +2,7 @@
 name: increased_diff_limits
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40357
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241185
-group: group::source code
+milestone: '13.5'
 type: development
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/ingress_modsecurity.yml b/config/feature_flags/development/ingress_modsecurity.yml
index 7ed1d089476..1dc7a1d6a52 100644
--- a/config/feature_flags/development/ingress_modsecurity.yml
+++ b/config/feature_flags/development/ingress_modsecurity.yml
@@ -2,6 +2,7 @@
 name: ingress_modsecurity
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20194
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258554
-group: group::container security
+milestone: '12.5'
 type: development
+group: group::container security
 default_enabled: false
diff --git a/config/feature_flags/development/instance_statistics.yml b/config/feature_flags/development/instance_statistics.yml
index f4d606b099f..b5354561d03 100644
--- a/config/feature_flags/development/instance_statistics.yml
+++ b/config/feature_flags/development/instance_statistics.yml
@@ -2,6 +2,7 @@
 name: instance_statistics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40583
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241711
-group: group::analytics
+milestone: '13.4'
 type: development
+group: group::analytics
 default_enabled: true
diff --git a/config/feature_flags/development/invisible_captcha.yml b/config/feature_flags/development/invisible_captcha.yml
index e44e5a47947..651f5b99573 100644
--- a/config/feature_flags/development/invisible_captcha.yml
+++ b/config/feature_flags/development/invisible_captcha.yml
@@ -1,7 +1,8 @@
 ---
 name: invisible_captcha
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31625
-rollout_issue_url:
-group: group::acquisition
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/development/invite_members_group_modal.yml b/config/feature_flags/development/invite_members_group_modal.yml
index faa905f6557..444cc79ff57 100644
--- a/config/feature_flags/development/invite_members_group_modal.yml
+++ b/config/feature_flags/development/invite_members_group_modal.yml
@@ -2,6 +2,7 @@
 name: invite_members_group_modal
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37906
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247208
-group: group::expansion
+milestone: '13.5'
 type: development
+group: group::expansion
 default_enabled: false
diff --git a/config/feature_flags/development/invite_your_teammates_banner_a.yml b/config/feature_flags/development/invite_your_teammates_banner_a.yml
index 07aec532e16..c7b16357c68 100644
--- a/config/feature_flags/development/invite_your_teammates_banner_a.yml
+++ b/config/feature_flags/development/invite_your_teammates_banner_a.yml
@@ -2,6 +2,7 @@
 name: invite_your_teammates_banner_a
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37658
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231275
-group: group::expansion
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/development/issues.yml b/config/feature_flags/development/issues.yml
index 6274767d4e1..a6ff572da52 100644
--- a/config/feature_flags/development/issues.yml
+++ b/config/feature_flags/development/issues.yml
@@ -2,6 +2,7 @@
 name: issues
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/jira_issues_list.yml b/config/feature_flags/development/jira_issues_list.yml
index d0ad1347403..081daf0281e 100644
--- a/config/feature_flags/development/jira_issues_list.yml
+++ b/config/feature_flags/development/jira_issues_list.yml
@@ -2,6 +2,7 @@
 name: jira_issues_list
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45678
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273726
+milestone: '13.6'
 type: development
 group: group::ecosystem
 default_enabled: false
diff --git a/config/feature_flags/development/json_limited_encoder.yml b/config/feature_flags/development/json_limited_encoder.yml
index d20b5412233..409bae16b90 100644
--- a/config/feature_flags/development/json_limited_encoder.yml
+++ b/config/feature_flags/development/json_limited_encoder.yml
@@ -1,7 +1,8 @@
 ---
 name: json_limited_encoder
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38687
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '13.3'
 type: development
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/json_wrapper_legacy_mode.yml b/config/feature_flags/development/json_wrapper_legacy_mode.yml
index dc3da1867e9..d255bf35889 100644
--- a/config/feature_flags/development/json_wrapper_legacy_mode.yml
+++ b/config/feature_flags/development/json_wrapper_legacy_mode.yml
@@ -2,6 +2,7 @@
 name: json_wrapper_legacy_mode
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/junit_pipeline_screenshots_view.yml b/config/feature_flags/development/junit_pipeline_screenshots_view.yml
index 273e0ed450e..eae38966064 100644
--- a/config/feature_flags/development/junit_pipeline_screenshots_view.yml
+++ b/config/feature_flags/development/junit_pipeline_screenshots_view.yml
@@ -1,7 +1,8 @@
 ---
 name: junit_pipeline_screenshots_view
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/202114
-rollout_issue_url:
-group: group::verify testing
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31029
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/202114
+milestone: '13.0'
 type: development
+group: group::verify testing
 default_enabled: false
diff --git a/config/feature_flags/development/lfs_check.yml b/config/feature_flags/development/lfs_check.yml
index 39e7d9ba6e9..4eb53739cf6 100644
--- a/config/feature_flags/development/lfs_check.yml
+++ b/config/feature_flags/development/lfs_check.yml
@@ -2,6 +2,7 @@
 name: lfs_check
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/limit_projects_in_groups_api.yml b/config/feature_flags/development/limit_projects_in_groups_api.yml
index efa763944ec..b2046ce2c29 100644
--- a/config/feature_flags/development/limit_projects_in_groups_api.yml
+++ b/config/feature_flags/development/limit_projects_in_groups_api.yml
@@ -2,6 +2,7 @@
 name: limit_projects_in_groups_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20023
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257829
-group: group::access
+milestone: '12.6'
 type: development
+group: group::access
 default_enabled: true
diff --git a/config/feature_flags/development/log_import_export_relation_creation.yml b/config/feature_flags/development/log_import_export_relation_creation.yml
index 4ab84c2193c..ca7223c52b0 100644
--- a/config/feature_flags/development/log_import_export_relation_creation.yml
+++ b/config/feature_flags/development/log_import_export_relation_creation.yml
@@ -1,7 +1,8 @@
 ---
 name: log_import_export_relation_creation
-introduced_by_url:
-rollout_issue_url:
-group: group::import
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/maintenance_mode.yml b/config/feature_flags/development/maintenance_mode.yml
index 429e70b64a2..53ecea7ba2b 100644
--- a/config/feature_flags/development/maintenance_mode.yml
+++ b/config/feature_flags/development/maintenance_mode.yml
@@ -2,6 +2,7 @@
 name: maintenance_mode
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28158
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/217895
-group: group::geo
+milestone: '12.10'
 type: development
+group: group::geo
 default_enabled: false
diff --git a/config/feature_flags/development/merge_orchestration_service.yml b/config/feature_flags/development/merge_orchestration_service.yml
index 2bdfe9b52a4..52de3b6e733 100644
--- a/config/feature_flags/development/merge_orchestration_service.yml
+++ b/config/feature_flags/development/merge_orchestration_service.yml
@@ -2,6 +2,7 @@
 name: merge_orchestration_service
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28532
 rollout_issue_url: 
-group: group::continuous integration
+milestone: '12.10'
 type: development
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/development/merge_red_head_comments_position_on_demand.yml b/config/feature_flags/development/merge_red_head_comments_position_on_demand.yml
index 5effc83b53e..df19f53fffe 100644
--- a/config/feature_flags/development/merge_red_head_comments_position_on_demand.yml
+++ b/config/feature_flags/development/merge_red_head_comments_position_on_demand.yml
@@ -2,6 +2,7 @@
 name: merge_red_head_comments_position_on_demand
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/merge_ref_auto_sync.yml b/config/feature_flags/development/merge_ref_auto_sync.yml
index cc5ea34eb0e..29e958b877f 100644
--- a/config/feature_flags/development/merge_ref_auto_sync.yml
+++ b/config/feature_flags/development/merge_ref_auto_sync.yml
@@ -2,6 +2,7 @@
 name: merge_ref_auto_sync
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/merge_ref_auto_sync_lock.yml b/config/feature_flags/development/merge_ref_auto_sync_lock.yml
index d9724712869..27727bf22c7 100644
--- a/config/feature_flags/development/merge_ref_auto_sync_lock.yml
+++ b/config/feature_flags/development/merge_ref_auto_sync_lock.yml
@@ -2,6 +2,7 @@
 name: merge_ref_auto_sync_lock
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml b/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
index 1141d1f82a4..60db901d801 100644
--- a/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
+++ b/config/feature_flags/development/merge_request_cached_pipeline_serializer.yml
@@ -1,7 +1,8 @@
 ---
 name: merge_request_cached_pipeline_serializer
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38273
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.5'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/merge_request_draft_filter.yml b/config/feature_flags/development/merge_request_draft_filter.yml
index 6bf3e12d817..ee719f52b7c 100644
--- a/config/feature_flags/development/merge_request_draft_filter.yml
+++ b/config/feature_flags/development/merge_request_draft_filter.yml
@@ -1,7 +1,8 @@
 ---
 name: merge_request_draft_filter
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35942
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '13.3'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/merge_request_rebase_nowait_lock.yml b/config/feature_flags/development/merge_request_rebase_nowait_lock.yml
index 06cbcd3da07..3ea69762c1d 100644
--- a/config/feature_flags/development/merge_request_rebase_nowait_lock.yml
+++ b/config/feature_flags/development/merge_request_rebase_nowait_lock.yml
@@ -2,6 +2,7 @@
 name: merge_request_rebase_nowait_lock
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/merge_request_reviewers.yml b/config/feature_flags/development/merge_request_reviewers.yml
index 2180662b9df..ca9de4af264 100644
--- a/config/feature_flags/development/merge_request_reviewers.yml
+++ b/config/feature_flags/development/merge_request_reviewers.yml
@@ -2,6 +2,7 @@
 name: merge_request_reviewers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190
-group: group::source code
+milestone: '13.4'
 type: development
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/merge_request_widget_graphql.yml b/config/feature_flags/development/merge_request_widget_graphql.yml
index cbe76a61fa5..2969b91039a 100644
--- a/config/feature_flags/development/merge_request_widget_graphql.yml
+++ b/config/feature_flags/development/merge_request_widget_graphql.yml
@@ -1,7 +1,8 @@
 ---
 name: merge_request_widget_graphql
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38311
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '13.3'
 type: development
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/merge_requests.yml b/config/feature_flags/development/merge_requests.yml
index 05e8a301786..27f5f8b1085 100644
--- a/config/feature_flags/development/merge_requests.yml
+++ b/config/feature_flags/development/merge_requests.yml
@@ -2,6 +2,7 @@
 name: merge_requests
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/metrics_dashboard.yml b/config/feature_flags/development/metrics_dashboard.yml
index 04a64b632ba..81eafa74ab4 100644
--- a/config/feature_flags/development/metrics_dashboard.yml
+++ b/config/feature_flags/development/metrics_dashboard.yml
@@ -2,6 +2,7 @@
 name: metrics_dashboard
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29634
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257902
-group: group::health
+milestone: '13.0'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml b/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml
index 3e3a5b9de9a..1fe4c51b6ec 100644
--- a/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml
+++ b/config/feature_flags/development/metrics_dashboard_exhaustive_validations.yml
@@ -2,6 +2,7 @@
 name: metrics_dashboard_exhaustive_validations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40103
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241697
-group: group::apm
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::apm
+default_enabled: false
diff --git a/config/feature_flags/development/migrate_user_mentions.yml b/config/feature_flags/development/migrate_user_mentions.yml
index 5dd5667dfae..df9e5477590 100644
--- a/config/feature_flags/development/migrate_user_mentions.yml
+++ b/config/feature_flags/development/migrate_user_mentions.yml
@@ -2,6 +2,7 @@
 name: migrate_user_mentions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34378
 rollout_issue_url: 
-group: group::project management
+milestone: '13.3'
 type: development
+group: group::project management
 default_enabled: true
diff --git a/config/feature_flags/development/mr_commit_neighbor_nav.yml b/config/feature_flags/development/mr_commit_neighbor_nav.yml
index 7b540e14464..d49dc656858 100644
--- a/config/feature_flags/development/mr_commit_neighbor_nav.yml
+++ b/config/feature_flags/development/mr_commit_neighbor_nav.yml
@@ -1,7 +1,8 @@
 ---
 name: mr_commit_neighbor_nav
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28596
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/multiline_comments.yml b/config/feature_flags/development/multiline_comments.yml
index 135e5be1dc5..dad02bf80fd 100644
--- a/config/feature_flags/development/multiline_comments.yml
+++ b/config/feature_flags/development/multiline_comments.yml
@@ -1,7 +1,8 @@
 ---
 name: multiline_comments
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/211255
-rollout_issue_url:
-group: group::source code
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37114
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/211255
+milestone: '13.2'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/multiple_http_integrations.yml b/config/feature_flags/development/multiple_http_integrations.yml
index c59726c3529..5bd0d4ea038 100644
--- a/config/feature_flags/development/multiple_http_integrations.yml
+++ b/config/feature_flags/development/multiple_http_integrations.yml
@@ -2,6 +2,7 @@
 name: multiple_http_integrations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44485
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255509
+milestone: '13.6'
 type: development
 group: group::health
 default_enabled: false
diff --git a/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml b/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml
index 0102b0dd7cb..efc18603fdc 100644
--- a/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml
+++ b/config/feature_flags/development/multiple_http_integrations_custom_mapping.yml
@@ -2,6 +2,7 @@
 name: multiple_http_integrations_custom_mapping
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46437
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273573
+milestone: '13.6'
 type: development
 group: group::health
 default_enabled: false
diff --git a/config/feature_flags/development/new_pipeline_form.yml b/config/feature_flags/development/new_pipeline_form.yml
index 3c1079a5f5c..4c0ba5af350 100644
--- a/config/feature_flags/development/new_pipeline_form.yml
+++ b/config/feature_flags/development/new_pipeline_form.yml
@@ -2,6 +2,7 @@
 name: new_pipeline_form
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35674
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229632
-group: group::continuous integration
+milestone: '13.2'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml b/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml
index 6b821e7fd9e..3f79783d805 100644
--- a/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml
+++ b/config/feature_flags/development/new_pipeline_form_prefilled_vars.yml
@@ -2,6 +2,7 @@
 name: new_pipeline_form_prefilled_vars
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44120
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263276
+milestone: '13.5'
 type: development
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/new_release_page.yml b/config/feature_flags/development/new_release_page.yml
index b2890b9ebf9..c3f757bfc41 100644
--- a/config/feature_flags/development/new_release_page.yml
+++ b/config/feature_flags/development/new_release_page.yml
@@ -1,7 +1,8 @@
 ---
 name: new_release_page
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35367
-rollout_issue_url:
-group: group::release management
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/not_issuable_queries.yml b/config/feature_flags/development/not_issuable_queries.yml
index a5cfba7980d..80aba0fef0f 100644
--- a/config/feature_flags/development/not_issuable_queries.yml
+++ b/config/feature_flags/development/not_issuable_queries.yml
@@ -1,7 +1,8 @@
 ---
 name: not_issuable_queries
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27639
-rollout_issue_url:
-group: group::project management
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::project management
 default_enabled: true
diff --git a/config/feature_flags/development/notes_create_service_tracking.yml b/config/feature_flags/development/notes_create_service_tracking.yml
index 38636b7ee53..ae9d4ce09c5 100644
--- a/config/feature_flags/development/notes_create_service_tracking.yml
+++ b/config/feature_flags/development/notes_create_service_tracking.yml
@@ -2,6 +2,7 @@
 name: notes_create_service_tracking
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/optimized_issuable_label_filter.yml b/config/feature_flags/development/optimized_issuable_label_filter.yml
index 12db63b03fb..4712cdaf230 100644
--- a/config/feature_flags/development/optimized_issuable_label_filter.yml
+++ b/config/feature_flags/development/optimized_issuable_label_filter.yml
@@ -2,6 +2,7 @@
 name: optimized_issuable_label_filter
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34503
 rollout_issue_url: 
-group: group::analytics
+milestone: '13.4'
 type: development
+group: group::analytics
 default_enabled: false
diff --git a/config/feature_flags/development/optimized_timebox_queries.yml b/config/feature_flags/development/optimized_timebox_queries.yml
index d5301e20f3e..215242046c5 100644
--- a/config/feature_flags/development/optimized_timebox_queries.yml
+++ b/config/feature_flags/development/optimized_timebox_queries.yml
@@ -2,6 +2,7 @@
 name: optimized_timebox_queries
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/pages.yml b/config/feature_flags/development/pages.yml
index 0afdc891e51..b32ab9af770 100644
--- a/config/feature_flags/development/pages.yml
+++ b/config/feature_flags/development/pages.yml
@@ -2,6 +2,7 @@
 name: pages
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/pages_artifacts_archive.yml b/config/feature_flags/development/pages_artifacts_archive.yml
index 5cd4f4bd62b..f58f7199508 100644
--- a/config/feature_flags/development/pages_artifacts_archive.yml
+++ b/config/feature_flags/development/pages_artifacts_archive.yml
@@ -2,6 +2,7 @@
 name: pages_artifacts_archive
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40361
 rollout_issue_url: 
-group: group::release management
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::release management
+default_enabled: false
diff --git a/config/feature_flags/development/paginated_notes.yml b/config/feature_flags/development/paginated_notes.yml
index a9209fbe4ae..67036d693e3 100644
--- a/config/feature_flags/development/paginated_notes.yml
+++ b/config/feature_flags/development/paginated_notes.yml
@@ -2,6 +2,7 @@
 name: paginated_notes
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34628
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254987
-group: group::source code
+milestone: '13.2'
 type: development
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/personal_snippet_reference_filters.yml b/config/feature_flags/development/personal_snippet_reference_filters.yml
index 44b9ac2f862..eb97a2caf0d 100644
--- a/config/feature_flags/development/personal_snippet_reference_filters.yml
+++ b/config/feature_flags/development/personal_snippet_reference_filters.yml
@@ -2,6 +2,7 @@
 name: personal_snippet_reference_filters
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38571
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235155
-group: group::editor
+milestone: '13.3'
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/pg_hint_plan_for_issuables.yml b/config/feature_flags/development/pg_hint_plan_for_issuables.yml
index e49fc14851a..06d20c404c5 100644
--- a/config/feature_flags/development/pg_hint_plan_for_issuables.yml
+++ b/config/feature_flags/development/pg_hint_plan_for_issuables.yml
@@ -2,6 +2,7 @@
 name: pg_hint_plan_for_issuables
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46289
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273528
+milestone: '13.6'
 type: development
 group: group::project planning
 default_enabled: false
diff --git a/config/feature_flags/development/phabricator_import.yml b/config/feature_flags/development/phabricator_import.yml
index 1bce39b65f6..264988e8006 100644
--- a/config/feature_flags/development/phabricator_import.yml
+++ b/config/feature_flags/development/phabricator_import.yml
@@ -2,6 +2,7 @@
 name: phabricator_import
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13569
 rollout_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/1197
-group: group::import
+milestone: '12.0'
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/pipelines_security_report_summary.yml b/config/feature_flags/development/pipelines_security_report_summary.yml
index b9e83bc0795..7b67212269c 100644
--- a/config/feature_flags/development/pipelines_security_report_summary.yml
+++ b/config/feature_flags/development/pipelines_security_report_summary.yml
@@ -2,6 +2,7 @@
 name: pipelines_security_report_summary
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31136
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235943
-group: group::dynamic analysis
+milestone: '13.0'
 type: development
+group: group::dynamic analysis
 default_enabled: false
diff --git a/config/feature_flags/development/product_analytics.yml b/config/feature_flags/development/product_analytics.yml
index 02840f3212b..faed7b5a5d8 100644
--- a/config/feature_flags/development/product_analytics.yml
+++ b/config/feature_flags/development/product_analytics.yml
@@ -1,7 +1,8 @@
 ---
 name: product_analytics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36443
-rollout_issue_url:
-group: group::product analytics
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/product_analytics_aggregated_metrics.yml b/config/feature_flags/development/product_analytics_aggregated_metrics.yml
index b19cad99e93..2ae385f6599 100644
--- a/config/feature_flags/development/product_analytics_aggregated_metrics.yml
+++ b/config/feature_flags/development/product_analytics_aggregated_metrics.yml
@@ -2,6 +2,7 @@
 name: product_analytics_aggregated_metrics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44624
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267550
+milestone: 
 type: development
 group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/prohibit_hexadecimal_branch_names.yml b/config/feature_flags/development/prohibit_hexadecimal_branch_names.yml
index d1977765b81..cf90ccd0f69 100644
--- a/config/feature_flags/development/prohibit_hexadecimal_branch_names.yml
+++ b/config/feature_flags/development/prohibit_hexadecimal_branch_names.yml
@@ -2,6 +2,7 @@
 name: prohibit_hexadecimal_branch_names
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/project_export_as_ndjson.yml b/config/feature_flags/development/project_export_as_ndjson.yml
index f39b892f18a..f77c1979e55 100644
--- a/config/feature_flags/development/project_export_as_ndjson.yml
+++ b/config/feature_flags/development/project_export_as_ndjson.yml
@@ -1,7 +1,8 @@
 ---
 name: project_export_as_ndjson
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26995
-rollout_issue_url:
-group: group::import
+rollout_issue_url: 
+milestone: '12.10'
 type: development
+group: group::import
 default_enabled: true
diff --git a/config/feature_flags/development/project_finder_similarity_sort.yml b/config/feature_flags/development/project_finder_similarity_sort.yml
index 2d29bed82c4..4dadee97fd5 100644
--- a/config/feature_flags/development/project_finder_similarity_sort.yml
+++ b/config/feature_flags/development/project_finder_similarity_sort.yml
@@ -2,6 +2,7 @@
 name: project_finder_similarity_sort
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43136
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263249
+milestone: '13.5'
 type: development
 group: group::threat insights
 default_enabled: false
diff --git a/config/feature_flags/development/project_import_ndjson.yml b/config/feature_flags/development/project_import_ndjson.yml
index 8dc924a97c2..756c6c1aaa5 100644
--- a/config/feature_flags/development/project_import_ndjson.yml
+++ b/config/feature_flags/development/project_import_ndjson.yml
@@ -1,7 +1,8 @@
 ---
 name: project_import_ndjson
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27206
-rollout_issue_url:
-group: group::import
+rollout_issue_url: 
+milestone: '12.10'
 type: development
+group: group::import
 default_enabled: true
diff --git a/config/feature_flags/development/project_list_filter_bar.yml b/config/feature_flags/development/project_list_filter_bar.yml
index 6040fe9edf5..7f8ea867990 100644
--- a/config/feature_flags/development/project_list_filter_bar.yml
+++ b/config/feature_flags/development/project_list_filter_bar.yml
@@ -2,6 +2,7 @@
 name: project_list_filter_bar
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/project_statistics_sync.yml b/config/feature_flags/development/project_statistics_sync.yml
index ece3f1e49df..188e953f780 100644
--- a/config/feature_flags/development/project_statistics_sync.yml
+++ b/config/feature_flags/development/project_statistics_sync.yml
@@ -2,6 +2,7 @@
 name: project_statistics_sync
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/project_transactionless_destroy.yml b/config/feature_flags/development/project_transactionless_destroy.yml
index 726875655e9..d51db437356 100644
--- a/config/feature_flags/development/project_transactionless_destroy.yml
+++ b/config/feature_flags/development/project_transactionless_destroy.yml
@@ -2,6 +2,7 @@
 name: project_transactionless_destroy
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39367
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255972
-group: group::continuous integration
+milestone: '13.4'
 type: development
+group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/development/projects_tokens_optional_encryption.yml b/config/feature_flags/development/projects_tokens_optional_encryption.yml
index 76d76bca923..3d6f7905ef9 100644
--- a/config/feature_flags/development/projects_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/projects_tokens_optional_encryption.yml
@@ -2,6 +2,7 @@
 name: projects_tokens_optional_encryption
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/prometheus_computed_alerts.yml b/config/feature_flags/development/prometheus_computed_alerts.yml
index 576894df589..428a99c1c1e 100644
--- a/config/feature_flags/development/prometheus_computed_alerts.yml
+++ b/config/feature_flags/development/prometheus_computed_alerts.yml
@@ -2,6 +2,7 @@
 name: prometheus_computed_alerts
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13443
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255304
-group: group::health
+milestone: '12.0'
 type: development
+group: group::health
 default_enabled: false
diff --git a/config/feature_flags/development/reactive_caching_limit_environment.yml b/config/feature_flags/development/reactive_caching_limit_environment.yml
index 0020c57e1b8..2569f51eaad 100644
--- a/config/feature_flags/development/reactive_caching_limit_environment.yml
+++ b/config/feature_flags/development/reactive_caching_limit_environment.yml
@@ -2,6 +2,7 @@
 name: reactive_caching_limit_environment
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34202
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/202633
-group: group::configure
+milestone: '13.2'
 type: development
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/development/real_time_issue_sidebar.yml b/config/feature_flags/development/real_time_issue_sidebar.yml
index 37284b2642c..4fe8e19213a 100644
--- a/config/feature_flags/development/real_time_issue_sidebar.yml
+++ b/config/feature_flags/development/real_time_issue_sidebar.yml
@@ -2,6 +2,7 @@
 name: real_time_issue_sidebar
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30239
 rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1210
-group: group::project management
+milestone: '13.0'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/rebalance_issues.yml b/config/feature_flags/development/rebalance_issues.yml
index df04da8c8d3..5b2a4c2437b 100644
--- a/config/feature_flags/development/rebalance_issues.yml
+++ b/config/feature_flags/development/rebalance_issues.yml
@@ -1,7 +1,8 @@
 ---
 name: rebalance_issues
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40124 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40124
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239344
-group: group::project management
+milestone: '13.4'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/recursive_approach_for_all_projects.yml b/config/feature_flags/development/recursive_approach_for_all_projects.yml
index 10c51419d6a..1d3b7e70919 100644
--- a/config/feature_flags/development/recursive_approach_for_all_projects.yml
+++ b/config/feature_flags/development/recursive_approach_for_all_projects.yml
@@ -2,6 +2,7 @@
 name: recursive_approach_for_all_projects
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44740
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263442
+milestone: '13.5'
 type: development
 group: group::fulfillment
 default_enabled: false
diff --git a/config/feature_flags/development/release_evidence.yml b/config/feature_flags/development/release_evidence.yml
index c2f7ab16332..87648e6a261 100644
--- a/config/feature_flags/development/release_evidence.yml
+++ b/config/feature_flags/development/release_evidence.yml
@@ -2,6 +2,7 @@
 name: release_evidence
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26509
 rollout_issue_url: 
-group: group::release management
+milestone: '12.10'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/release_mr_issue_urls.yml b/config/feature_flags/development/release_mr_issue_urls.yml
index 0f68ec1946a..b017a716b51 100644
--- a/config/feature_flags/development/release_mr_issue_urls.yml
+++ b/config/feature_flags/development/release_mr_issue_urls.yml
@@ -2,6 +2,7 @@
 name: release_mr_issue_urls
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18727
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276619
-group: group::release management
+milestone: '12.4'
 type: development
+group: group::release management
 default_enabled: true
diff --git a/config/feature_flags/development/remove_legacy_github_client.yml b/config/feature_flags/development/remove_legacy_github_client.yml
index ecb8e103949..63e4704bba7 100644
--- a/config/feature_flags/development/remove_legacy_github_client.yml
+++ b/config/feature_flags/development/remove_legacy_github_client.yml
@@ -1,7 +1,8 @@
 ---
 name: remove_legacy_github_client
-introduced_by_url:
-rollout_issue_url:
-group: group::import
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/remove_resolve_note.yml b/config/feature_flags/development/remove_resolve_note.yml
index c9f01c7f968..540e3412aac 100644
--- a/config/feature_flags/development/remove_resolve_note.yml
+++ b/config/feature_flags/development/remove_resolve_note.yml
@@ -1,7 +1,8 @@
 ---
 name: remove_resolve_note
-introduced_by_url:
-rollout_issue_url:
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
 group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/repack_after_shard_migration.yml b/config/feature_flags/development/repack_after_shard_migration.yml
index 18663a4e7af..15b7a3e67b0 100644
--- a/config/feature_flags/development/repack_after_shard_migration.yml
+++ b/config/feature_flags/development/repack_after_shard_migration.yml
@@ -2,6 +2,7 @@
 name: repack_after_shard_migration
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21502
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/195597
-group: group::source code
+milestone: '12.6'
 type: development
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/repository.yml b/config/feature_flags/development/repository.yml
index 2ae4abc42bc..a9dd6cbdcb5 100644
--- a/config/feature_flags/development/repository.yml
+++ b/config/feature_flags/development/repository.yml
@@ -2,6 +2,7 @@
 name: repository
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/repository_archive_hotlinking_interception.yml b/config/feature_flags/development/repository_archive_hotlinking_interception.yml
index bc9efb2e4bc..6b684e5a8c7 100644
--- a/config/feature_flags/development/repository_archive_hotlinking_interception.yml
+++ b/config/feature_flags/development/repository_archive_hotlinking_interception.yml
@@ -2,6 +2,7 @@
 name: repository_archive_hotlinking_interception
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/resource_access_token_feature.yml b/config/feature_flags/development/resource_access_token_feature.yml
index 3552b4ee69c..536502b7ca0 100644
--- a/config/feature_flags/development/resource_access_token_feature.yml
+++ b/config/feature_flags/development/resource_access_token_feature.yml
@@ -2,6 +2,7 @@
 name: resource_access_token_feature
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29622
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235765
-group: group::access
+milestone: '13.0'
 type: development
+group: group::access
 default_enabled: true
diff --git a/config/feature_flags/development/rugged_commit_is_ancestor.yml b/config/feature_flags/development/rugged_commit_is_ancestor.yml
index 06f894b79b3..bf909974f7c 100644
--- a/config/feature_flags/development/rugged_commit_is_ancestor.yml
+++ b/config/feature_flags/development/rugged_commit_is_ancestor.yml
@@ -2,6 +2,7 @@
 name: rugged_commit_is_ancestor
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/rugged_commit_tree_entry.yml b/config/feature_flags/development/rugged_commit_tree_entry.yml
index a0cb28e6ca9..36d44a1270b 100644
--- a/config/feature_flags/development/rugged_commit_tree_entry.yml
+++ b/config/feature_flags/development/rugged_commit_tree_entry.yml
@@ -2,6 +2,7 @@
 name: rugged_commit_tree_entry
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/rugged_find_commit.yml b/config/feature_flags/development/rugged_find_commit.yml
index b84e056d9f5..723cad3f88a 100644
--- a/config/feature_flags/development/rugged_find_commit.yml
+++ b/config/feature_flags/development/rugged_find_commit.yml
@@ -2,6 +2,7 @@
 name: rugged_find_commit
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/rugged_list_commits_by_oid.yml b/config/feature_flags/development/rugged_list_commits_by_oid.yml
index 10093f2977f..0498c3020ec 100644
--- a/config/feature_flags/development/rugged_list_commits_by_oid.yml
+++ b/config/feature_flags/development/rugged_list_commits_by_oid.yml
@@ -2,6 +2,7 @@
 name: rugged_list_commits_by_oid
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/rugged_tree_entries.yml b/config/feature_flags/development/rugged_tree_entries.yml
index 6ef296c43a6..b00f8bed00f 100644
--- a/config/feature_flags/development/rugged_tree_entries.yml
+++ b/config/feature_flags/development/rugged_tree_entries.yml
@@ -2,6 +2,7 @@
 name: rugged_tree_entries
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/rugged_tree_entry.yml b/config/feature_flags/development/rugged_tree_entry.yml
index 8ae0a71960b..a78d6ffd21f 100644
--- a/config/feature_flags/development/rugged_tree_entry.yml
+++ b/config/feature_flags/development/rugged_tree_entry.yml
@@ -2,6 +2,7 @@
 name: rugged_tree_entry
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/saml_group_links.yml b/config/feature_flags/development/saml_group_links.yml
index 84c3c73882f..cb02b426b29 100644
--- a/config/feature_flags/development/saml_group_links.yml
+++ b/config/feature_flags/development/saml_group_links.yml
@@ -2,6 +2,7 @@
 name: saml_group_links
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45080
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267020
+milestone: '13.6'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/save_raw_usage_data.yml b/config/feature_flags/development/save_raw_usage_data.yml
index b3c65c12e2d..44820fe2f53 100644
--- a/config/feature_flags/development/save_raw_usage_data.yml
+++ b/config/feature_flags/development/save_raw_usage_data.yml
@@ -1,7 +1,8 @@
 ---
 name: save_raw_usage_data
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38457
-rollout_issue_url:
-group: group::product analytics
+rollout_issue_url: 
+milestone: '13.3'
 type: development
+group: group::product analytics
 default_enabled: false
diff --git a/config/feature_flags/development/schema_linting.yml b/config/feature_flags/development/schema_linting.yml
index 3722f1dd97f..6c1cbdb5248 100644
--- a/config/feature_flags/development/schema_linting.yml
+++ b/config/feature_flags/development/schema_linting.yml
@@ -2,6 +2,7 @@
 name: schema_linting
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35838
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255919
-group: group::editor
+milestone: '13.2'
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/search_track_unique_users.yml b/config/feature_flags/development/search_track_unique_users.yml
index a5d4940c96a..641636fd955 100644
--- a/config/feature_flags/development/search_track_unique_users.yml
+++ b/config/feature_flags/development/search_track_unique_users.yml
@@ -2,6 +2,7 @@
 name: search_track_unique_users
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40134
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240906
-group: group::global search
+milestone: '13.4'
 type: development
+group: group::global search
 default_enabled: true
diff --git a/config/feature_flags/development/security_auto_fix.yml b/config/feature_flags/development/security_auto_fix.yml
index b97220a1059..f547ec72dd1 100644
--- a/config/feature_flags/development/security_auto_fix.yml
+++ b/config/feature_flags/development/security_auto_fix.yml
@@ -1,7 +1,8 @@
 ---
 name: security_auto_fix
-introduced_by_url:
-rollout_issue_url:
-group: group::composition analysis
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::composition analysis
 default_enabled: false
diff --git a/config/feature_flags/development/security_on_demand_scans_site_validation.yml b/config/feature_flags/development/security_on_demand_scans_site_validation.yml
index 27ec926d9ac..9085c22b773 100644
--- a/config/feature_flags/development/security_on_demand_scans_site_validation.yml
+++ b/config/feature_flags/development/security_on_demand_scans_site_validation.yml
@@ -2,6 +2,7 @@
 name: security_on_demand_scans_site_validation
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40685
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241815
-group: group::dynamic analysis
+milestone: '13.4'
 type: development
+group: group::dynamic analysis
 default_enabled: false
diff --git a/config/feature_flags/development/serverless_domain.yml b/config/feature_flags/development/serverless_domain.yml
index f4821e5a14c..67b2c6b8e1a 100644
--- a/config/feature_flags/development/serverless_domain.yml
+++ b/config/feature_flags/development/serverless_domain.yml
@@ -2,6 +2,7 @@
 name: serverless_domain
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21222
 rollout_issue_url: 
-group: group::configure
+milestone: '12.8'
 type: development
+group: group::configure
 default_enabled: false
diff --git a/config/feature_flags/development/service_desk_custom_address.yml b/config/feature_flags/development/service_desk_custom_address.yml
index 13a9ef6f37a..8b248da00cd 100644
--- a/config/feature_flags/development/service_desk_custom_address.yml
+++ b/config/feature_flags/development/service_desk_custom_address.yml
@@ -2,6 +2,7 @@
 name: service_desk_custom_address
 introduced_by_url: 
 rollout_issue_url: 
-group: group::certify
+milestone: 
 type: development
+group: group::certify
 default_enabled: false
diff --git a/config/feature_flags/development/settings_operations_prometheus_service.yml b/config/feature_flags/development/settings_operations_prometheus_service.yml
index 1a4815a3fb9..3b2fea80a2d 100644
--- a/config/feature_flags/development/settings_operations_prometheus_service.yml
+++ b/config/feature_flags/development/settings_operations_prometheus_service.yml
@@ -2,6 +2,7 @@
 name: settings_operations_prometheus_service
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24296
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258560
-group: group::health
+milestone: '12.8'
 type: development
+group: group::health
 default_enabled: false
diff --git a/config/feature_flags/development/show_author_on_note.yml b/config/feature_flags/development/show_author_on_note.yml
index 1f67392a306..7775bf5f27f 100644
--- a/config/feature_flags/development/show_author_on_note.yml
+++ b/config/feature_flags/development/show_author_on_note.yml
@@ -2,6 +2,7 @@
 name: show_author_on_note
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40198
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/250282
-group: group::project management
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/show_inherited_labels.yml b/config/feature_flags/development/show_inherited_labels.yml
index 73ceb07002c..1ee1daaf0af 100644
--- a/config/feature_flags/development/show_inherited_labels.yml
+++ b/config/feature_flags/development/show_inherited_labels.yml
@@ -2,6 +2,7 @@
 name: show_inherited_labels
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42960
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267547
-group: group::project management
+milestone: '13.5'
 type: development
+group: group::project management
 default_enabled: true
diff --git a/config/feature_flags/development/similarity_search.yml b/config/feature_flags/development/similarity_search.yml
index f99e80b5cc7..312ab767eb0 100644
--- a/config/feature_flags/development/similarity_search.yml
+++ b/config/feature_flags/development/similarity_search.yml
@@ -2,6 +2,7 @@
 name: similarity_search
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37300/
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38675
-group: group::analytics
+milestone: '13.3'
 type: development
+group: group::analytics
 default_enabled: true
diff --git a/config/feature_flags/development/snippet_spam.yml b/config/feature_flags/development/snippet_spam.yml
index 8215766fd3f..299a69fd68d 100644
--- a/config/feature_flags/development/snippet_spam.yml
+++ b/config/feature_flags/development/snippet_spam.yml
@@ -2,6 +2,7 @@
 name: snippet_spam
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44010
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262013
+milestone: '13.5'
 type: development
 group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/snippets.yml b/config/feature_flags/development/snippets.yml
index 14f37feaa3f..ee06c54e237 100644
--- a/config/feature_flags/development/snippets.yml
+++ b/config/feature_flags/development/snippets.yml
@@ -2,6 +2,7 @@
 name: snippets
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/snippets_binary_blob.yml b/config/feature_flags/development/snippets_binary_blob.yml
index 6ab05b096ba..665bd1cbb60 100644
--- a/config/feature_flags/development/snippets_binary_blob.yml
+++ b/config/feature_flags/development/snippets_binary_blob.yml
@@ -1,7 +1,8 @@
 ---
 name: snippets_binary_blob
-introduced_by_url:
-rollout_issue_url:
-group: group::editor
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/soft_email_confirmation.yml b/config/feature_flags/development/soft_email_confirmation.yml
index ee951d84ed8..b36b9533dc6 100644
--- a/config/feature_flags/development/soft_email_confirmation.yml
+++ b/config/feature_flags/development/soft_email_confirmation.yml
@@ -1,7 +1,8 @@
 ---
 name: soft_email_confirmation
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31245
-rollout_issue_url:
-group: group::acquisition
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/development/specialized_project_authorization_project_share_worker.yml b/config/feature_flags/development/specialized_project_authorization_project_share_worker.yml
index 951ea4b315f..95ec7eff713 100644
--- a/config/feature_flags/development/specialized_project_authorization_project_share_worker.yml
+++ b/config/feature_flags/development/specialized_project_authorization_project_share_worker.yml
@@ -1,7 +1,8 @@
 ---
 name: specialized_project_authorization_project_share_worker
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32864
-rollout_issue_url:
-group: group::access
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/specialized_project_authorization_workers.yml b/config/feature_flags/development/specialized_project_authorization_workers.yml
index 48372cac765..f3dbf09af14 100644
--- a/config/feature_flags/development/specialized_project_authorization_workers.yml
+++ b/config/feature_flags/development/specialized_project_authorization_workers.yml
@@ -1,7 +1,8 @@
 ---
 name: specialized_project_authorization_workers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31377
-rollout_issue_url:
-group: group::access
+rollout_issue_url: 
+milestone: '13.0'
 type: development
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/squash_options.yml b/config/feature_flags/development/squash_options.yml
index 9ba5129b9a3..778700b2338 100644
--- a/config/feature_flags/development/squash_options.yml
+++ b/config/feature_flags/development/squash_options.yml
@@ -2,6 +2,7 @@
 name: squash_options
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/sse_image_uploads.yml b/config/feature_flags/development/sse_image_uploads.yml
index 469af524c87..543dcc16b2f 100644
--- a/config/feature_flags/development/sse_image_uploads.yml
+++ b/config/feature_flags/development/sse_image_uploads.yml
@@ -2,6 +2,7 @@
 name: sse_image_uploads
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/startup_css.yml b/config/feature_flags/development/startup_css.yml
index c87b2abc9a5..88a1cd77c95 100644
--- a/config/feature_flags/development/startup_css.yml
+++ b/config/feature_flags/development/startup_css.yml
@@ -2,6 +2,7 @@
 name: startup_css
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39713
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238718
-group: group::editor
+milestone: '13.3'
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/suggest_pipeline.yml b/config/feature_flags/development/suggest_pipeline.yml
index afc2f2b7452..69c14e24303 100644
--- a/config/feature_flags/development/suggest_pipeline.yml
+++ b/config/feature_flags/development/suggest_pipeline.yml
@@ -2,6 +2,7 @@
 name: suggest_pipeline
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45926
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267492
+milestone: '13.6'
 type: development
 group: group::expansion
 default_enabled: true
diff --git a/config/feature_flags/development/sync_metrics_dashboards.yml b/config/feature_flags/development/sync_metrics_dashboards.yml
index 2dd8964121a..84dc6bdb41e 100644
--- a/config/feature_flags/development/sync_metrics_dashboards.yml
+++ b/config/feature_flags/development/sync_metrics_dashboards.yml
@@ -2,6 +2,7 @@
 name: sync_metrics_dashboards
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39658
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241793
-group: group::apm
+milestone: '13.5'
 type: development
+group: group::apm
 default_enabled: false
diff --git a/config/feature_flags/development/test_failure_history.yml b/config/feature_flags/development/test_failure_history.yml
index a2b8b4c99ef..4a0424aae9e 100644
--- a/config/feature_flags/development/test_failure_history.yml
+++ b/config/feature_flags/development/test_failure_history.yml
@@ -2,6 +2,7 @@
 name: test_failure_history
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45027
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268249
+milestone: '13.6'
 type: development
 group: group::testing
 default_enabled: false
diff --git a/config/feature_flags/development/track_editor_edit_actions.yml b/config/feature_flags/development/track_editor_edit_actions.yml
index a0a1a3ea873..d73307231a2 100644
--- a/config/feature_flags/development/track_editor_edit_actions.yml
+++ b/config/feature_flags/development/track_editor_edit_actions.yml
@@ -2,6 +2,7 @@
 name: track_editor_edit_actions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39694
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240928
-group: group::editor
+milestone: '13.4'
 type: development
+group: group::editor
 default_enabled: true
diff --git a/config/feature_flags/development/track_issue_activity_actions.yml b/config/feature_flags/development/track_issue_activity_actions.yml
index f80831e1b35..c755dac8e75 100644
--- a/config/feature_flags/development/track_issue_activity_actions.yml
+++ b/config/feature_flags/development/track_issue_activity_actions.yml
@@ -1,7 +1,8 @@
 ---
 name: track_issue_activity_actions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40904
-rollout_issue_url:
-group: group::project management
+rollout_issue_url: 
+milestone: '13.4'
 type: development
+group: group::project management
 default_enabled: true
diff --git a/config/feature_flags/development/track_unique_test_cases_parsed.yml b/config/feature_flags/development/track_unique_test_cases_parsed.yml
index 98ae38e1cb0..9251de12202 100644
--- a/config/feature_flags/development/track_unique_test_cases_parsed.yml
+++ b/config/feature_flags/development/track_unique_test_cases_parsed.yml
@@ -1,7 +1,8 @@
 ---
 name: track_unique_test_cases_parsed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41918
-rollout_issue_url:
-group: group::testing
+rollout_issue_url: 
+milestone: '13.5'
 type: development
+group: group::testing
 default_enabled: false
diff --git a/config/feature_flags/development/track_unique_visits.yml b/config/feature_flags/development/track_unique_visits.yml
index 10f78a32492..80d969cc65b 100644
--- a/config/feature_flags/development/track_unique_visits.yml
+++ b/config/feature_flags/development/track_unique_visits.yml
@@ -2,6 +2,7 @@
 name: track_unique_visits
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33146
 rollout_issue_url: 
-group: group::analytics
+milestone: '13.2'
 type: development
+group: group::analytics
 default_enabled: true
diff --git a/config/feature_flags/development/track_unique_wiki_page_views.yml b/config/feature_flags/development/track_unique_wiki_page_views.yml
index 0e8120635ab..eb2bf1304d9 100644
--- a/config/feature_flags/development/track_unique_wiki_page_views.yml
+++ b/config/feature_flags/development/track_unique_wiki_page_views.yml
@@ -2,6 +2,7 @@
 name: track_unique_wiki_page_views
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44622
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267162
+milestone: '13.5'
 type: development
 group: group::knowledge
 default_enabled: true
diff --git a/config/feature_flags/development/tribute_autocomplete.yml b/config/feature_flags/development/tribute_autocomplete.yml
index 94cfc00c467..47fbd11f844 100644
--- a/config/feature_flags/development/tribute_autocomplete.yml
+++ b/config/feature_flags/development/tribute_autocomplete.yml
@@ -1,7 +1,8 @@
 ---
 name: tribute_autocomplete
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32671
-rollout_issue_url:
-group: group::project management
+rollout_issue_url: 
+milestone: '13.2'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/two_factor_for_cli.yml b/config/feature_flags/development/two_factor_for_cli.yml
index f75264451e0..e442bb035cf 100644
--- a/config/feature_flags/development/two_factor_for_cli.yml
+++ b/config/feature_flags/development/two_factor_for_cli.yml
@@ -2,6 +2,7 @@
 name: two_factor_for_cli
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39703
 rollout_issue_url: 
+milestone: '13.5'
 type: development
 group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/unified_diff_lines.yml b/config/feature_flags/development/unified_diff_lines.yml
index d580ef65104..e295893acc4 100644
--- a/config/feature_flags/development/unified_diff_lines.yml
+++ b/config/feature_flags/development/unified_diff_lines.yml
@@ -2,6 +2,7 @@
 name: unified_diff_lines
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40131
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241188
-group: group::source code
+milestone: '13.4'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml b/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml
index bfe3356cb8e..986f002aa1d 100644
--- a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml
+++ b/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml
@@ -2,6 +2,7 @@
 name: unlink_fork_network_upon_visibility_decrease
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/upload_middleware_jwt_params_handler.yml b/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
index 1c3545cb728..60a68005235 100644
--- a/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
+++ b/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
@@ -2,6 +2,7 @@
 name: upload_middleware_jwt_params_handler
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33277
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233895
-group: group::package
+milestone: '13.4'
 type: development
+group: group::package
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml b/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
index 8b2e8063164..1daf82b4b8a 100644
--- a/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
+++ b/config/feature_flags/development/usage_data_a_compliance_audit_events_api.yml
@@ -2,6 +2,7 @@
 name: usage_data_a_compliance_audit_events_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41689
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233786
-group: group::compliance
+milestone: '13.4'
 type: development
+group: group::compliance
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_api.yml b/config/feature_flags/development/usage_data_api.yml
index 5c8e918521d..9ba8180eb5a 100644
--- a/config/feature_flags/development/usage_data_api.yml
+++ b/config/feature_flags/development/usage_data_api.yml
@@ -2,6 +2,7 @@
 name: usage_data_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41301
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267114
-group: group::product analytics
+milestone: '13.4'
 type: development
+group: group::product analytics
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_g_compliance_dashboard.yml b/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
index 24d6f81740b..fcef95c2b01 100644
--- a/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
+++ b/config/feature_flags/development/usage_data_g_compliance_dashboard.yml
@@ -1,7 +1,8 @@
 ---
 name: usage_data_g_compliance_dashboard
-introduced_by_url:
-rollout_issue_url:
-group: group::compliance
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::compliance
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml b/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml
index 15ce7194264..5e4eb0d61af 100644
--- a/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml
+++ b/config/feature_flags/development/usage_data_i_source_code_code_intelligence.yml
@@ -1,7 +1,8 @@
 ---
 name: usage_data_i_source_code_code_intelligence
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41881
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '13.4'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml b/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml
index 095010da56b..e6e3cd09c28 100644
--- a/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml
+++ b/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml
@@ -1,7 +1,8 @@
 ---
 name: usage_data_i_testing_test_case_parsed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41918
-rollout_issue_url:
-group: group::testing
+rollout_issue_url: 
+milestone: '13.5'
 type: development
+group: group::testing
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
index a50a3eafa1a..c3e59a0c323 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_alert_assigned
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
index 957e316e153..c858de35d56 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_alert_status_changed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
index 5e64899978a..198289db02d 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_alert_todo
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
index a582a44a3e2..1b5b2d1f8a0 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_assigned
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
index ad482676132..9eff79d3d4a 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_change_confidential
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
index 943b7a83e5e..1e857525d06 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_closed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
index 5d173e1e869..c562501fdad 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_comment
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_created.yml b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
index 86e47d54d18..d6c4a082714 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_created.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_created
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
index 84ba0d34cc7..d9a9f9f5e5e 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_relate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
index ed71d353cfe..1cc30a4683e 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_reopened
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
index aa400fb4455..414f47e1137 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_todo
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
index 5798331175e..a09b8bf2f3f 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_unrelate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
index 921c466a167..7d3a9bbff39 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
@@ -2,6 +2,7 @@
 name: usage_data_incident_management_incident_zoom_meeting
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: group::health
+milestone: '13.4'
 type: development
+group: group::health
 default_enabled: true
diff --git a/config/feature_flags/development/use_workhorse_s3_client.yml b/config/feature_flags/development/use_workhorse_s3_client.yml
index dd152996c0c..8f9d2bdcc87 100644
--- a/config/feature_flags/development/use_workhorse_s3_client.yml
+++ b/config/feature_flags/development/use_workhorse_s3_client.yml
@@ -2,6 +2,7 @@
 name: use_workhorse_s3_client
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/user_group_counts.yml b/config/feature_flags/development/user_group_counts.yml
index a4edb5f5c92..98798ea3ead 100644
--- a/config/feature_flags/development/user_group_counts.yml
+++ b/config/feature_flags/development/user_group_counts.yml
@@ -1,7 +1,8 @@
 ---
 name: user_group_counts
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44069/
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.6'
 type: development
 group: group::compliance
 default_enabled: false
diff --git a/config/feature_flags/development/user_mode_in_session.yml b/config/feature_flags/development/user_mode_in_session.yml
index 2a373ece4f4..a3c4d44e4ce 100644
--- a/config/feature_flags/development/user_mode_in_session.yml
+++ b/config/feature_flags/development/user_mode_in_session.yml
@@ -2,6 +2,7 @@
 name: user_mode_in_session
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml
index a63f229f903..eaeb7f17794 100644
--- a/config/feature_flags/development/user_time_settings.yml
+++ b/config/feature_flags/development/user_time_settings.yml
@@ -2,6 +2,7 @@
 name: user_time_settings
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/validate_import_decompressed_archive_size.yml b/config/feature_flags/development/validate_import_decompressed_archive_size.yml
index 3e575657a78..644a936a67c 100644
--- a/config/feature_flags/development/validate_import_decompressed_archive_size.yml
+++ b/config/feature_flags/development/validate_import_decompressed_archive_size.yml
@@ -1,7 +1,8 @@
 ---
 name: validate_import_decompressed_archive_size
-introduced_by_url:
-rollout_issue_url:
-group: group::import
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/view_diffs_file_by_file.yml b/config/feature_flags/development/view_diffs_file_by_file.yml
index 2ac8a7c3087..1af945bf30b 100644
--- a/config/feature_flags/development/view_diffs_file_by_file.yml
+++ b/config/feature_flags/development/view_diffs_file_by_file.yml
@@ -2,6 +2,7 @@
 name: view_diffs_file_by_file
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35223
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229848
-group: group::source code
+milestone: '13.2'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/vue_group_members_list.yml b/config/feature_flags/development/vue_group_members_list.yml
index c5a5ad638e4..4125968fd51 100644
--- a/config/feature_flags/development/vue_group_members_list.yml
+++ b/config/feature_flags/development/vue_group_members_list.yml
@@ -2,6 +2,7 @@
 name: vue_group_members_list
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40548
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241194
-group: group::access
+milestone: '13.4'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/vue_issuable_sidebar.yml b/config/feature_flags/development/vue_issuable_sidebar.yml
index 01c8bc3460b..47c17db1206 100644
--- a/config/feature_flags/development/vue_issuable_sidebar.yml
+++ b/config/feature_flags/development/vue_issuable_sidebar.yml
@@ -1,7 +1,8 @@
 ---
 name: vue_issuable_sidebar
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18199
-rollout_issue_url:
-group: group::project management
+rollout_issue_url: 
+milestone: '12.4'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/vue_issuables_list.yml b/config/feature_flags/development/vue_issuables_list.yml
index 5fe5c7e3e9f..75ef82999ca 100644
--- a/config/feature_flags/development/vue_issuables_list.yml
+++ b/config/feature_flags/development/vue_issuables_list.yml
@@ -2,6 +2,7 @@
 name: vue_issuables_list
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/15091
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/208093
-group: group::project management
+milestone: '12.5'
 type: development
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/vue_issue_header.yml b/config/feature_flags/development/vue_issue_header.yml
index 58078702d50..bd2ee80428e 100644
--- a/config/feature_flags/development/vue_issue_header.yml
+++ b/config/feature_flags/development/vue_issue_header.yml
@@ -1,7 +1,8 @@
 ---
 name: vue_issue_header
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44440
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.6'
 type: development
 group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/web_ide_primary_edit.yml b/config/feature_flags/development/web_ide_primary_edit.yml
index 33e3db0322b..5a609ae1d88 100644
--- a/config/feature_flags/development/web_ide_primary_edit.yml
+++ b/config/feature_flags/development/web_ide_primary_edit.yml
@@ -2,6 +2,7 @@
 name: web_ide_primary_edit
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35957
 rollout_issue_url: 
-group: group::editor
+milestone: '13.3'
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/webauthn.yml b/config/feature_flags/development/webauthn.yml
index 7b360e884ae..7d09c80c5dc 100644
--- a/config/feature_flags/development/webauthn.yml
+++ b/config/feature_flags/development/webauthn.yml
@@ -2,6 +2,7 @@
 name: webauthn
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/webperf_experiment.yml b/config/feature_flags/development/webperf_experiment.yml
index 16f1f0ac773..50408df0555 100644
--- a/config/feature_flags/development/webperf_experiment.yml
+++ b/config/feature_flags/development/webperf_experiment.yml
@@ -1,7 +1,8 @@
 ---
 name: webperf_experiment
-introduced_by_url:
-rollout_issue_url:
-group: group::editor
+introduced_by_url: 
+rollout_issue_url: 
+milestone: 
 type: development
+group: group::editor
 default_enabled: false
diff --git a/config/feature_flags/development/whats_new_drawer.yml b/config/feature_flags/development/whats_new_drawer.yml
index d6b7ffbbb57..c06dfbe1fe6 100644
--- a/config/feature_flags/development/whats_new_drawer.yml
+++ b/config/feature_flags/development/whats_new_drawer.yml
@@ -2,6 +2,7 @@
 name: whats_new_drawer
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38975
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254186
-group: group::retention
+milestone: '13.3'
 type: development
+group: group::retention
 default_enabled: false
diff --git a/config/feature_flags/development/widget_visibility_polling.yml b/config/feature_flags/development/widget_visibility_polling.yml
index 711d4be2fd1..4cab4a73f8b 100644
--- a/config/feature_flags/development/widget_visibility_polling.yml
+++ b/config/feature_flags/development/widget_visibility_polling.yml
@@ -1,7 +1,8 @@
 ---
 name: widget_visibility_polling
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29318
-rollout_issue_url:
-group: group::source code
+rollout_issue_url: 
+milestone: '12.10'
 type: development
+group: group::source code
 default_enabled: true
diff --git a/config/feature_flags/development/wiki.yml b/config/feature_flags/development/wiki.yml
index 9f36fd7c6aa..5904e6838f3 100644
--- a/config/feature_flags/development/wiki.yml
+++ b/config/feature_flags/development/wiki.yml
@@ -2,6 +2,7 @@
 name: wiki
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: true
diff --git a/config/feature_flags/development/wiki_front_matter.yml b/config/feature_flags/development/wiki_front_matter.yml
index 6b388aaa5d2..66add349c44 100644
--- a/config/feature_flags/development/wiki_front_matter.yml
+++ b/config/feature_flags/development/wiki_front_matter.yml
@@ -2,6 +2,7 @@
 name: wiki_front_matter
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/workhorse_archive_cache_disabled.yml b/config/feature_flags/development/workhorse_archive_cache_disabled.yml
index b708d21ad89..e7871d9062b 100644
--- a/config/feature_flags/development/workhorse_archive_cache_disabled.yml
+++ b/config/feature_flags/development/workhorse_archive_cache_disabled.yml
@@ -2,6 +2,7 @@
 name: workhorse_archive_cache_disabled
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: development
+group: 
 default_enabled: false
diff --git a/config/feature_flags/development/zip_pages_deployments.yml b/config/feature_flags/development/zip_pages_deployments.yml
index 3bafc2aae14..8be5fd002dd 100644
--- a/config/feature_flags/development/zip_pages_deployments.yml
+++ b/config/feature_flags/development/zip_pages_deployments.yml
@@ -2,6 +2,7 @@
 name: zip_pages_deployments
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42834
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245308
-group: group::release management
+milestone: '13.5'
 type: development
-default_enabled: false
\ No newline at end of file
+group: group::release management
+default_enabled: false
diff --git a/config/feature_flags/ops/api_kaminari_count_with_limit.yml b/config/feature_flags/ops/api_kaminari_count_with_limit.yml
index 1fdeaa53b83..78d4a55ddb9 100644
--- a/config/feature_flags/ops/api_kaminari_count_with_limit.yml
+++ b/config/feature_flags/ops/api_kaminari_count_with_limit.yml
@@ -1,7 +1,8 @@
 ---
 name: api_kaminari_count_with_limit
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931
-rollout_issue_url:
-group: group::ecosystem
+rollout_issue_url: 
+milestone: 
 type: ops
+group: group::ecosystem
 default_enabled: false
diff --git a/config/feature_flags/ops/ci_accept_trace.yml b/config/feature_flags/ops/ci_accept_trace.yml
index 8671f42c3c1..2574e12f4f2 100644
--- a/config/feature_flags/ops/ci_accept_trace.yml
+++ b/config/feature_flags/ops/ci_accept_trace.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_accept_trace
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304
-rollout_issue_url:
-group: group::continuous integration
+rollout_issue_url: 
+milestone: '13.4'
 type: ops
+group: group::continuous integration
 default_enabled: true
diff --git a/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml b/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml
index f5e8bbae258..2deb3f42995 100644
--- a/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml
+++ b/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml
@@ -1,7 +1,8 @@
 ---
 name: ci_trace_log_invalid_chunks
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44409
-rollout_issue_url:
+rollout_issue_url: 
+milestone: '13.5'
 type: ops
 group: group::continuous integration
 default_enabled: false
diff --git a/config/feature_flags/ops/ci_trace_overwrite.yml b/config/feature_flags/ops/ci_trace_overwrite.yml
index 7996b957262..36caa9f6134 100644
--- a/config/feature_flags/ops/ci_trace_overwrite.yml
+++ b/config/feature_flags/ops/ci_trace_overwrite.yml
@@ -2,6 +2,7 @@
 name: ci_trace_overwrite
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304
 rollout_issue_url: 
-group: group::continuous integration
+milestone: '13.4'
 type: ops
-default_enabled: false
\ No newline at end of file
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/ops/database_reindexing.yml b/config/feature_flags/ops/database_reindexing.yml
index ea000a052db..fb0c29393f5 100644
--- a/config/feature_flags/ops/database_reindexing.yml
+++ b/config/feature_flags/ops/database_reindexing.yml
@@ -1,7 +1,8 @@
 ---
 name: database_reindexing
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42705
-rollout_issue_url:
-group: group::database
+rollout_issue_url: 
+milestone: '13.5'
 type: ops
-default_enabled: false
\ No newline at end of file
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/dynamic_image_resizing_owner.yml b/config/feature_flags/ops/dynamic_image_resizing.yml
index fd9881fba31..960ce9c6dbd 100644
--- a/config/feature_flags/development/dynamic_image_resizing_owner.yml
+++ b/config/feature_flags/ops/dynamic_image_resizing.yml
@@ -1,7 +1,7 @@
 ---
-name: dynamic_image_resizing_owner
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40606
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241533
+name: dynamic_image_resizing
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45050
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/266986
+type: ops
 group: group::memory
-type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml b/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml
index 680f8201d27..136731e229e 100644
--- a/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml
+++ b/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml
@@ -2,6 +2,7 @@
 name: gitlab_sidekiq_enable_semi_reliable_fetcher
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: ops
+group: 
 default_enabled: true
diff --git a/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml b/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml
index ae395e19384..d7db6a38775 100644
--- a/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml
+++ b/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml
@@ -2,6 +2,7 @@
 name: gitlab_sidekiq_reliable_fetcher
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: ops
+group: 
 default_enabled: true
diff --git a/config/feature_flags/ops/kubernetes_agent_internal_api.yml b/config/feature_flags/ops/kubernetes_agent_internal_api.yml
index f1dfdbb3950..34731aaeb52 100644
--- a/config/feature_flags/ops/kubernetes_agent_internal_api.yml
+++ b/config/feature_flags/ops/kubernetes_agent_internal_api.yml
@@ -1,7 +1,8 @@
 ---
 name: kubernetes_agent_internal_api
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41045
-rollout_issue_url:
-group: group::configure
+rollout_issue_url: 
+milestone: '13.4'
 type: ops
+group: group::configure
 default_enabled: true
diff --git a/config/feature_flags/ops/marginalia.yml b/config/feature_flags/ops/marginalia.yml
index a5d64c48b27..fb82f274eb2 100644
--- a/config/feature_flags/ops/marginalia.yml
+++ b/config/feature_flags/ops/marginalia.yml
@@ -2,6 +2,7 @@
 name: marginalia
 introduced_by_url: 
 rollout_issue_url: 
-group: 
+milestone: 
 type: ops
+group: 
 default_enabled: false
diff --git a/lib/api/releases.rb b/lib/api/releases.rb
index fa760324917..c20e618efd1 100644
--- a/lib/api/releases.rb
+++ b/lib/api/releases.rb
@@ -91,7 +91,7 @@ module API
         optional :name,        type: String, desc: 'The name of the release'
         optional :description, type: String, desc: 'Release notes with markdown support'
         optional :released_at, type: DateTime, desc: 'The date when the release will be/was ready.'
-        optional :milestones,  type: Array, desc: 'The titles of the related milestones'
+        optional :milestones,  type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, desc: 'The titles of the related milestones'
       end
       put ':id/releases/:tag_name', requirements: RELEASE_ENDPOINT_REQUIREMENTS do
         authorize_update_release!
diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb
index 747ccd7ba1b..f9a6afb95ea 100644
--- a/spec/controllers/concerns/send_file_upload_spec.rb
+++ b/spec/controllers/concerns/send_file_upload_spec.rb
@@ -70,61 +70,18 @@ RSpec.describe SendFileUpload do
         allow(uploader).to receive(:model).and_return(image_owner)
       end
 
-      context 'when boths FFs are enabled' do
-        before do
-          stub_feature_flags(dynamic_image_resizing_requester: image_requester)
-          stub_feature_flags(dynamic_image_resizing_owner: image_owner)
-        end
-
-        it_behaves_like 'handles image resize requests allowed by FFs'
-      end
-
-      context 'when boths FFs are enabled globally' do
-        before do
-          stub_feature_flags(dynamic_image_resizing_requester: true)
-          stub_feature_flags(dynamic_image_resizing_owner: true)
-        end
-
-        it_behaves_like 'handles image resize requests allowed by FFs'
-
-        context 'when current_user is nil' do
-          before do
-            allow(controller).to receive(:current_user).and_return(nil)
-          end
-
-          it_behaves_like 'handles image resize requests allowed by FFs'
-        end
-      end
-
-      context 'when only FF based on content requester is enabled for current user' do
-        before do
-          stub_feature_flags(dynamic_image_resizing_requester: image_requester)
-          stub_feature_flags(dynamic_image_resizing_owner: false)
-        end
-
-        it_behaves_like 'bypasses image resize requests not allowed by FFs'
-      end
-
-      context 'when only FF based on content owner is enabled for requested avatar owner' do
-        before do
-          stub_feature_flags(dynamic_image_resizing_requester: false)
-          stub_feature_flags(dynamic_image_resizing_owner: image_owner)
-        end
-
-        it_behaves_like 'bypasses image resize requests not allowed by FFs'
-      end
+      it_behaves_like 'handles image resize requests allowed by FF'
 
-      context 'when both FFs are disabled' do
+      context 'when FF is disabled' do
         before do
-          stub_feature_flags(dynamic_image_resizing_requester: false)
-          stub_feature_flags(dynamic_image_resizing_owner: false)
+          stub_feature_flags(dynamic_image_resizing: false)
         end
 
-        it_behaves_like 'bypasses image resize requests not allowed by FFs'
+        it_behaves_like 'bypasses image resize requests not allowed by FF'
       end
     end
 
-    shared_examples 'bypasses image resize requests not allowed by FFs' do
+    shared_examples 'bypasses image resize requests not allowed by FF' do
       it 'does not write workhorse command header' do
         expect(headers).not_to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-scaled-img:/)
 
@@ -132,7 +89,7 @@ RSpec.describe SendFileUpload do
       end
     end
 
-    shared_examples 'handles image resize requests allowed by FFs' do
+    shared_examples 'handles image resize requests allowed by FF' do
       context 'with valid width parameter' do
         it 'renders OK with workhorse command header' do
           expect(controller).not_to receive(:send_file)
diff --git a/spec/features/canonical_link_spec.rb b/spec/features/canonical_link_spec.rb
index ce6b2bb7044..8b64e9a5b9d 100644
--- a/spec/features/canonical_link_spec.rb
+++ b/spec/features/canonical_link_spec.rb
@@ -67,18 +67,4 @@ RSpec.describe 'Canonical link' do
     let(:request_url) { explore_root_path }
     let(:expected_url) { explore_projects_url }
   end
-
-  context 'when feature flag generic_canonical is disabled' do
-    before do
-      stub_feature_flags(generic_canonical: false)
-    end
-
-    it_behaves_like 'does not show canonical link' do
-      let(:request_url) { issue_request + '/' }
-    end
-
-    it_behaves_like 'does not show canonical link' do
-      let(:request_url) { project_request + '/' }
-    end
-  end
 end
diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index 44dd44edb12..e6985f6c984 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -646,7 +646,7 @@ describe('setAssignees', () => {
 
   it('calls mutate with the correct values', async () => {
     await actions.setAssignees(
-      { commit: () => {}, getters: { getActiveIssue: { iid, referencePath: refPath } } },
+      { commit: () => {}, getters: { activeIssue: { iid, referencePath: refPath } } },
       [name],
     );
 
@@ -660,7 +660,7 @@ describe('setAssignees', () => {
     testAction(
       actions.setAssignees,
       {},
-      { getActiveIssue: { iid, referencePath: refPath }, commit: () => {} },
+      { activeIssue: { iid, referencePath: refPath }, commit: () => {} },
       [
         {
           type: 'UPDATE_ISSUE_BY_ID',
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index c7abed2c69e..c213ad7ee59 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -196,16 +196,6 @@ RSpec.describe PageLayoutHelper do
       it_behaves_like 'does not return a canonical url' do
         let(:method) { 'PUT' }
       end
-
-      context 'when feature flag generic_canonical is disabled' do
-        let(:method) { 'GET' }
-
-        before do
-          stub_feature_flags(generic_canonical: false)
-        end
-
-        it_behaves_like 'does not return a canonical url'
-      end
     end
   end
 
diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb
index f8e4cfbb9e5..58b321a255e 100644
--- a/spec/requests/api/releases_spec.rb
+++ b/spec/requests/api/releases_spec.rb
@@ -998,6 +998,17 @@ RSpec.describe API::Releases do
           end
         end
 
+        context 'without milestones parameter' do
+          let(:params) { { name: 'some new name' } }
+
+          it 'does not change the milestone' do
+            subject
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(returned_milestones).to match_array(['v1.0'])
+          end
+        end
+
         context 'multiple milestones' do
           context 'with one new' do
             let!(:milestone2) { create(:milestone, project: project, title: 'milestone2') }